Mercurial > hg > octave-lojdl > gnulib-hg

changeset 11516:5165bfb23649

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the lib vs. lib64 recognition work on openSUSE 11 with "gcc -m32".
author Bruno Haible <bruno@clisp.org>
date Sun, 26 Apr 2009 18:59:33 +0200
parents 0ef1bc4d4c97
children aad3147e3e47
files ChangeLog m4/lib-prefix.m4
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/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".
+	* 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.
--- 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 @@
           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 ;;