Mercurial > hg > octave-thorsten

changeset 15296:43e484fa7e42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d1751eee9a42
children f19d0bce85da
files configure.ac m4/acinclude.m4
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac
+++ b/configure.ac
@@ -2231,10 +2231,7 @@
     LIBS="$save_LIBS"
     AC_LANG_POP([C++])
   ])
-  if test $octave_cv_lib_qscintilla = "yes"; then
-    AC_DEFINE(HAVE_QSCINTILLA, 1, 
-      [Define to 1 if you the Qscintilla library is available.])
-  else
+  if test $octave_cv_lib_qscintilla = "no"; then
     AC_MSG_ERROR([Qscintilla library is required to build the GUI])
   fi
 
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -158,7 +158,7 @@
         #include <Qsci/qsciglobal.h>
         ]], [[
         #if QSCINTILLA_VERSION < 0x020600
-          Old Form Found;
+        #error Old FindFirst function found.
         #endif
         ]])],
       octave_cv_func_findfirst_modern=yes,
@@ -236,7 +236,7 @@
         #include <Qt/qglobal.h>
         ]], [[
         #if QT_VERSION < 0x040700
-          No SetPlacholderText function available;
+        #error No SetPlacholderText function available.
         #endif
         ]])],
       octave_cv_func_setplaceholdertext=yes,