Mercurial > octave-nkf
diff configure.ac @ 15116:3d7a7ae53bbf gui
Further integration of GUI in the build system.
* Makefile.am (SUBDIRS): Add gui conditionally.
* configure.ac (AC_CHECK_PROGS(rcc)): Check for new program.
(AC_ARG_ENABLE(gui): New configure flag.
* gui/src/Makefile.am: Add support for resource file compilation.
Use nodist_XXX_SOURCES for MOC files.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Sun, 05 Aug 2012 20:04:53 +0100 |
| parents | 7279c6fc3acb |
| children | 3735a0e783cb |
line wrap: on
line diff
--- a/configure.ac Sun Aug 05 12:35:28 2012 -0400 +++ b/configure.ac Sun Aug 05 20:04:53 2012 +0100 @@ -2134,6 +2134,7 @@ AC_CHECK_PROGS(MOC, [moc moc-qt4 moc-qt5]) AC_CHECK_PROGS(UIC, [uic uic-qt4 uic-qt5]) +AC_CHECK_PROGS(RCC, [rcc]) AC_CHECK_PROGS(QMAKE, [qmake qmake-qt4 qmake-qt5]) AC_SUBST(MOC) @@ -2155,6 +2156,14 @@ esac AM_CONDITIONAL([WIN32_TERMINAL], [test x$win32_terminal = xyes]) +octave_gui= +AC_ARG_ENABLE(gui, + [AS_HELP_STRING([--enable-gui], [build GUI (default is no)])], + [if test "$enableval" = yes; then + octave_gui=yes + fi], []) +AM_CONDITIONAL([OCTAVE_GUI], [test x$octave_gui = xyes]) + ### Run configure in subdirectories. export CC