Mercurial > octave
changeset 31134:b8d37c022e40
acinclude.m4: use same name for temporary LIBS variable throughout all macros.
* acinclude.m4: Use "ac_octave_save_LIBS" as the name for temporarily holding
LIBS variable.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 09 Jul 2022 11:46:06 -0700 |
| parents | 1d61c36bb34a |
| children | 05a64f60bc1e |
| files | m4/acinclude.m4 |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 Sat Jul 09 11:29:19 2022 -0700 +++ b/m4/acinclude.m4 Sat Jul 09 11:46:06 2022 -0700 @@ -1353,7 +1353,7 @@ [octave_cv_lib_hdf5_dll=no], [save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_" - save_LIBS="$LIBS" + ac_octave_save_LIBS="$LIBS" LIBS="$HDF5_LIBS $LIBS" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <hdf5.h> @@ -1364,7 +1364,7 @@ octave_cv_lib_hdf5_dll=yes, octave_cv_lib_hdf5_dll=no) CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" + LIBS="$ac_octave_save_LIBS" ]) ]) if test $octave_cv_lib_hdf5_dll = yes; then @@ -1432,7 +1432,7 @@ ]) case $canonical_host_type in *-*-mingw32* | *-*-msdosmsvc) - save_LIBS="$LIBS" + ac_octave_save_LIBS="$LIBS" LIBS="$LIBS -lopengl32" AC_MSG_CHECKING([for glEnable in -lopengl32]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -1448,7 +1448,7 @@ glEnable(GL_SMOOTH); ]])], [OPENGL_LIBS="-lopengl32 -lglu32"]) - LIBS="$save_LIBS" + LIBS="$ac_octave_save_LIBS" if test -n "$OPENGL_LIBS"; then AC_MSG_RESULT([yes]) else @@ -1759,7 +1759,7 @@ [save_CPPFLAGS="$CPPFLAGS" save_CXXFLAGS="$CXXFLAGS" save_LDFLAGS="$LDFLAGS" - save_LIBS="$LIBS" + ac_octave_save_LIBS="$LIBS" CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" CXXFLAGS="$CXXPICFLAG $CXXFLAGS" LDFLAGS="$QT_LDFLAGS $LDFLAGS" @@ -1782,7 +1782,7 @@ CPPFLAGS="$save_CPPFLAGS" CXXFLAGS="$save_CXXFLAGS" LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + LIBS="$ac_octave_save_LIBS" AC_LANG_POP([C++]) ])