# HG changeset patch
# User Rik <rik@octave.org>
# Date 1346808277 25200
# Node ID 43e484fa7e424d32ea1bb9ebffa83f248c40aff7
# Parent  d1751eee9a42c5d745130e8c9ee567bdf3172ee9
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.

diff -r d1751eee9a42 -r 43e484fa7e42 configure.ac
--- a/configure.ac	Tue Sep 04 17:36:11 2012 -0700
+++ b/configure.ac	Tue Sep 04 18:24:37 2012 -0700
@@ -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
 
diff -r d1751eee9a42 -r 43e484fa7e42 m4/acinclude.m4
--- a/m4/acinclude.m4	Tue Sep 04 17:36:11 2012 -0700
+++ b/m4/acinclude.m4	Tue Sep 04 18:24:37 2012 -0700
@@ -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,