Mercurial > hg > octave-lyh

diff libgui/src/module.mk @ 16291:c22a6cecaedd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Use AMCOND to build GUI editor if Qscintilla available. * configure.ac: Add new AMCOND_HAVE_QSCINTILLA Automake Conditional. * libgui/src/m-editor/file-editor-interface.h, libgui/src/m-editor/file-editor-tab.h, libgui/src/m-editor/file-editor.h, libgui/src/m-editor/find-dialog.h, libgui/src/m-editor/lexer-octave-gui.h: Remove '#ifdef HAVE_QSCINTILLA' declarations * libgui/src/module.mk: Check AMCOND_HAVE_QSCINTILLA before adding GUI editor files to octave_gui_MOC variable.
author Rik <rik@octave.org>
date Tue, 12 Mar 2013 19:03:07 -0700
parents c3057d80cf91
children 7fa90eb41240
line wrap: on
line diff
--- a/libgui/src/module.mk
+++ b/libgui/src/module.mk
@@ -55,12 +55,18 @@
   src/icons/zoom-in.png \
   src/icons/zoom-out.png
 
-octave_gui_MOC = \
+octave_gui_MOC =
+
+if AMCOND_HAVE_QSCINTILLA
+octave_gui_MOC += \
   src/m-editor/moc-file-editor-interface.cc \
   src/m-editor/moc-file-editor-tab.cc \
   src/m-editor/moc-file-editor.cc \
   src/m-editor/moc-find-dialog.cc \
-  src/m-editor/moc-lexer-octave-gui.cc \
+  src/m-editor/moc-lexer-octave-gui.cc
+endif
+
+octave_gui_MOC += \
   src/moc-documentation-dockwidget.cc \
   src/moc-files-dockwidget.cc \
   src/moc-history-dockwidget.cc \