Sophie

Sophie

distrib > Mageia > 4 > x86_64 > by-pkgid > 3ae2d20c57426414d7d37444471b04af > files > 30

php-5.5.11-1.mga4.src.rpm

diff -Naurp php-5.5.9/aclocal.m4 php-5.5.9.oden/aclocal.m4
--- php-5.5.9/aclocal.m4	2014-02-05 11:05:05.000000000 +0100
+++ php-5.5.9.oden/aclocal.m4	2014-02-12 11:11:26.587799917 +0100
@@ -3678,6 +3678,20 @@ s390*-*linux*|sparc*-*linux*)
   rm -rf conftest*
   ;;
 
+*-*-linux*)
+  # Test if the compiler is 64bit
+  echo 'int i;' > conftest.$ac_ext
+  lt_cv_cc_64bit_output=no
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *"ELF 64"*)
+      lt_cv_cc_64bit_output=yes
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+  
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
@@ -4725,6 +4739,13 @@ linux* | k*bsd*-gnu)
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
+  case $host_cpu:$lt_cv_cc_64bit_output in
+  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
+    ;;
+  esac
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,