Mercurial > octave

comparison m4/acinclude.m4 @ 31134:b8d37c022e40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 55415fa6a20f
comparison
equal deleted inserted replaced
31133:1d61c36bb34a 31134:b8d37c022e40
1351 return x 1351 return x
1352 ]])], 1352 ]])],
1353 [octave_cv_lib_hdf5_dll=no], 1353 [octave_cv_lib_hdf5_dll=no],
1354 [save_CFLAGS="$CFLAGS" 1354 [save_CFLAGS="$CFLAGS"
1355 CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_" 1355 CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_"
1356 save_LIBS="$LIBS" 1356 ac_octave_save_LIBS="$LIBS"
1357 LIBS="$HDF5_LIBS $LIBS" 1357 LIBS="$HDF5_LIBS $LIBS"
1358 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ 1358 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
1359 #include <hdf5.h> 1359 #include <hdf5.h>
1360 ]], [[ 1360 ]], [[
1361 hid_t x = H5T_NATIVE_DOUBLE; 1361 hid_t x = H5T_NATIVE_DOUBLE;
1362 return x 1362 return x
1363 ]])], 1363 ]])],
1364 octave_cv_lib_hdf5_dll=yes, 1364 octave_cv_lib_hdf5_dll=yes,
1365 octave_cv_lib_hdf5_dll=no) 1365 octave_cv_lib_hdf5_dll=no)
1366 CFLAGS="$save_CFLAGS" 1366 CFLAGS="$save_CFLAGS"
1367 LIBS="$save_LIBS" 1367 LIBS="$ac_octave_save_LIBS"
1368 ]) 1368 ])
1369 ]) 1369 ])
1370 if test $octave_cv_lib_hdf5_dll = yes; then 1370 if test $octave_cv_lib_hdf5_dll = yes; then
1371 AC_DEFINE(_HDF5USEDLL_, 1, [Define to 1 if using HDF5 dll (Win32).]) 1371 AC_DEFINE(_HDF5USEDLL_, 1, [Define to 1 if using HDF5 dll (Win32).])
1372 fi 1372 fi
1430 # include <OpenGL/gl.h> 1430 # include <OpenGL/gl.h>
1431 #endif 1431 #endif
1432 ]) 1432 ])
1433 case $canonical_host_type in 1433 case $canonical_host_type in
1434 *-*-mingw32* | *-*-msdosmsvc) 1434 *-*-mingw32* | *-*-msdosmsvc)
1435 save_LIBS="$LIBS" 1435 ac_octave_save_LIBS="$LIBS"
1436 LIBS="$LIBS -lopengl32" 1436 LIBS="$LIBS -lopengl32"
1437 AC_MSG_CHECKING([for glEnable in -lopengl32]) 1437 AC_MSG_CHECKING([for glEnable in -lopengl32])
1438 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ 1438 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
1439 #if HAVE_WINDOWS_H 1439 #if HAVE_WINDOWS_H
1440 # include <windows.h> 1440 # include <windows.h>
1446 #endif 1446 #endif
1447 ]], [[ 1447 ]], [[
1448 glEnable(GL_SMOOTH); 1448 glEnable(GL_SMOOTH);
1449 ]])], [OPENGL_LIBS="-lopengl32 -lglu32"]) 1449 ]])], [OPENGL_LIBS="-lopengl32 -lglu32"])
1450 1450
1451 LIBS="$save_LIBS" 1451 LIBS="$ac_octave_save_LIBS"
1452 if test -n "$OPENGL_LIBS"; then 1452 if test -n "$OPENGL_LIBS"; then
1453 AC_MSG_RESULT([yes]) 1453 AC_MSG_RESULT([yes])
1454 else 1454 else
1455 AC_MSG_RESULT([no]) 1455 AC_MSG_RESULT([no])
1456 fi 1456 fi
1757 AC_CACHE_CHECK([for the QScintilla library for Qt $qt_version], 1757 AC_CACHE_CHECK([for the QScintilla library for Qt $qt_version],
1758 [octave_cv_lib_qscintilla], 1758 [octave_cv_lib_qscintilla],
1759 [save_CPPFLAGS="$CPPFLAGS" 1759 [save_CPPFLAGS="$CPPFLAGS"
1760 save_CXXFLAGS="$CXXFLAGS" 1760 save_CXXFLAGS="$CXXFLAGS"
1761 save_LDFLAGS="$LDFLAGS" 1761 save_LDFLAGS="$LDFLAGS"
1762 save_LIBS="$LIBS" 1762 ac_octave_save_LIBS="$LIBS"
1763 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" 1763 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1764 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" 1764 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
1765 LDFLAGS="$QT_LDFLAGS $LDFLAGS" 1765 LDFLAGS="$QT_LDFLAGS $LDFLAGS"
1766 AC_LANG_PUSH(C++) 1766 AC_LANG_PUSH(C++)
1767 for octave_qscintilla_try in $octave_qscintilla_libnames; do 1767 for octave_qscintilla_try in $octave_qscintilla_libnames; do
1780 fi 1780 fi
1781 done 1781 done
1782 CPPFLAGS="$save_CPPFLAGS" 1782 CPPFLAGS="$save_CPPFLAGS"
1783 CXXFLAGS="$save_CXXFLAGS" 1783 CXXFLAGS="$save_CXXFLAGS"
1784 LDFLAGS="$save_LDFLAGS" 1784 LDFLAGS="$save_LDFLAGS"
1785 LIBS="$save_LIBS" 1785 LIBS="$ac_octave_save_LIBS"
1786 AC_LANG_POP([C++]) 1786 AC_LANG_POP([C++])
1787 ]) 1787 ])
1788 1788
1789 if test $octave_cv_lib_qscintilla = no; then 1789 if test $octave_cv_lib_qscintilla = no; then
1790 warn_qscintilla="QScintilla library not found; disabling built-in Qt GUI editor" 1790 warn_qscintilla="QScintilla library not found; disabling built-in Qt GUI editor"