Mercurial > octave-libtiff
changeset 23172:6e7f8a92a852 stable
configure: use the correct flags when testing for the CXSparse library version
* acinclude.m4 (OCTAVE_CHECK_CXSPARSE_VERSION_OK): Include CXSPARSE_CPPFLAGS
instead of QT_CPPFLAGS when testing for the CXSparse library version. Don't
set C++ language options, unnecessary for a preprocessor test.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Fri, 06 Jan 2017 11:15:15 -0800 |
| parents | d7ea2662a7a8 |
| children | ac76a90f17ff 039dfdc2d2ad |
| files | m4/acinclude.m4 |
| diffstat | 1 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 Mon Feb 06 12:37:04 2017 -0800 +++ b/m4/acinclude.m4 Fri Jan 06 11:15:15 2017 -0800 @@ -187,11 +187,8 @@ AC_DEFUN([OCTAVE_CHECK_CXSPARSE_VERSION_OK], [ AC_CACHE_CHECK([whether CXSparse is version 2.2 or later], [octave_cv_cxsparse_version_ok], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" + [ac_octave_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CXSPARSE_CPPFLAGS $CPPFLAGS" AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ #if defined (HAVE_SUITESPARSE_CS_H) #include <suitesparse/cs.h> @@ -213,8 +210,6 @@ octave_cv_cxsparse_version_ok=yes, octave_cv_cxsparse_version_ok=no) CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) ]) if test $octave_cv_cxsparse_version_ok = yes; then AC_DEFINE(HAVE_CXSPARSE_VERSION_OK, 1,