Mercurial > octave

comparison src/oct-conf.in.h @ 15117:3735a0e783cb gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 8523df595d42
children 1c711a646fa7
comparison
equal deleted inserted replaced
15116:3d7a7ae53bbf 15117:3735a0e783cb
462 462
463 #ifndef OCTAVE_CONF_QRUPDATE_LIBS 463 #ifndef OCTAVE_CONF_QRUPDATE_LIBS
464 #define OCTAVE_CONF_QRUPDATE_LIBS %OCTAVE_CONF_QRUPDATE_LIBS% 464 #define OCTAVE_CONF_QRUPDATE_LIBS %OCTAVE_CONF_QRUPDATE_LIBS%
465 #endif 465 #endif
466 466
467 #ifndef OCTAVE_CONF_QT_INCDIR
468 #define OCTAVE_CONF_QT_INCDIR %OCTAVE_CONF_QT_INCDIR%
469 #endif
470
471 #ifndef OCTAVE_CONF_QT_LIBDIR
472 #define OCTAVE_CONF_QT_LIBDIR %OCTAVE_CONF_QT_LIBDIR%
473 #endif
474
467 #ifndef OCTAVE_CONF_RANLIB 475 #ifndef OCTAVE_CONF_RANLIB
468 #define OCTAVE_CONF_RANLIB %OCTAVE_CONF_RANLIB% 476 #define OCTAVE_CONF_RANLIB %OCTAVE_CONF_RANLIB%
469 #endif 477 #endif
470 478
471 #ifndef OCTAVE_CONF_RDYNAMIC_FLAG 479 #ifndef OCTAVE_CONF_RDYNAMIC_FLAG