diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 132 |
1 files changed, 2 insertions, 130 deletions
diff --git a/configure b/configure index 1d419cf861..fdfa5effc0 100755 --- a/configure +++ b/configure @@ -669,7 +669,6 @@ PWD_P LD AS MIG -RANLIB OBJDUMP AR LN_S @@ -4670,108 +4669,6 @@ AR=`$CC -print-prog-name=ar` OBJDUMP=`$CC -print-prog-name=objdump` -# ranlib has to be treated a bit differently since it might not exist at all. -ac_ranlib=`$CC -print-prog-name=ranlib` -if test "x$ac_ranlib" = xranlib; then -# This extra check has to happen since gcc simply echos the parameter in -# case it cannot find the value in its own directories. -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -else - RANLIB=$ac_ranlib -fi - - # Determine whether we are using GNU binutils. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AS is GNU as" >&5 $as_echo_n "checking whether $AS is GNU as... " >&6; } @@ -5410,33 +5307,8 @@ fi -# check if ranlib is necessary -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ranlib is necessary" >&5 -$as_echo_n "checking whether ranlib is necessary... " >&6; } -if test "${libc_cv_ranlib_necessary+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat > conftest.c <<EOF -int a; -char b; -void c(void) {} -EOF -$CC $CFLAGS $CPPFLAGS -c conftest.c -$AR cr conftest.a conftest.o -cp conftest.a conftest2.a -$RANLIB conftest.a -if cmp -s conftest.a conftest2.a; then - libc_cv_ranlib_necessary=no -else - libc_cv_ranlib_necessary=yes -fi -rm -rf conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ranlib_necessary" >&5 -$as_echo "$libc_cv_ranlib_necessary" >&6; } -if test "$libc_cv_ranlib_necessary" = no; then - RANLIB=: -fi +# ranlib is never necessary on Linux and Hurd systems +RANLIB=: # Test if LD_LIBRARY_PATH contains the notation for the current directory # since this would lead to problems installing/building glibc. |