Make the lib vs. lib64 recognition work on openSUSE 11 with "gcc -m32".

diff --git a/ChangeLog b/ChangeLog
index 1d93452..66e7c28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-26  Bruno Haible  <bruno@clisp.org>
 
+       Make the lib vs. lib64 recognition work on openSUSE 11 with "gcc -m32".
+       * m4/lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): Ignore paths that end in
+       "../" or "..".
+
+2009-04-26  Bruno Haible  <bruno@clisp.org>
+
        * m4/lib-link.m4 (AC_LIB_HAVE_LINKFLAGS): Accept a fifth argument.
        * m4/libsigsegv.m4 (gl_LIBSIGSEGV): Simplify by using
        AC_LIB_HAVE_LINKFLAGS.

diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 3bdc0fc..4b7ee33 100644 (file)
--- 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-2009 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.
@@ -206,6 +206,9 @@ sixtyfour bits
           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 ;;