diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | config.make.in | 2 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | manual/argp.texi | 2 | ||||
| -rw-r--r-- | manual/fdl.texi | 1 | ||||
| -rw-r--r-- | manual/libc-texinfo.sh | 2 | ||||
| -rw-r--r-- | manual/libc.texinfo | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 38 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 32 |
10 files changed, 52 insertions, 42 deletions
@@ -1,5 +1,13 @@ 2001-07-06 Andreas Jaeger <aj@suse.de> + * manual/libc-texinfo.sh: Add note for the FDL. + + * manual/argp.texi (Argp Example 4): Fix texinfo warning. + + * manual/libc.texinfo: Regenerated. + + * manual/fdl.texi: Fix node. + * config.make.in (sysconfdir): Replace correctly. Closes PR libc/2369, reported by Peter Simons <simons@cryp.to>. diff --git a/config.make.in b/config.make.in index 900efb525e..71eb216752 100644 --- a/config.make.in +++ b/config.make.in @@ -13,7 +13,7 @@ datadir = @datadir@ libdir = @libdir@ slibdir = @libc_cv_slibdir@ localedir = @libc_cv_localedir@ -sysconfdir = @libc_cv_sysconfdir@ +sysconfdir = @sysconfdir@ libexecdir = @libexecdir@ rootsbindir = @libc_cv_rootsbindir@ infodir = @infodir@ @@ -2246,7 +2246,7 @@ else fi -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -3540,7 +3540,6 @@ fi - if test $gnu_ld = yes; then cat >> confdefs.h <<\EOF @@ -3574,7 +3573,7 @@ if test $shared = default; then fi echo $ac_n "checking whether -fPIC is default""... $ac_c" 1>&6 -echo "configure:3578: checking whether -fPIC is default" >&5 +echo "configure:3577: checking whether -fPIC is default" >&5 if eval "test \"`echo '$''{'pic_default'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3814,7 +3813,6 @@ s%@stdio@%$stdio%g s%@old_glibc_headers@%$old_glibc_headers%g s%@libc_cv_slibdir@%$libc_cv_slibdir%g s%@libc_cv_localedir@%$libc_cv_localedir%g -s%@libc_cv_sysconfdir@%$libc_cv_sysconfdir%g s%@libc_cv_rootsbindir@%$libc_cv_rootsbindir%g s%@use_ldconfig@%$use_ldconfig%g s%@ldd_rewrite_script@%$ldd_rewrite_script%g diff --git a/configure.in b/configure.in index d6b56990f6..f1f7b71609 100644 --- a/configure.in +++ b/configure.in @@ -1514,7 +1514,6 @@ AC_SUBST(old_glibc_headers) AC_SUBST(libc_cv_slibdir) AC_SUBST(libc_cv_localedir) -AC_SUBST(libc_cv_sysconfdir) AC_SUBST(libc_cv_rootsbindir) AC_SUBST(use_ldconfig) diff --git a/manual/argp.texi b/manual/argp.texi index 9e400008f8..b7446970c3 100644 --- a/manual/argp.texi +++ b/manual/argp.texi @@ -1101,7 +1101,7 @@ two part option string. The @emph{headers} are entries in the options vector. @xref{Argp Option Vectors}. The first four fields are zero. The two part documentation string are in the variable @code{doc}, which allows documentation both before and after the options. @xref{Argp -Parsers}; the two parts of @code{doc} are separated by a vertical-tab +Parsers}, the two parts of @code{doc} are separated by a vertical-tab character (@code{'\v'}, or @code{'\013'}). By convention, the documentation before the options is a short string stating what the program does, and after any options it is longer, describing the diff --git a/manual/fdl.texi b/manual/fdl.texi index a497bbae7c..b03f7b089b 100644 --- a/manual/fdl.texi +++ b/manual/fdl.texi @@ -1,5 +1,4 @@ -@node GNU Free Documentation License @appendix GNU Free Documentation License @cindex FDL, GNU Free Documentation License diff --git a/manual/libc-texinfo.sh b/manual/libc-texinfo.sh index a1aff026f0..e564ebceb2 100644 --- a/manual/libc-texinfo.sh +++ b/manual/libc-texinfo.sh @@ -70,6 +70,8 @@ mv -f incl.$$ chapters.texi cat <<EOF * Copying:: The GNU Lesser General Public License says how you can copy and share the GNU C Library. +* Documentation License:: This manual is under the GNU Free + Documentation License. Indices diff --git a/manual/libc.texinfo b/manual/libc.texinfo index 8d6a3f250f..f5bfbcde36 100644 --- a/manual/libc.texinfo +++ b/manual/libc.texinfo @@ -111,7 +111,7 @@ of the GNU C Library. @include chapters.texi @set lgpl-appendix -@node Copying, Concept Index, Contributors, Top +@node Copying, Documentation License, Contributors, Top @include lesser.texi @node Documentation License, Concept Index, Copying, Top diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index f852718906..b1a8df8deb 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -52,11 +52,8 @@ fi # kernel headers are young enough. Additionally we have minimal # kernel versions for some architectures. case "$machine" in - mips*) - arch_minimum_kernel=2.2.15 - ;; - sh*) - arch_minimum_kernel=2.3.99 + alpha*) + arch_minimum_kernel=2.1.100 ;; ia64*) arch_minimum_kernel=2.4.0 @@ -64,6 +61,12 @@ case "$machine" in hppa*) arch_minimum_kernel=2.3.99 ;; + mips*) + arch_minimum_kernel=2.2.15 + ;; + sh*) + arch_minimum_kernel=2.3.99 + ;; *) arch_minimum_kernel=2.0.10 ;; @@ -85,11 +88,11 @@ fi if test -n "$minimum_kernel"; then echo $ac_n "checking for kernel header at least $minimum_kernel""... $ac_c" 1>&6 -echo "configure:89: checking for kernel header at least $minimum_kernel" >&5 +echo "configure:92: checking for kernel header at least $minimum_kernel" >&5 decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; cat > conftest.$ac_ext <<EOF -#line 93 "configure" +#line 96 "configure" #include "confdefs.h" #include <linux/version.h> #if LINUX_VERSION_CODE < $decnum @@ -154,27 +157,26 @@ fi case $add_ons in # It is available. Good. *linuxthreads*) - message= + linuxthreads_missing= ;; *) - message="\ -*** WARNING: Are you sure you do not want to use the \`linuxthreads' -*** add-on?" + linuxthreads_missing=yes ;; esac -if test "$message"; then +if test "$linuxthreads_missing"; then if test $enable_sanity = yes; then echo "\ -*** You should not compile the GNU libc without the \`linuxthreads' -*** add-on. Not using them risks being incompatible with the -*** libraries of other systems. Consider getting the add-on and restarting -*** the configuration. +*** On GNU/Linux systems it is normal to compile GNU libc with the +*** \`linuxthreads' add-on. Without that, the library will be +*** incompatible with normal GNU/Linux systems. *** If you really mean to not use this add-on, run configure again *** using the extra parameter \`--disable-sanity-checks'." exit 1 else - echo "$message" + echo "\ +*** WARNING: Are you sure you do not want to use the \`linuxthreads' +*** add-on?" fi fi @@ -205,7 +207,7 @@ if test $host = $build; then ac_prefix=$ac_default_prefix fi echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6 -echo "configure:209: checking for symlinks in ${ac_prefix}/include" >&5 +echo "configure:211: checking for symlinks in ${ac_prefix}/include" >&5 ac_message= if test -L ${ac_prefix}/include/net; then ac_message="$ac_message diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index afe798218a..b112a0f4fb 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -39,11 +39,8 @@ fi # kernel headers are young enough. Additionally we have minimal # kernel versions for some architectures. case "$machine" in - mips*) - arch_minimum_kernel=2.2.15 - ;; - sh*) - arch_minimum_kernel=2.3.99 + alpha*) + arch_minimum_kernel=2.1.100 ;; ia64*) arch_minimum_kernel=2.4.0 @@ -51,6 +48,12 @@ case "$machine" in hppa*) arch_minimum_kernel=2.3.99 ;; + mips*) + arch_minimum_kernel=2.2.15 + ;; + sh*) + arch_minimum_kernel=2.3.99 + ;; *) arch_minimum_kernel=2.0.10 ;; @@ -122,27 +125,26 @@ fi case $add_ons in # It is available. Good. *linuxthreads*) - message= + linuxthreads_missing= ;; *) - message="\ -*** WARNING: Are you sure you do not want to use the \`linuxthreads' -*** add-on?" + linuxthreads_missing=yes ;; esac -if test "$message"; then +if test "$linuxthreads_missing"; then if test $enable_sanity = yes; then echo "\ -*** You should not compile the GNU libc without the \`linuxthreads' -*** add-on. Not using them risks being incompatible with the -*** libraries of other systems. Consider getting the add-on and restarting -*** the configuration. +*** On GNU/Linux systems it is normal to compile GNU libc with the +*** \`linuxthreads' add-on. Without that, the library will be +*** incompatible with normal GNU/Linux systems. *** If you really mean to not use this add-on, run configure again *** using the extra parameter \`--disable-sanity-checks'." exit 1 else - echo "$message" + echo "\ +*** WARNING: Are you sure you do not want to use the \`linuxthreads' +*** add-on?" fi fi |