Mercurial > octave-nkf
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 15109:159f800d1dff | 15110:4f6e058e4161 |
|---|---|
| 2642 fi | 2642 fi |
| 2643 | 2643 |
| 2644 AC_SUBST(WARN_CFLAGS) | 2644 AC_SUBST(WARN_CFLAGS) |
| 2645 AC_SUBST(WARN_CXXFLAGS) | 2645 AC_SUBST(WARN_CXXFLAGS) |
| 2646 | 2646 |
| 2647 ### GUI/Qt related tests. | |
| 2648 | |
| 2649 AC_CHECK_PROGS(MOC, [moc moc-qt4 moc-qt5]) | |
| 2650 AC_CHECK_PROGS(UIC, [uic uic-qt4 uic-qt5]) | |
| 2651 AC_CHECK_PROGS(QMAKE, [qmake qmake-qt4 qmake-qt5]) | |
| 2652 | |
| 2653 AC_SUBST(MOC) | |
| 2654 AC_SUBST(UIC) | |
| 2655 | |
| 2656 QT_INCDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_HEADERS://p'` | |
| 2657 QT_LIBDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_LIBS://p'` | |
| 2658 | |
| 2659 AC_SUBST(QT_INCDIR) | |
| 2660 AC_SUBST(QT_LIBDIR) | |
| 2661 | |
| 2662 case "$canonical_host_type" in | |
| 2663 *-*-mingw* | *-*-msdosmsvc*) win32_terminal=yes ;; | |
| 2664 *) | |
| 2665 win32_terminal=no | |
| 2666 AC_CHECK_HEADERS([pty.h libutil.h util.h]) | |
| 2667 AC_SEARCH_LIBS([openpty], [util], [AC_DEFINE([HAVE_OPENPTY], [], [Define whether openpty exists])]) | |
| 2668 ;; | |
| 2669 esac | |
| 2670 AM_CONDITIONAL([WIN32_TERMINAL], [test x$win32_terminal = xyes]) | |
| 2671 | |
| 2647 ### Run configure in subdirectories. | 2672 ### Run configure in subdirectories. |
| 2648 | 2673 |
| 2649 export CC | 2674 export CC |
| 2650 export CXX | 2675 export CXX |
| 2651 export F77 | 2676 export F77 |
| 2812 doc/icons/Makefile | 2837 doc/icons/Makefile |
| 2813 doc/interpreter/Makefile | 2838 doc/interpreter/Makefile |
| 2814 doc/liboctave/Makefile | 2839 doc/liboctave/Makefile |
| 2815 doc/refcard/Makefile | 2840 doc/refcard/Makefile |
| 2816 examples/Makefile | 2841 examples/Makefile |
| 2842 gui/Makefile | |
| 2843 gui/src/Makefile | |
| 2817 libcruft/Makefile | 2844 libcruft/Makefile |
| 2818 libcruft/mkf77def | 2845 libcruft/mkf77def |
| 2819 libgnu/Makefile | 2846 libgnu/Makefile |
| 2820 liboctave/Makefile | 2847 liboctave/Makefile |
| 2821 scripts/Makefile | 2848 scripts/Makefile |