Mercurial > hg > octave-terminal
changeset 9539:41a74dcd14df
Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly.
author | David Grundberg <individ@acc.umu.se> |
---|---|
date | Tue, 18 Aug 2009 11:23:03 -0400 |
parents | d0239bddf621 |
children | 79b5fe2d5646 |
files | ChangeLog aclocal.m4 |
diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-08-18 David Grundberg <individ@acc.umu.se> + + * aclocal.m4 (OCTAVE_CHECK_LIBRARY): Clear QHULL_LIBS etc on + errors. Interpret --without-qhull etc correctly. + 2009-08-17 John W. Eaton <jwe@octave.org> * mkoctfile.in, mkoctfile.cc.in (FFTW3_LDFLAGS, FFTW3_LIBS,
--- a/aclocal.m4 +++ b/aclocal.m4 @@ -449,6 +449,9 @@ m4_toupper([$1])_LIBS= case $with_$1 in + no) + m4_toupper([$1])_LIBS= + ;; yes | "") m4_toupper([$1])_LIBS="-l$1" ;; @@ -474,7 +477,7 @@ octave_$1_ok=no AC_MSG_CHECKING([for $5 in $m4_toupper([$1])_LIBS]) AC_LINK_IFELSE([AC_LANG_CALL([], [$5])], - [octave_$1_ok=yes], [m4_toupper([$1])_LIBS=""]) + [octave_$1_ok=yes]) AC_MSG_RESULT($octave_$1_ok) if test $octave_$1_ok = yes; then m4_ifblank([$8], [ @@ -492,6 +495,7 @@ AC_SUBST([TEXINFO_]m4_toupper([$1])) if test -n "$warn_$1"; then AC_MSG_WARN($warn_$1) + m4_toupper([$1])_LIBS= fi ]) dnl