Mercurial > octave-nkf
changeset 9520:bd5909b89457
fix OCTAVE_CHECK_LIBRARY
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Thu, 13 Aug 2009 08:25:02 +0200 |
| parents | ee99f9f37505 |
| children | e08d72bb988e |
| files | ChangeLog aclocal.m4 |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 13 00:41:07 2009 -0400 +++ b/ChangeLog Thu Aug 13 08:25:02 2009 +0200 @@ -1,3 +1,8 @@ +2009-08-13 Jaroslav Hajek <highegg@gmail.com> + + * aclocal.m4 (OCTAVE_CHECK_LIBRARY): Prepend to LIBS rather than + replacing. + 2009-08-13 John W. Eaton <jwe@octave.org> * Makeconf.in (QHULL_CPPFLAGS, QHULL_LDFLAGS, CURL_CPPFLAGS,
--- a/aclocal.m4 Thu Aug 13 00:41:07 2009 -0400 +++ b/aclocal.m4 Thu Aug 13 08:25:02 2009 +0200 @@ -453,7 +453,7 @@ save_LDFLAGS="$LDFLAGS" LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS" save_LIBS="$LIBS" - LIBS="$m4_toupper([$1])_LIBS" + LIBS="$m4_toupper([$1])_LIBS $LIBS" octave_$1_ok=no AC_MSG_CHECKING([for $5 in $m4_toupper([$1])_LIBS]) AC_LINK_IFELSE([AC_LANG_CALL([], [$5])],