Mercurial > hg > octave-lojdl > gnulib-hg
changeset 10983:7680401c433e
Fix a bug in the determination of LIB${NAME}_PREFIX.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Wed, 31 Dec 2008 00:28:09 +0100 |
| parents | 68b73c095d08 |
| children | 9a4221960c07 |
| files | ChangeLog m4/lib-link.m4 |
| diffstat | 2 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 @@ 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