Mercurial > octave-nkf

comparison aclocal.m4 @ 9539:41a74dcd14df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b859079d1644
children 79b5fe2d5646
comparison
equal deleted inserted replaced
9538:d0239bddf621 9539:41a74dcd14df
447 [AS_HELP_STRING([--without-$1], [$7])])], 447 [AS_HELP_STRING([--without-$1], [$7])])],
448 with_$1=$withval, with_$1=yes) 448 with_$1=$withval, with_$1=yes)
449 449
450 m4_toupper([$1])_LIBS= 450 m4_toupper([$1])_LIBS=
451 case $with_$1 in 451 case $with_$1 in
452 no)
453 m4_toupper([$1])_LIBS=
454 ;;
452 yes | "") 455 yes | "")
453 m4_toupper([$1])_LIBS="-l$1" 456 m4_toupper([$1])_LIBS="-l$1"
454 ;; 457 ;;
455 -* | */* | *.a | *.so | *.so.* | *.o) 458 -* | */* | *.a | *.so | *.so.* | *.o)
456 m4_toupper([$1])_LIBS="$with_$1" 459 m4_toupper([$1])_LIBS="$with_$1"
472 save_LIBS="$LIBS" 475 save_LIBS="$LIBS"
473 LIBS="$m4_toupper([$1])_LIBS $LIBS" 476 LIBS="$m4_toupper([$1])_LIBS $LIBS"
474 octave_$1_ok=no 477 octave_$1_ok=no
475 AC_MSG_CHECKING([for $5 in $m4_toupper([$1])_LIBS]) 478 AC_MSG_CHECKING([for $5 in $m4_toupper([$1])_LIBS])
476 AC_LINK_IFELSE([AC_LANG_CALL([], [$5])], 479 AC_LINK_IFELSE([AC_LANG_CALL([], [$5])],
477 [octave_$1_ok=yes], [m4_toupper([$1])_LIBS=""]) 480 [octave_$1_ok=yes])
478 AC_MSG_RESULT($octave_$1_ok) 481 AC_MSG_RESULT($octave_$1_ok)
479 if test $octave_$1_ok = yes; then 482 if test $octave_$1_ok = yes; then
480 m4_ifblank([$8], [ 483 m4_ifblank([$8], [
481 warn_$1= 484 warn_$1=
482 AC_DEFINE([HAVE_]m4_toupper([$1]), 1, 485 AC_DEFINE([HAVE_]m4_toupper([$1]), 1,
490 fi 493 fi
491 AC_SUBST(m4_toupper([$1])_LIBS) 494 AC_SUBST(m4_toupper([$1])_LIBS)
492 AC_SUBST([TEXINFO_]m4_toupper([$1])) 495 AC_SUBST([TEXINFO_]m4_toupper([$1]))
493 if test -n "$warn_$1"; then 496 if test -n "$warn_$1"; then
494 AC_MSG_WARN($warn_$1) 497 AC_MSG_WARN($warn_$1)
498 m4_toupper([$1])_LIBS=
495 fi 499 fi
496 ]) 500 ])
497 dnl 501 dnl
498 dnl Check for flex 502 dnl Check for flex
499 dnl 503 dnl