comparison aclocal.m4 @ 9568:d3fccc4c4b9e

use OCTAVE_CHECK_LIBRARY to check for ARPACK
author John W. Eaton <jwe@octave.org>
date Wed, 26 Aug 2009 13:15:40 -0400
parents 1d51ab34b509
children b03062e16c6f
comparison
equal deleted inserted replaced
9567:0a4eb56c5676 9568:d3fccc4c4b9e
467 warn_$1="$3" 467 warn_$1="$3"
468 if test -n "$m4_toupper([$1])_LIBS"; then 468 if test -n "$m4_toupper([$1])_LIBS"; then
469 octave_check_library_save_CPPFLAGS="$CPPFLAGS" 469 octave_check_library_save_CPPFLAGS="$CPPFLAGS"
470 CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS" 470 CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS"
471 m4_ifnblank([$6], [AC_LANG_PUSH($6)]) 471 m4_ifnblank([$6], [AC_LANG_PUSH($6)])
472 AC_CHECK_HEADERS($4, [ 472 octave_$1_check_for_lib=false
473 m4_ifblank([$4], [octave_$1_check_for_lib=true],
474 [AC_CHECK_HEADERS($4, [octave_$1_check_for_lib=true; break])])
475 if $octave_$1_check_for_lib; then
473 octave_check_library_save_LDFLAGS="$LDFLAGS" 476 octave_check_library_save_LDFLAGS="$LDFLAGS"
474 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS" 477 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS"
475 octave_check_library_save_LIBS="$LIBS" 478 octave_check_library_save_LIBS="$LIBS"
476 LIBS="$m4_toupper([$1])_LIBS $LIBS" 479 LIBS="$m4_toupper([$1])_LIBS $LIBS"
477 octave_$1_ok=no 480 octave_$1_ok=no
485 AC_DEFINE([HAVE_]m4_toupper([$1]), 1, 488 AC_DEFINE([HAVE_]m4_toupper([$1]), 1,
486 [Define if $2 is available.]) 489 [Define if $2 is available.])
487 [TEXINFO_]m4_toupper([$1])="@set [HAVE_]m4_toupper([$1])"], [$8]) 490 [TEXINFO_]m4_toupper([$1])="@set [HAVE_]m4_toupper([$1])"], [$8])
488 fi 491 fi
489 LIBS="$octave_check_library_save_LIBS" 492 LIBS="$octave_check_library_save_LIBS"
490 LDFLAGS="$octave_check_library_save_LDFLAGS"]) 493 LDFLAGS="$octave_check_library_save_LDFLAGS"
494 fi
491 m4_ifnblank([$6], [AC_LANG_POP($6)]) 495 m4_ifnblank([$6], [AC_LANG_POP($6)])
492 CPPFLAGS="$octave_check_library_save_CPPFLAGS" 496 CPPFLAGS="$octave_check_library_save_CPPFLAGS"
493 fi 497 fi
494 AC_SUBST(m4_toupper([$1])_LIBS) 498 AC_SUBST(m4_toupper([$1])_LIBS)
495 AC_SUBST([TEXINFO_]m4_toupper([$1])) 499 AC_SUBST([TEXINFO_]m4_toupper([$1]))