mirror of
https://github.com/gnustep/libs-gdl2.git
synced 2025-04-22 21:00:44 +00:00
* configure.ac (gorm-palette): Add configure option to exclude
building of palette until auto detection works reliably. * config.make.in: New file. * configure: Regenerate. * GNUmakefile: Include new file. * Makefile.postamble: Remove generated config.make on distclean. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@23394 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ayers
parent
eafc2dc10c
commit
8d3a781ff6
6 changed files with 46 additions and 4 deletions
|
|
@ -1,3 +1,7 @@
|
|||
2006-31-08 Matt Rice <ratmice@yahoo.com>
|
||||
David Ayers <d.ayers@inode.at>
|
||||
|
||||
|
||||
2006-04-24 David Ayers <d.ayers@inode.at>
|
||||
|
||||
* EOControl/EOGenericRecord.m
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@ ifeq ($(GUI_MAKE_LOADED),yes)
|
|||
SUBPROJECTS += EOInterface EOModeler DBModeler
|
||||
endif
|
||||
|
||||
include config.make
|
||||
|
||||
DOCUMENT_NAME = GDL2
|
||||
|
||||
GDL2_AGSDOC_FILES = GDL2.gsdoc
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ after-uninstall::
|
|||
# Things to do after distcleaning
|
||||
after-distclean::
|
||||
rm -rf config.cache config.log config.status
|
||||
rm -rf config.h gdl2.make
|
||||
rm -rf config.h gdl2.make config.make
|
||||
rm -rf autom4te.cache
|
||||
|
||||
# Things to do before checking
|
||||
|
|
|
|||
3
config.make.in
Normal file
3
config.make.in
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
ifeq ($(GUI_MAKE_LOADED),yes)
|
||||
SUBPROJECTS += @SUBPROJECTS@
|
||||
endif
|
||||
26
configure
vendored
26
configure
vendored
|
|
@ -308,7 +308,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PG_CONFIG CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP POSTGRES_DATABASE POSTGRES_INCLUDES POSTGRES_LIB_DIRS POSTGRES_LIBS EOADAPTORS VERSION MAJOR_VERSION MINOR_VERSION SUBMINOR_VERSION GCC_VERSION LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PG_CONFIG CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP POSTGRES_DATABASE POSTGRES_INCLUDES POSTGRES_LIB_DIRS POSTGRES_LIBS EOADAPTORS SUBPROJECTS VERSION MAJOR_VERSION MINOR_VERSION SUBMINOR_VERSION GCC_VERSION LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -836,6 +836,11 @@ if test -n "$ac_init_help"; then
|
|||
|
||||
cat <<\_ACEOF
|
||||
|
||||
Optional Features:
|
||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||
--disable-gorm-palette to disable building gorm palette
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
|
|
@ -3193,6 +3198,21 @@ fi
|
|||
|
||||
|
||||
|
||||
# FIXME: Once we have a generic reliable way to test-link GNUstep projects
|
||||
# this should be replaced with that technique.
|
||||
# Check whether --enable-gorm-palette or --disable-gorm-palette was given.
|
||||
if test "${enable_gorm_palette+set}" = set; then
|
||||
enableval="$enable_gorm_palette"
|
||||
|
||||
else
|
||||
enable_gorm_palette=yes
|
||||
fi;
|
||||
SUBPROJECTS=""
|
||||
if test "$enable_gorm_palette" = "yes"; then
|
||||
SUBPROJECTS="$SUBPROJECTS GDL2Palette"
|
||||
fi
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Record the version
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -3212,7 +3232,7 @@ echo "${ECHO_T}$VERSION" >&6
|
|||
#--------------------------------------------------------------------
|
||||
# Write the Makefiles
|
||||
#--------------------------------------------------------------------
|
||||
ac_config_files="$ac_config_files gdl2.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak"
|
||||
ac_config_files="$ac_config_files gdl2.make config.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
|
|
@ -3739,6 +3759,7 @@ do
|
|||
case "$ac_config_target" in
|
||||
# Handling of arguments.
|
||||
"gdl2.make" ) CONFIG_FILES="$CONFIG_FILES gdl2.make" ;;
|
||||
"config.make" ) CONFIG_FILES="$CONFIG_FILES config.make" ;;
|
||||
"EOAdaptors/GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/GNUmakefile" ;;
|
||||
"EOAdaptors/Postgres95/GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/Postgres95/GNUmakefile" ;;
|
||||
"EOAdaptors/Postgres95/config.mak" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/Postgres95/config.mak" ;;
|
||||
|
|
@ -3842,6 +3863,7 @@ s,@POSTGRES_INCLUDES@,$POSTGRES_INCLUDES,;t t
|
|||
s,@POSTGRES_LIB_DIRS@,$POSTGRES_LIB_DIRS,;t t
|
||||
s,@POSTGRES_LIBS@,$POSTGRES_LIBS,;t t
|
||||
s,@EOADAPTORS@,$EOADAPTORS,;t t
|
||||
s,@SUBPROJECTS@,$SUBPROJECTS,;t t
|
||||
s,@VERSION@,$VERSION,;t t
|
||||
s,@MAJOR_VERSION@,$MAJOR_VERSION,;t t
|
||||
s,@MINOR_VERSION@,$MINOR_VERSION,;t t
|
||||
|
|
|
|||
13
configure.ac
13
configure.ac
|
|
@ -51,6 +51,17 @@ fi
|
|||
|
||||
AC_SUBST(EOADAPTORS)
|
||||
|
||||
# FIXME: Once we have a generic reliable way to test-link GNUstep projects
|
||||
# this should be replaced with that technique.
|
||||
AC_ARG_ENABLE(gorm-palette,
|
||||
[ --disable-gorm-palette to disable building gorm palette], ,
|
||||
enable_gorm_palette=yes)
|
||||
SUBPROJECTS=""
|
||||
if test "$enable_gorm_palette" = "yes"; then
|
||||
SUBPROJECTS="$SUBPROJECTS GDL2Palette"
|
||||
fi
|
||||
AC_SUBST(SUBPROJECTS)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Record the version
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -68,5 +79,5 @@ AC_SUBST(GCC_VERSION)
|
|||
#--------------------------------------------------------------------
|
||||
# Write the Makefiles
|
||||
#--------------------------------------------------------------------
|
||||
AC_CONFIG_FILES([gdl2.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak])
|
||||
AC_CONFIG_FILES([gdl2.make config.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak])
|
||||
AC_OUTPUT
|
||||
|
|
|
|||
Loading…
Reference in a new issue