Mercurial > octave-nkf
changeset 16329:7d0848353eaf
build: allow make dist in libgui without Qt (bug #38518)
* Makefile.am (SUBDIRS): Include libgui conditionally on AMCOND_BUILD_GUI.
* configure.ac (GUIDIR): Delete.
| author | Mike Miller <mtmiller@ieee.org> |
|---|---|
| date | Sat, 16 Mar 2013 16:44:24 -0400 |
| parents | ba933118869b |
| children | 306e0ac231d0 |
| files | Makefile.am configure.ac |
| diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Sat Mar 16 16:19:03 2013 -0400 +++ b/Makefile.am Sat Mar 16 16:44:24 2013 -0400 @@ -70,7 +70,11 @@ include m4/module.mk # Subdirectories in which to run `make all'. -SUBDIRS = libgnu liboctave libinterp @GUIDIR@ src scripts @DOCDIR@ examples test +SUBDIRS = libgnu liboctave libinterp +if AMCOND_BUILD_GUI +SUBDIRS += libgui +endif +SUBDIRS += src scripts @DOCDIR@ examples test if ! AMCOND_BUILD_DOCS dist-hook:
--- a/configure.ac Sat Mar 16 16:19:03 2013 -0400 +++ b/configure.ac Sat Mar 16 16:44:24 2013 -0400 @@ -2549,7 +2549,6 @@ QT_LIBS= win32_terminal=no build_gui=yes -GUIDIR=libgui AC_ARG_ENABLE([gui], [AS_HELP_STRING([--disable-gui], [don't build the GUI])], [if test "$enableval" = no; then build_gui=no; fi], []) @@ -2650,17 +2649,12 @@ fi fi -if test $build_gui = no; then - ## GUI disabled. Eliminate building GUIDIR directory - GUIDIR= -fi AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = yes]) AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], [test "$octave_cv_lib_qscintilla" = yes]) AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) AC_SUBST(QT_CPPFLAGS) AC_SUBST(QT_LDFLAGS) AC_SUBST(QT_LIBS) -AC_SUBST(GUIDIR) ### Run configure in subdirectories.