X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Flib-prefix.m4;h=1601ceaefd3c2b447b569f991813be12b0e06e2d;hb=bf2fa8274d569da94a626eea30de612f01ec4a7c;hp=1c4d68cbedcfe592892cd7d171c9668383037176;hpb=4bad80470c3895cf00f65359e6b8fa180ec9520f;p=awesomized%2Flibmemcached

diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 1c4d68cb..1601ceae 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
-# lib-prefix.m4 serial 6 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -183,18 +183,13 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
       dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
       dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
       dnl symlink is missing, so we set acl_libdirstem2 too.
-      AC_MSG_CHECKING([if buildling 64-bit app])
-      AC_RUN_IFELSE([
-         AC_LANG_PROGRAM([
-         ], [
-           return sizeof(void*) == 8 ? 0 : 1;
-         ])            
-      ], [
-         gl_cv_solaris_64bit=yes
-      ], [
-         gl_cv_solaris_64bit=no
-      ])
-      AC_MSG_RESULT([$gl_cv_solaris_64bit])
+      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+        [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+        ])
       if test $gl_cv_solaris_64bit = yes; then
         acl_libdirstem=lib/64
         case "$host_cpu" in
@@ -211,6 +206,9 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
           if test -d "$searchdir"; then
             case "$searchdir" in
               */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
               *) searchdir=`cd "$searchdir" && pwd`
                  case "$searchdir" in
                    */lib64 ) acl_libdirstem=lib64 ;;