Mercurial > octave-nkf
changeset 20387:c3dab5d8e6ab
allow --disable-gui to work again (bug #45543)
* libgui/link-deps.mk, libgui/module.mk: Surround contents with
AMCOND_BUILD_BUI conditional.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 15 Jul 2015 15:27:08 -0400 |
parents | d59d9f4ec290 |
children | 5e50f25f245a |
files | libgui/link-deps.mk libgui/module.mk |
diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/link-deps.mk Wed Jul 15 09:49:21 2015 -0400 +++ b/libgui/link-deps.mk Wed Jul 15 15:27:08 2015 -0400 @@ -1,3 +1,5 @@ +if AMCOND_BUILD_GUI + if AMCOND_ENABLE_DYNAMIC_LINKING LIBOCTGUI_LINK_DEPS = else @@ -18,3 +20,5 @@ OCTAVE_GUI_LINK_DEPS = $(LIBOCTGUI_LINK_DEPS) OCTAVE_GUI_LINK_OPTS = $(LIBOCTGUI_LINK_OPTS) endif + +endif
--- a/libgui/module.mk Wed Jul 15 09:49:21 2015 -0400 +++ b/libgui/module.mk Wed Jul 15 15:27:08 2015 -0400 @@ -1,3 +1,5 @@ +if AMCOND_BUILD_GUI + MOC_CPPFLAGS = ## Fix for bug #42839 where -mieee CFLAG option is added to CPPFLAGS by gnulib. @@ -110,3 +112,4 @@ libgui/default-qt-settings \ $(LOCALES) +endif