diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rwxr-xr-x | configure | 39 |
2 files changed, 26 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index a53bd88d7f..b8f235e3a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,7 +22,7 @@ Thu Nov 23 02:21:55 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/{mlock,munlock,mlockall,munlockall}.S: New files. - * sysdeps/unix/sysv/linux/mman.h: Add prototypes for new functions + * sysdeps/unix/sysv/linux/sys/mman.h: Add prototypes for new functions mlock, munlock, mlockall, and munlockall. Thu Nov 23 18:26:52 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> diff --git a/configure b/configure index a6e37c2e1d..4f17001a8b 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # From configure.in CVSid # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.5 +# Generated automatically using autoconf version 2.7 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -173,9 +173,11 @@ Directory and file names: --bindir=DIR user executables in DIR [EPREFIX/bin] --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR [PREFIX/share] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR [PREFIX/com] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] --libdir=DIR object code libraries in DIR [EPREFIX/lib] --includedir=DIR C header files in DIR [PREFIX/include] @@ -185,7 +187,8 @@ Directory and file names: --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names EOF cat << EOF Host type: @@ -199,8 +202,10 @@ Features and packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; -host | --host | --hos | --ho) @@ -350,7 +355,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.5" + echo "configure generated by autoconf version 2.7" exit 0 ;; -with-* | --with-*) @@ -630,7 +635,11 @@ fi # Check whether --enable-libio or --disable-libio was given. if test "${enable_libio+set}" = set; then enableval="$enable_libio" - stdio=libio + if test $enableval = yes; then + stdio=libio + else + stdio=stdio + fi else stdio=default fi @@ -1141,7 +1150,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1145 "configure" +#line 1154 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -1155,7 +1164,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1159 "configure" +#line 1168 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -1209,7 +1218,7 @@ if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1213 "configure" +#line 1222 "configure" #include "confdefs.h" #define __need_size_t #define __need_wchar_t @@ -1332,7 +1341,7 @@ if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1336 "configure" +#line 1345 "configure" #include "confdefs.h" int main() { return 0; } @@ -1560,7 +1569,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.5" + echo "$CONFIG_STATUS generated by autoconf version 2.7" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1572,10 +1581,12 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "config.make ${config_makefile} ${config_uname} config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS <<EOF # Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub s%@CFLAGS@%$CFLAGS%g |