diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/configure b/configure index 26935c74c0..a6e37c2e1d 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.4.2 +# Generated automatically using autoconf version 2.5 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -73,6 +73,7 @@ mandir='${prefix}/man' # Initialize some other variables. subdirs= +MFLAGS= MAKEFLAGS= ac_prev= for ac_option @@ -349,7 +350,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.4.2" + echo "configure generated by autoconf version 2.5" exit 0 ;; -with-* | --with-*) @@ -395,7 +396,7 @@ EOF -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *) + *) if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then echo "configure: warning: $ac_option: invalid host type" 1>&2 fi @@ -631,7 +632,7 @@ if test "${enable_libio+set}" = set; then enableval="$enable_libio" stdio=libio else - stdio=stdio + stdio=default fi @@ -660,16 +661,6 @@ else fi -echo $ac_n "checking stdio selection""... $ac_c" 1>&4 - -if test $stdio = libio; then - cat >> confdefs.h <<\EOF -#define USE_IN_LIBIO 1 -EOF - -fi -echo "$ac_t""$stdio" 1>&4 - ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1150,7 +1141,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 1154 "configure" +#line 1145 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -1164,7 +1155,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1168 "configure" +#line 1159 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -1218,7 +1209,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 1222 "configure" +#line 1213 "configure" #include "confdefs.h" #define __need_size_t #define __need_wchar_t @@ -1341,7 +1332,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 1345 "configure" +#line 1336 "configure" #include "confdefs.h" int main() { return 0; } @@ -1441,6 +1432,17 @@ else config_uname= fi +echo $ac_n "checking stdio selection""... $ac_c" 1>&4 + +case $stdio in +libio) cat >> confdefs.h <<\EOF +#define USE_IN_LIBIO 1 +EOF + ;; +default) stdio=stdio ;; +esac +echo "$ac_t""$stdio" 1>&4 + if test $gnu_ld = yes; then cat >> confdefs.h <<\EOF @@ -1558,7 +1560,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.4.2" + echo "$CONFIG_STATUS generated by autoconf version 2.5" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1571,8 +1573,8 @@ 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 -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; +# 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 $ac_vpsub $extrasub @@ -1597,7 +1599,6 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g -s%@stdio@%$stdio%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -1619,6 +1620,7 @@ s%@libc_cv_have_initfini@%$libc_cv_have_initfini%g s%@uname_sysname@%$uname_sysname%g s%@uname_release@%$uname_release%g s%@uname_version@%$uname_version%g +s%@stdio@%$stdio%g s%@gnu_ld@%$gnu_ld%g s%@gnu_as@%$gnu_as%g s%@elf@%$elf%g @@ -1724,7 +1726,7 @@ EOF # Transform confdefs.h into a sed script conftest.vals that substitutes # the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. +# Protect against being on the right side of a sed subst in config.status. # Protect against being in an unquoted here document in config.status. rm -f conftest.vals cat > conftest.hdr <<\EOF |