diff options
Diffstat (limited to 'libmudflap/configure')
| -rwxr-xr-x | libmudflap/configure | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/libmudflap/configure b/libmudflap/configure index 49040fafb79..aeff610793c 100755 --- a/libmudflap/configure +++ b/libmudflap/configure @@ -5267,10 +5267,7 @@ fi echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' # Need to set the preceding variable on all platforms that support @@ -5305,7 +5302,6 @@ cygwin* | mingw* |pw32*) ;; darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in @@ -5316,10 +5312,9 @@ darwin* | rhapsody*) lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' ;; esac - lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* ) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -5377,10 +5372,20 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - lt_cv_deplibs_check_method=pass_all + case $host_cpu in + alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | x86_64* | sh*) + lt_cv_deplibs_check_method=pass_all ;; + # NB 2003-06-03: According to Alexandre Oliva, x86_64 should not be + # in this list. However, it works around a libtool problem that + # wrongly excludes -ldl/-lpthread from the libmudflap(th) dependencies. + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; -netbsd* | knetbsd*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' else @@ -5426,12 +5431,14 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) esac ;; esac - -fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method +# NB: See above NB ... this is to make sure that the overriden +# local libtool variant doesn't pollute the upstream cache +unset lt_cv_file_magic_cmd +unset lt_cv_deplibs_check_method +echo "$as_me:$LINENO: result: $deplibs_check_method" >&5 +echo "${ECHO_T}$deplibs_check_method" >&6 @@ -5770,25 +5777,12 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 5773 "configure"' > conftest.$ac_ext + echo '#line 5780 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -5800,7 +5794,6 @@ case $host in LD="${LD-ld} -64" ;; esac - fi fi rm -rf conftest* ;; @@ -5839,7 +5832,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + ppc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) |