Mercurial > octave

comparison m4/acinclude.m4 @ 23172:6e7f8a92a852 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e9a0469dedd9
children ac76a90f17ff 039dfdc2d2ad
comparison
equal deleted inserted replaced
23168:d7ea2662a7a8 23172:6e7f8a92a852
185 dnl be re-written to actually call a function, but is it worth it? 185 dnl be re-written to actually call a function, but is it worth it?
186 dnl 186 dnl
187 AC_DEFUN([OCTAVE_CHECK_CXSPARSE_VERSION_OK], [ 187 AC_DEFUN([OCTAVE_CHECK_CXSPARSE_VERSION_OK], [
188 AC_CACHE_CHECK([whether CXSparse is version 2.2 or later], 188 AC_CACHE_CHECK([whether CXSparse is version 2.2 or later],
189 [octave_cv_cxsparse_version_ok], 189 [octave_cv_cxsparse_version_ok],
190 [AC_LANG_PUSH(C++) 190 [ac_octave_save_CPPFLAGS="$CPPFLAGS"
191 ac_octave_save_CPPFLAGS="$CPPFLAGS" 191 CPPFLAGS="$CXSPARSE_CPPFLAGS $CPPFLAGS"
192 ac_octave_save_CXXFLAGS="$CXXFLAGS"
193 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
194 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
195 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ 192 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
196 #if defined (HAVE_SUITESPARSE_CS_H) 193 #if defined (HAVE_SUITESPARSE_CS_H)
197 #include <suitesparse/cs.h> 194 #include <suitesparse/cs.h>
198 #elif defined (HAVE_UFSPARSE_CS_H) 195 #elif defined (HAVE_UFSPARSE_CS_H)
199 #include <ufsparse/cs.h> 196 #include <ufsparse/cs.h>
211 #endif 208 #endif
212 ]])], 209 ]])],
213 octave_cv_cxsparse_version_ok=yes, 210 octave_cv_cxsparse_version_ok=yes,
214 octave_cv_cxsparse_version_ok=no) 211 octave_cv_cxsparse_version_ok=no)
215 CPPFLAGS="$ac_octave_save_CPPFLAGS" 212 CPPFLAGS="$ac_octave_save_CPPFLAGS"
216 CXXFLAGS="$ac_octave_save_CXXFLAGS"
217 AC_LANG_POP(C++)
218 ]) 213 ])
219 if test $octave_cv_cxsparse_version_ok = yes; then 214 if test $octave_cv_cxsparse_version_ok = yes; then
220 AC_DEFINE(HAVE_CXSPARSE_VERSION_OK, 1, 215 AC_DEFINE(HAVE_CXSPARSE_VERSION_OK, 1,
221 [Define to 1 if CXSparse is version 2.2 or later.]) 216 [Define to 1 if CXSparse is version 2.2 or later.])
222 fi 217 fi