Mercurial > hg > octave-nkf

comparison configure.ac @ 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 3d7a7ae53bbf
children 089b98bdaebf
comparison
equal deleted inserted replaced
15116:3d7a7ae53bbf 15117:3735a0e783cb
2130 AC_SUBST(WARN_CFLAGS) 2130 AC_SUBST(WARN_CFLAGS)
2131 AC_SUBST(WARN_CXXFLAGS) 2131 AC_SUBST(WARN_CXXFLAGS)
2132 2132
2133 ### GUI/Qt related tests. 2133 ### GUI/Qt related tests.
2134 2134
2135 AC_CHECK_PROGS(MOC, [moc moc-qt4 moc-qt5]) 2135 HAVE_QT=false
2136 AC_CHECK_PROGS(UIC, [uic uic-qt4 uic-qt5]) 2136 GUIDIR=
2137 AC_CHECK_PROGS(RCC, [rcc]) 2137 QT_INCDIR=
2138 QT_LIBDIR=
2138 AC_CHECK_PROGS(QMAKE, [qmake qmake-qt4 qmake-qt5]) 2139 AC_CHECK_PROGS(QMAKE, [qmake qmake-qt4 qmake-qt5])
2139 2140 if test -n "$QMAKE"; then
2140 AC_SUBST(MOC) 2141 QT_INCDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_HEADERS://p'`
2141 AC_SUBST(UIC) 2142 QT_LIBDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_LIBS://p'`
2142 2143 AC_CHECK_PROGS(MOC, [moc moc-qt4 moc-qt5])
2143 QT_INCDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_HEADERS://p'` 2144 AC_CHECK_PROGS(UIC, [uic uic-qt4 uic-qt5])
2144 QT_LIBDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_LIBS://p'` 2145 AC_CHECK_PROGS(RCC, [rcc])
2145 2146 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC"; then
2147 HAVE_QT=true
2148 AC_DEFINE([HAVE_QT], 1, [Define to 1 if Qt is available (must have moc, uic, and rcc programs and developer header files and libraries installed)])
2149 GUIDIR=gui
2150 fi
2151 fi
2146 AC_SUBST(QT_INCDIR) 2152 AC_SUBST(QT_INCDIR)
2147 AC_SUBST(QT_LIBDIR) 2153 AC_SUBST(QT_LIBDIR)
2154 AC_SUBST(GUIDIR)
2148 2155
2149 case "$canonical_host_type" in 2156 case "$canonical_host_type" in
2150 *-*-mingw* | *-*-msdosmsvc*) win32_terminal=yes ;; 2157 *-*-mingw* | *-*-msdosmsvc*) win32_terminal=yes ;;
2151 *) 2158 *)
2152 win32_terminal=no 2159 win32_terminal=no
2418 PTHREAD libraries: $PTHREAD_LIBS 2425 PTHREAD libraries: $PTHREAD_LIBS
2419 QHULL CPPFLAGS: $QHULL_CPPFLAGS 2426 QHULL CPPFLAGS: $QHULL_CPPFLAGS
2420 QHULL LDFLAGS: $QHULL_LDFLAGS 2427 QHULL LDFLAGS: $QHULL_LDFLAGS
2421 QHULL libraries: $QHULL_LIBS 2428 QHULL libraries: $QHULL_LIBS
2422 QRUPDATE libraries: $QRUPDATE_LIBS 2429 QRUPDATE libraries: $QRUPDATE_LIBS
2430 Qt headers: $QT_INCDIR
2431 Qt libraries: $QT_LIBDIR
2423 READLINE libraries: $READLINE_LIBS 2432 READLINE libraries: $READLINE_LIBS
2424 REGEX libraries: $REGEX_LIBS 2433 REGEX libraries: $REGEX_LIBS
2425 TERM libraries: $TERM_LIBS 2434 TERM libraries: $TERM_LIBS
2426 UMFPACK libraries: $UMFPACK_LIBS 2435 UMFPACK libraries: $UMFPACK_LIBS
2427 X11 include flags: $X11_INCFLAGS 2436 X11 include flags: $X11_INCFLAGS