Mercurial > octave
diff aclocal.m4 @ 9540:79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 18 Aug 2009 12:10:16 -0400 |
| parents | 41a74dcd14df |
| children | f5ec5dc66824 |
line wrap: on
line diff
--- a/aclocal.m4 Tue Aug 18 11:23:03 2009 -0400 +++ b/aclocal.m4 Tue Aug 18 12:10:16 2009 -0400 @@ -466,13 +466,13 @@ [TEXINFO_]m4_toupper([$1])= warn_$1="$3" if test -n "$m4_toupper([$1])_LIBS"; then - save_CPPFLAGS="$CPPFLAGS" + octave_check_library_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS" m4_ifnblank([$6], [AC_LANG_PUSH($6)]) AC_CHECK_HEADERS($4, [ - save_LDFLAGS="$LDFLAGS" + octave_check_library_save_LDFLAGS="$LDFLAGS" LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS" - save_LIBS="$LIBS" + octave_check_library_save_LIBS="$LIBS" LIBS="$m4_toupper([$1])_LIBS $LIBS" octave_$1_ok=no AC_MSG_CHECKING([for $5 in $m4_toupper([$1])_LIBS]) @@ -486,10 +486,10 @@ [Define if $2 is available.]) [TEXINFO_]m4_toupper([$1])="@set [HAVE_]m4_toupper([$1])"], [$8]) fi - LIBS="$save_LIBS" - LDFLAGS="$save_LDFLAGS"]) + LIBS="$octave_check_library_save_LIBS" + LDFLAGS="$octave_check_library_save_LDFLAGS"]) m4_ifnblank([$6], [AC_LANG_POP($6)]) - CPPFLAGS="$save_CPPFLAGS" + CPPFLAGS="$octave_check_library_save_CPPFLAGS" fi AC_SUBST(m4_toupper([$1])_LIBS) AC_SUBST([TEXINFO_]m4_toupper([$1]))