Mercurial > octave-nkf
diff configure.ac @ 15110:4f6e058e4161 gui
Integrate GUI building with regular octave build system.
* configure.ac: Add detection of qmake, moc and uic. Use qmake to retrieve Qt
include and lib directories. Detect openpty (for libqterminal compilation).
Add generation of gui/Makefile and gui/src/Makefile. Add WIN32_TERMINAL automake
conditional.
* gui/Makefile.am: New file.
* gui/src/Makefile.am: Likewise.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Sun, 05 Aug 2012 14:37:22 +0100 |
| parents | a132d206a36a |
| children | 7279c6fc3acb |
line wrap: on
line diff
--- a/configure.ac Sun Aug 05 09:22:09 2012 -0400 +++ b/configure.ac Sun Aug 05 14:37:22 2012 +0100 @@ -2644,6 +2644,31 @@ AC_SUBST(WARN_CFLAGS) AC_SUBST(WARN_CXXFLAGS) +### GUI/Qt related tests. + +AC_CHECK_PROGS(MOC, [moc moc-qt4 moc-qt5]) +AC_CHECK_PROGS(UIC, [uic uic-qt4 uic-qt5]) +AC_CHECK_PROGS(QMAKE, [qmake qmake-qt4 qmake-qt5]) + +AC_SUBST(MOC) +AC_SUBST(UIC) + +QT_INCDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_HEADERS://p'` +QT_LIBDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_LIBS://p'` + +AC_SUBST(QT_INCDIR) +AC_SUBST(QT_LIBDIR) + +case "$canonical_host_type" in + *-*-mingw* | *-*-msdosmsvc*) win32_terminal=yes ;; + *) + win32_terminal=no + AC_CHECK_HEADERS([pty.h libutil.h util.h]) + AC_SEARCH_LIBS([openpty], [util], [AC_DEFINE([HAVE_OPENPTY], [], [Define whether openpty exists])]) + ;; +esac +AM_CONDITIONAL([WIN32_TERMINAL], [test x$win32_terminal = xyes]) + ### Run configure in subdirectories. export CC @@ -2814,6 +2839,8 @@ doc/liboctave/Makefile doc/refcard/Makefile examples/Makefile + gui/Makefile + gui/src/Makefile libcruft/Makefile libcruft/mkf77def libgnu/Makefile