From: Bruno Haible <bruno@clisp.org>
Date: Sun, 26 Apr 2009 16:59:33 +0000 (+0200)
Subject: Make the lib vs. lib64 recognition work on openSUSE 11 with "gcc -m32".
X-Git-Tag: v0.1~5971
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=13a006f97fca894168e4c1aedfa780f83717c78c;p=gnulib.git

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

diff --git a/ChangeLog b/ChangeLog
index 1d934526b..66e7c28c7 100644
--- 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 3bdc0fc57..4b7ee3358 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-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 ;;