From: Bruno Haible <bruno@clisp.org>
Date: Sun, 26 Apr 2009 17:00:32 +0000 (+0000)
Subject: Fix bi-arch detection.
X-Git-Tag: v0.18~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d4b5a06f2dbc874f88a72cbad68ff34878efbcf;p=thirdparty%2Fgettext.git

Fix bi-arch detection.
---

diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog
index 5575c761e..14b721ad9 100644
--- a/autoconf-lib-link/m4/ChangeLog
+++ b/autoconf-lib-link/m4/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-26  Bruno Haible  <bruno@clisp.org>
+
+	Make the lib vs. lib64 recognition work on openSUSE 11 with "gcc -m32".
+	* lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): Ignore paths that end in
+	"../" or "..".
+
 2009-04-26  Bruno Haible  <bruno@clisp.org>
 
 	* lib-link.m4 (AC_LIB_HAVE_LINKFLAGS): Accept a fifth argument.
diff --git a/autoconf-lib-link/m4/lib-prefix.m4 b/autoconf-lib-link/m4/lib-prefix.m4
index 3bdc0fc57..4b7ee3358 100644
--- a/autoconf-lib-link/m4/lib-prefix.m4
+++ b/autoconf-lib-link/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 ;;