Fix a bug in the determination of LIB${NAME}_PREFIX.

diff --git a/ChangeLog b/ChangeLog
index 516ff9e98b6c99b757500ce2ccfe1cdf7c746b52..e093c98029cf3797dd4cd1cdfd75b3bf61488dd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-30  Bruno Haible  <bruno@clisp.org>
+
+       * m4/lib-prefix.m4 (AC_LIB_LINKFLAGS_BODY): Don't overwrite
+       LIB${NAME}_PREFIX when considering the dependencies of lib${name}.
+       Reported by Charles Wilson <cygwin@cwilson.fastmail.fm>.
+
 2008-12-29  Eric Blake  <ebb9@byu.net>
 
        multiarch: avoid autoconf AC_REQUIRE bug

diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 7e07a424686c0a1400e2864cf9960a09dfead250..e29eead27607533659b2b74323db66662d100d19 100644 (file)
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 16 (gettext-0.18)
+# lib-link.m4 serial 17 (gettext-0.18)
 dnl Copyright (C) 2001-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -446,12 +446,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                LIB[]NAME[]_PREFIX="$basedir"
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
                 additional_includedir="$basedir/include"
                 ;;
               */$acl_libdirstem2 | */$acl_libdirstem2/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                LIB[]NAME[]_PREFIX="$basedir"
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac