Mercurial > octave
diff src/interpfcn/toplev.cc @ 15117:3735a0e783cb gui
more tweaks for the gui build
* configure.ac (HAVE_QT, GUIDIR): New variables.
Don't run qmake unless it is found. Don't check for moc, uic, or rcc
unless qmake is available. List Qt headers and libraries in summary
message.
* Makefile.am (SUBDIRS): Add @GUIDIR@ to the list.
* common.mk (do_subst_config_vals): Substitute OCTAVE_CONF_QT_INCDIR
and OCTAVE_CONF_QT_LIBDIR.
* gui/src/Makefile.am: Simplify pattern rule for moc files.
(octave_gui_CPPFLAGS): = Include -I@QT_INCDIR@ in the list.
(octave_gui_LDADD): Include ../../liboctave/liboctave.la and
../../libcruft/libcruft.la in the list.
(libqterminal_la_CPPFLAGS): Include -I@QT_INCDIR@ in the list.
* toplev.cc (octave_config_info): New struct fields, QT_INCDIR and
QT_LIBDIR.
* oct-conf.in.h (OCTAVE_CONF_QT_INCDIR, OCTAVE_CONF_QT_LIBDIR):
New macros.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 05 Aug 2012 16:43:55 -0400 |
parents | 60ff2cef569d |
children | d8a10cae1dcd |
line wrap: on
line diff
--- a/src/interpfcn/toplev.cc Sun Aug 05 20:04:53 2012 +0100 +++ b/src/interpfcn/toplev.cc Sun Aug 05 16:43:55 2012 -0400 @@ -1342,6 +1342,8 @@ { false, "QRUPDATE_CPPFLAGS", OCTAVE_CONF_QRUPDATE_CPPFLAGS }, { false, "QRUPDATE_LDFLAGS", OCTAVE_CONF_QRUPDATE_LDFLAGS }, { false, "QRUPDATE_LIBS", OCTAVE_CONF_QRUPDATE_LIBS }, + { false, "QT_INCDIR", OCTAVE_CONF_QT_INCDIR }, + { false, "QT_LIBDIR", OCTAVE_CONF_QT_LIBDIR }, { false, "RANLIB", OCTAVE_CONF_RANLIB }, { false, "RDYNAMIC_FLAG", OCTAVE_CONF_RDYNAMIC_FLAG }, { false, "READLINE_LIBS", OCTAVE_CONF_READLINE_LIBS },