# HG changeset patch # User John W. Eaton # Date 1436988428 14400 # Node ID c3dab5d8e6ab8775021ae0eb8774ef87827890b6 # Parent d59d9f4ec29070eaf2e6e0486337aa3b1a4f9d34 allow --disable-gui to work again (bug #45543) * libgui/link-deps.mk, libgui/module.mk: Surround contents with AMCOND_BUILD_BUI conditional. diff -r d59d9f4ec290 -r c3dab5d8e6ab libgui/link-deps.mk --- 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 diff -r d59d9f4ec290 -r c3dab5d8e6ab libgui/module.mk --- 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