From c224a18a9045610c4ec1e4d959f6a5dd6b117dd9 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 19 Mar 1996 21:10:11 +0000 Subject: * config.make.in (weak-symbols): Variable removed. * configure.in (--with-weak-symbols): Option removed. (NO_UNDERSCORES, HAVE_ASM_WEAK_DIRECTIVE, HAVE_ASM_WEAKEXT_DIRECTIVE): New tests. * config.h.in (HAVE_WEAK_SYMBOLS): #undef removed. (NO_UNDERSCORES, HAVE_ASM_WEAK_DIRECTIVE, HAVE_ASM_WEAKEXT_DIRECTIVE): New #undefs. * libc-symbols.h: Use them instead of HAVE_WEAK_SYMBOLS. * inet/inet_lnaof.c: Use u_int32_t instead of u_long. * inet/inet_mkadr.c: Likewise. * inet/inet_net.c: Likewise. * inet/inet_netof.c: Likewise. * inet/rcmd.c: Likewise. * inet/arpa/inet.h: Likewise. * inet/netinet/in.h: Likewise. * inet/netinet/tcp.h: Likewise. * inet/protocols/rwhod.h: Likewise. * inet/protocols/talkd.h: Likewise. * resolv/inet_addr.c: Likewise. * sunrpc/rpc/xdr.h (IXDR_GET_LONG, IXDR_PUT_LONG): change casts to u_int32_t (instead of u_long). --- configure | 147 +++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 116 insertions(+), 31 deletions(-) (limited to 'configure') diff --git a/configure b/configure index ce9930e964..dc70be001c 100755 --- a/configure +++ b/configure @@ -2,8 +2,8 @@ # From configure.in CVSid # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.7 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.9 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -26,8 +26,6 @@ ac_help="$ac_help --with-gnu-as if using GNU as (in the binutils package)" ac_help="$ac_help --with-elf if using the ELF object format" -ac_help="$ac_help - --with-weak-symbols if weak symbols are available in as and ld" ac_help="$ac_help --enable-libio build in GNU libio instead of GNU stdio" ac_help="$ac_help @@ -355,7 +353,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.7" + echo "configure generated by autoconf version 2.9" exit 0 ;; -with-* | --with-*) @@ -620,14 +618,6 @@ else elf=no fi -# Check whether --with-weak-symbols or --without-weak-symbols was given. -if test "${with_weak_symbols+set}" = set; then - withval="$with_weak_symbols" - weak=$withval -else - weak=no -fi - # Check whether --enable-libio or --disable-libio was given. if test "${enable_libio+set}" = set; then @@ -1147,13 +1137,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1162,13 +1152,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1217,7 +1207,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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_friendly_stddef=yes else @@ -1340,7 +1330,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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_have_initfini=yes else @@ -1369,6 +1359,108 @@ EOF fi fi +if test $elf = yes; then + libc_cv_asm_underscores=no +else + echo $ac_n "checking for _ prefix on C symbol names""... $ac_c" 1>&4 +if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&4 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + libc_cv_asm_underscores=yes +else + rm -rf conftest* + libc_cv_asm_underscores=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$libc_cv_asm_underscores" 1>&4 +fi +if test $libc_cv_asm_underscores = no; then + cat >> confdefs.h <<\EOF +#define NO_UNDERSCORES 1 +EOF + +fi + +if test $elf = yes; then + libc_cv_weak_symbols=yes + libc_cv_asm_weak_directive=yes + libc_cv_asm_weakext_directive=no +else + echo $ac_n "checking for assembler .weak directive""... $ac_c" 1>&4 +if eval "test \"`echo '$''{'libc_cv_asm_weak_directive'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&4 +else + cat > conftest.s </dev/null; then + libc_cv_asm_weak_directive=yes + else + libc_cv_asm_weak_directive=no + fi + rm -f conftest* +fi + +echo "$ac_t""$libc_cv_asm_weak_directive" 1>&4 + +if $libc_cv_asm_weak_directive = no; then + echo $ac_n "checking for assembler .weakext directive""... $ac_c" 1>&4 +if eval "test \"`echo '$''{'libc_cv_asm_weakext_directive'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&4 +else + cat > conftest.s </dev/null; then + libc_cv_asm_weakext_directive=yes + else + libc_cv_asm_weakext_directive=no + fi + rm -f conftest* +fi + +echo "$ac_t""$libc_cv_asm_weakext_directive" 1>&4 + + fi # no .weak +fi # not ELF + +if test $libc_cv_asm_weak_directive; then + cat >> confdefs.h <<\EOF +#define HAVE_ASM_WEAK_DIRECTIVE 1 +EOF + +elif test $libc_cv_asm_weakext_directive; then + cat >> confdefs.h <<\EOF +#define HAVE_ASM_WEAKEXT_DIRECTIVE 1 +EOF + +fi + +### End of automated tests. +### Now run sysdeps configure fragments. + # sysdeps configure fragments may set these with files to be linked below. libc_link_dests= libc_link_sources= @@ -1456,7 +1548,7 @@ default) stdio=stdio ;; esac echo "$ac_t""$stdio" 1>&4 - + if test $gnu_ld = yes; then cat >> confdefs.h <<\EOF #define HAVE_GNU_LD 1 @@ -1474,12 +1566,6 @@ if test $elf = yes; then #define HAVE_ELF 1 EOF -fi -if test $weak = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_WEAK_SYMBOLS 1 -EOF - fi @@ -1573,7 +1659,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.7" + echo "$CONFIG_STATUS generated by autoconf version 2.9" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1639,7 +1725,6 @@ s%@stdio@%$stdio%g s%@gnu_ld@%$gnu_ld%g s%@gnu_as@%$gnu_as%g s%@elf@%$elf%g -s%@weak@%$weak%g s%@shared@%$shared%g s%@profile@%$profile%g s%@omitfp@%$omitfp%g @@ -1747,7 +1832,7 @@ rm -f conftest.vals cat > conftest.hdr <<\EOF s/[\\&%]/\\&/g s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp s%ac_d%ac_u%gp s%ac_u%ac_e%gp EOF -- cgit 1.4.1