Mercurial > hg > octave-jordi
comparison configure.ac @ 15295:43e484fa7e42
build: Clean up configure macros for building GUI.
* configure.ac: Don't bother to define HAVE_QSCINTILLA.
* m4/acinclude.m4: use #error function of CPP rather than relying on malformed
C code.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 04 Sep 2012 18:24:37 -0700 |
parents | 637e3b7d6a56 |
children | f19d0bce85da |
comparison
equal
deleted
inserted
replaced
15294:d1751eee9a42 | 15295:43e484fa7e42 |
---|---|
2229 CPPFLAGS="$save_CPPFLAGS" | 2229 CPPFLAGS="$save_CPPFLAGS" |
2230 LDFLAGS="$save_LDFLAGS" | 2230 LDFLAGS="$save_LDFLAGS" |
2231 LIBS="$save_LIBS" | 2231 LIBS="$save_LIBS" |
2232 AC_LANG_POP([C++]) | 2232 AC_LANG_POP([C++]) |
2233 ]) | 2233 ]) |
2234 if test $octave_cv_lib_qscintilla = "yes"; then | 2234 if test $octave_cv_lib_qscintilla = "no"; then |
2235 AC_DEFINE(HAVE_QSCINTILLA, 1, | |
2236 [Define to 1 if you the Qscintilla library is available.]) | |
2237 else | |
2238 AC_MSG_ERROR([Qscintilla library is required to build the GUI]) | 2235 AC_MSG_ERROR([Qscintilla library is required to build the GUI]) |
2239 fi | 2236 fi |
2240 | 2237 |
2241 ## Check for Qt functions which have changed their API over time | 2238 ## Check for Qt functions which have changed their API over time |
2242 OCTAVE_CHECK_FUNC_FINDFIRST_MODERN | 2239 OCTAVE_CHECK_FUNC_FINDFIRST_MODERN |