diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
commit | a65dd355fb80a05215e15ae97649de52aec885e3 (patch) | |
tree | 81701bb0c6b648630f2bf1729a85d7f5eb49e67b /configure | |
parent | 296a5732f94abe4d5699dc981e4ccfb950b48cee (diff) | |
parent | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (diff) |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 149 |
1 files changed, 35 insertions, 114 deletions
@@ -613,7 +613,6 @@ libc_cv_z_combreloc ASFLAGS_config libc_cv_Bgroup libc_cv_cc_with_libunwind -VERSIONING BISON INSTALL_INFO PERL @@ -739,7 +738,6 @@ with_default_link enable_sanity_checks enable_shared enable_profile -enable_versioning enable_oldest_abi enable_hardcoded_path_in_tests enable_stackguard_randomization @@ -749,6 +747,7 @@ enable_hidden_plt enable_bind_now enable_static_nss enable_force_install +enable_maintainer_mode enable_kernel enable_all_warnings enable_multi_arch @@ -1392,8 +1391,6 @@ Optional Features: in special situations) [default=yes] --enable-shared build shared library [default=yes if GNU ld] --enable-profile build profiled library [default=no] - --disable-versioning do not include versioning information in the library - objects [default=yes if supported] --enable-oldest-abi=ABI configure the oldest ABI supported [e.g. 2.2] [default=glibc default] --enable-hardcoded-path-in-tests @@ -1412,6 +1409,9 @@ Optional Features: --enable-static-nss build static NSS modules [default=no] --disable-force-install don't force installation of files from this package, even if they are older than the installed files + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --enable-kernel=VERSION compile for compatibility with kernel not older than VERSION --enable-all-warnings enable all useful warnings gcc can issue @@ -3433,13 +3433,6 @@ else profile=no fi -# Check whether --enable-versioning was given. -if test "${enable_versioning+set}" = set; then : - enableval=$enable_versioning; enable_versioning=$enableval -else - enable_versioning=yes -fi - # Check whether --enable-oldest-abi was given. if test "${enable_oldest_abi+set}" = set; then : @@ -3542,6 +3535,14 @@ fi +# Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; maintainer=$enableval +else + maintainer=no +fi + + # Check whether --enable-kernel was given. if test "${enable_kernel+set}" = set; then : enableval=$enable_kernel; minimum_kernel=$enableval @@ -3970,8 +3971,8 @@ fi # base_machine, we don't change it. test -n "$base_machine" || case "$machine" in i[4567]86) base_machine=i386 machine=i386/$machine ;; -powerpc) base_machine=powerpc machine=powerpc/powerpc32 ;; -powerpc64) base_machine=powerpc machine=powerpc/powerpc64 ;; +powerpc64*) base_machine=powerpc machine=powerpc/powerpc64 ;; +powerpc*) base_machine=powerpc machine=powerpc/powerpc32 ;; s390) base_machine=s390 machine=s390/s390-32 ;; s390x) base_machine=s390 machine=s390/s390-64 ;; sh3*) base_machine=sh machine=sh/sh3 ;; @@ -4773,7 +4774,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 3.79* | 3.[89]*) + 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; @@ -5132,7 +5133,8 @@ else fi -for ac_prog in autoconf +if test "x$maintainer" = "xyes"; then + for ac_prog in autoconf do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5175,27 +5177,30 @@ fi done test -n "$AUTOCONF" || AUTOCONF="no" -case "x$AUTOCONF" in -xno|x|x:) AUTOCONF=no ;; -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works" >&5 -$as_echo_n "checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works... " >&6; } + case "x$AUTOCONF" in + xno|x|x:) AUTOCONF=no ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works" >&5 +$as_echo_n "checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works... " >&6; } if ${libc_cv_autoconf_works+:} false; then : $as_echo_n "(cached) " >&6 else - if (cd $srcdir; $AUTOCONF $ACFLAGS configure.in > /dev/null 2>&1); then - libc_cv_autoconf_works=yes - else - libc_cv_autoconf_works=no - fi + if (cd $srcdir; $AUTOCONF $ACFLAGS configure.ac > /dev/null 2>&1); then + libc_cv_autoconf_works=yes + else + libc_cv_autoconf_works=no + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_autoconf_works" >&5 $as_echo "$libc_cv_autoconf_works" >&6; } - test $libc_cv_autoconf_works = yes || AUTOCONF=no - ;; -esac -if test "x$AUTOCONF" = xno; then - aux_missing="$aux_missing autoconf" + test $libc_cv_autoconf_works = yes || AUTOCONF=no + ;; + esac + if test "x$AUTOCONF" = xno; then + aux_missing="$aux_missing autoconf" + fi +else + AUTOCONF=no fi test -n "$critic_missing" && as_fn_error $? " @@ -5632,90 +5637,6 @@ if test $libc_cv_asm_unique_object = yes; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for .symver assembler directive" >&5 -$as_echo_n "checking for .symver assembler directive... " >&6; } -if ${libc_cv_asm_symver_directive+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat > conftest.s <<EOF -${libc_cv_dot_text} -_sym: -.symver _sym,sym@VERS -EOF -if ${CC-cc} -c $ASFLAGS conftest.s 1>&5 2>&5; then - libc_cv_asm_symver_directive=yes -else - libc_cv_asm_symver_directive=no -fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_symver_directive" >&5 -$as_echo "$libc_cv_asm_symver_directive" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld --version-script" >&5 -$as_echo_n "checking for ld --version-script... " >&6; } -if ${libc_cv_ld_version_script_option+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test $libc_cv_asm_symver_directive = yes; then - cat > conftest.s <<EOF -${libc_cv_dot_text} -_sym: -.symver _sym,sym@VERS -EOF - cat > conftest.map <<EOF -VERS_1 { - global: sym; -}; - -VERS_2 { - global: sym; -} VERS_1; -EOF - if ${CC-cc} -c $ASFLAGS conftest.s 1>&5 2>&5; then - if { ac_try='${CC-cc} $CFLAGS $LDFLAGS -shared - -o conftest.so conftest.o - -nostartfiles -nostdlib - -Wl,--version-script,conftest.map - 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; - then - libc_cv_ld_version_script_option=yes - else - libc_cv_ld_version_script_option=no - fi - else - libc_cv_ld_version_script_option=no - fi -else - libc_cv_ld_version_script_option=no -fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ld_version_script_option" >&5 -$as_echo "$libc_cv_ld_version_script_option" >&6; } -if test $shared != no && - test $libc_cv_asm_symver_directive = yes && - test $libc_cv_ld_version_script_option = yes && - test $enable_versioning = yes; then - VERSIONING=yes - $as_echo "#define DO_VERSIONING 1" >>confdefs.h - -else - VERSIONING=no -fi - - -if test $shared != no && test $VERSIONING = no; then - echo "\ -*** WARNING: You should not compile GNU libc without versioning. Not using -*** versioning will introduce incompatibilities so that old binaries -*** will not run anymore. -*** For versioning you need recent binutils (binutils-2.8.1.0.23 or newer)." -fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for .previous assembler directive" >&5 $as_echo_n "checking for .previous assembler directive... " >&6; } if ${libc_cv_asm_previous_directive+:} false; then : |