From 43393dfeb3f4053770bb8133b3cfac8bbac947eb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 30 Dec 2008 23:28:13 +0000 Subject: [PATCH] Fix a bug in the determination of LIB${NAME}_PREFIX. --- autoconf-lib-link/m4/ChangeLog | 6 ++++++ autoconf-lib-link/m4/lib-link.m4 | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog index 4e9aa14fb..27cf7e354 100644 --- a/autoconf-lib-link/m4/ChangeLog +++ b/autoconf-lib-link/m4/ChangeLog @@ -1,3 +1,9 @@ +2008-12-30 Bruno Haible + + * lib-prefix.m4 (AC_LIB_LINKFLAGS_BODY): Don't overwrite + LIB${NAME}_PREFIX when considering the dependencies of lib${name}. + Reported by Charles Wilson . + 2008-08-31 Bruno Haible Assume Solaris specific bi-arch conventions on Solaris systems. diff --git a/autoconf-lib-link/m4/lib-link.m4 b/autoconf-lib-link/m4/lib-link.m4 index 7e07a4246..e29eead27 100644 --- a/autoconf-lib-link/m4/lib-link.m4 +++ b/autoconf-lib-link/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 -- 2.47.3