* configure.ac (enable-gui-projects): New option to disable builing

of projects depending -gui/AppKit.  Default to yes.
	(enable-gorm-palette): Default to the setting for enable-gui-projects.
	* configure: Regenerate.
	* GNUmakefile.in: Extract all GUI libs into variable.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@27917 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2009-02-18 16:28:00 +00:00
parent 25a2598847
commit c16000b164
4 changed files with 34 additions and 6 deletions

View file

@ -1,3 +1,11 @@
2009-02-18 David Ayers <ayers@fsfe.org>
* configure.ac (enable-gui-projects): New option to disable builing
of projects depending -gui/AppKit. Default to yes.
(enable-gorm-palette): Default to the setting for enable-gui-projects.
* configure: Regenerate.
* GNUmakefile.in: Extract all GUI libs into variable.
2009-02-18 Matt Rice <ratmice@gmail.com>
* GNUmakefile.in: Add Trading subproject.

View file

@ -37,12 +37,13 @@ SVN_BASE_URL=http://svn.gna.org/svn/gnustep/libs
# The list of subproject directories
#
SUBPROJECTS = EOControl EOAccess EOAdaptors Tools
GUI_SUBPROJECTS = @GUI_SUBPROJECTS@
ifeq ($(GUI_MAKE_LOADED),yes)
SUBPROJECTS += EOInterface EOModeler DBModeler Trading @GUI_SUBPROJECTS@
SUBPROJECTS += $(GUI_SUBPROJECTS)
endif
ifeq ($(GUI_LIB),apple)
SUBPROJECTS += EOInterface EOModeler DBModeler Trading @GUI_SUBPROJECTS@
SUBPROJECTS += $(GUI_SUBPROJECTS)
endif
DOCUMENT_NAME = GDL2

16
configure vendored
View file

@ -1256,6 +1256,7 @@ if test -n "$ac_init_help"; then
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-gui-projects to disable building GUI projects
--disable-gorm-palette to disable building gorm palette
Optional Packages:
@ -4059,14 +4060,25 @@ fi
# FIXME: Once we have a generic reliable way to test-link GNUstep projects
# this should be replaced with that technique.
GUI_SUBPROJECTS=""
# Check whether --enable-gui-projects was given.
if test "${enable_gui_projects+set}" = set; then
enableval=$enable_gui_projects;
else
enable_gui_projects=yes
fi
if test "$enable_gui_projects" = "yes"; then
GUI_SUBPROJECTS="$GUI_SUBPROJECTS EOInterface EOModeler DBModeler"
fi
# Check whether --enable-gorm-palette was given.
if test "${enable_gorm_palette+set}" = set; then
enableval=$enable_gorm_palette;
else
enable_gorm_palette=yes
enable_gorm_palette=${enable_gui_projects}
fi
GUI_SUBPROJECTS=""
if test "$enable_gorm_palette" = "yes"; then
GUI_SUBPROJECTS="$GUI_SUBPROJECTS GDL2Palette"
fi

View file

@ -71,10 +71,17 @@ AC_SUBST(EOADAPTORS)
# FIXME: Once we have a generic reliable way to test-link GNUstep projects
# this should be replaced with that technique.
GUI_SUBPROJECTS=""
AC_ARG_ENABLE(gui-projects,
[ --disable-gui-projects to disable building GUI projects], ,
enable_gui_projects=yes)
if test "$enable_gui_projects" = "yes"; then
GUI_SUBPROJECTS="$GUI_SUBPROJECTS EOInterface EOModeler DBModeler"
fi
AC_ARG_ENABLE(gorm-palette,
[ --disable-gorm-palette to disable building gorm palette], ,
enable_gorm_palette=yes)
GUI_SUBPROJECTS=""
enable_gorm_palette=${enable_gui_projects})
if test "$enable_gorm_palette" = "yes"; then
GUI_SUBPROJECTS="$GUI_SUBPROJECTS GDL2Palette"
fi