gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-22 04:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* configure: Regenerate.

Browse source 
* common.make: New file.
        * config.make.in: Remove.
        * GNUmakefile: Ditto.
        * GNUmakefile.in: New file, merges config.make.in and 
GNUmakefile.
        * configure.ac: Remove config.make.in, add GNUmakefile.in.
        * EOInterface/Makefile.preamble
        * EOInterface/GNUmakefile
        * EOAccess/Makefile.preamble
        * EOAccess/GNUmakefile
        * EOControl/GNUmakefile
        * EOControl/Makefile.preamble
        * DBModeler/GNUmakefile
        * Tools/Makefile.preamble
        * EOAdaptors/Postgres95/Makefile.preamble
        * GDL2Palette/GNUmakefile
        * gdl2.make.in
        * EOModeler/GNUmakefile
        * EOModeler/Makefile.preamble: Change to compile as native 
libraries.
        * DBModeler/Inspectors/AttributeInspector.gorm/data.info:
        * DBModeler/Inspectors/AttributeInspector.gorm/data.classes:
        * DBModeler/Inspectors/AttributeInspector.gorm/objects.gorm: 
Implement
        interface.




git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@23513 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ratmice 2006-09-14 21:11:01 +00:00
parent 9a013cca64
commit 6eae69cb0a
23 changed files with 163 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ChangeLog
View file

@ -1,3 +1,29 @@
2006-09-14 Matt Rice <ratmice@yahoo.com>
* configure: Regenerate.
* common.make: New file.
* config.make.in: Remove.
* GNUmakefile: Ditto.
* GNUmakefile.in: New file, merges config.make.in and GNUmakefile.
* configure.ac: Remove config.make.in, add GNUmakefile.in.
* EOInterface/Makefile.preamble
* EOInterface/GNUmakefile
* EOAccess/Makefile.preamble
* EOAccess/GNUmakefile
* EOControl/GNUmakefile
* EOControl/Makefile.preamble
* DBModeler/GNUmakefile
* Tools/Makefile.preamble
* EOAdaptors/Postgres95/Makefile.preamble
* GDL2Palette/GNUmakefile
* gdl2.make.in
* EOModeler/GNUmakefile
* EOModeler/Makefile.preamble: Change to compile as native libraries.
* DBModeler/Inspectors/AttributeInspector.gorm/data.info:
* DBModeler/Inspectors/AttributeInspector.gorm/data.classes:
* DBModeler/Inspectors/AttributeInspector.gorm/objects.gorm: Implement
interface.
2006-09-14 David Ayers <ayers@fsfe.org>
* EOAdaptors/Postgres95/GNUmakefile.in:

17
DBModeler/GNUmakefile
View file

@ -27,7 +27,6 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
include $(GNUSTEP_MAKEFILES)/common.make
include ../gdl2.make
SUBPROJECTS=../EOInterface ../EOModeler
include $(GNUSTEP_MAKEFILES)/aggregate.make
@ -35,18 +34,9 @@ include $(GNUSTEP_MAKEFILES)/aggregate.make
APP_NAME = DBModeler
DBModeler_SUBPROJECTS=Inspectors
ADDITIONAL_LIB_DIRS+=-L../EOAccess/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS+=-L../EOControl/$(GNUSTEP_OBJ_DIR)
ifeq ($(FOUNDATION_LIB), apple)
ADDITIONAL_LIB_DIRS+= -F../EOModeler
ADDITIONAL_INCLUDE_DIRS+= -F../EOModeler
else
ADDITIONAL_INCLUDE_DIRS= -I..
ADDITIONAL_LIB_DIRS+=-L../EOInterface/$(GNUSTEP_OBJ_DIR) -L../EOModeler/$(GNUSTEP_OBJ_DIR)
endif
ADDITIONAL_NATIVE_LIBS += EOInterface gnustep-db2modeler
ADDITIONAL_INCLUDE_DIRS+=-I../
ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler
ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOInterface EOModeler
$(APP_NAME)_RESOURCE_FILES = \
Resources/Key_On.tiff \
@ -78,4 +68,5 @@ $(APP_NAME)_OBJC_FILES = \
Preferences.m \
ConsistencyChecker.m
include ../common.make
include $(GNUSTEP_MAKEFILES)/application.make

33
DBModeler/Inspectors/AttributeInspector.gorm/data.classes
View file

@ -1,5 +1,29 @@
{
"## Comment" = "Do NOT change this file, Gorm maintains it";
AttributeInspector = {
Actions = (
"setValueClassNameAndType:",
"setExternalName:",
"setExternalType:",
"setName:"
);
Outlets = (
_extNameField,
_extTypeField,
_flipView,
_nameField,
_flipSelect,
_customFlip,
_dataFlip,
_dateFlip,
_decimalFlip,
_doubleFlip,
_integerFlip,
_stringFlip,
_internalData
);
Super = EOMInspector;
};
EOMInspector = {
Actions = (
);
@ -9,4 +33,13 @@
);
Super = NSObject;
};
FirstResponder = {
Actions = (
"setValueClassNameAndType:",
"setExternalName:",
"setExternalType:",
"setName:"
);
Super = NSObject;
};
}

BIN
DBModeler/Inspectors/AttributeInspector.gorm/data.info
View file

Binary file not shown.

BIN
DBModeler/Inspectors/AttributeInspector.gorm/objects.gorm
View file

Binary file not shown.

5
DBModeler/Inspectors/GNUmakefile
View file

@ -32,11 +32,10 @@ ADDITIONAL_INCLUDE_DIRS+=-I../../
Inspectors_HAS_RESOURCE_BUNDLE=yes
Inspectors_RESOURCE_FILES= \
Inspectors_RESOURCE_FILES+= \
RelationshipInspector.gorm \
RelationshipInspector.tiff
Inspectors_OBJC_FILES=RelationshipInspector.m
Inspectors_OBJC_FILES+=RelationshipInspector.m
Inspectors_RESOURCE_FILES+=AttributeInspector.gorm
Inspectors_OBJC_FILES+=AttributeInspector.m

19
EOAccess/GNUmakefile
View file

@ -31,13 +31,12 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
# The library to be compiled
LIBRARY_NAME=libgnustep-db2
NATIVE_LIBRARY_NAME=EOAccess
# The C source files to be compiled
libgnustep-db2_C_FILES =
EOAccess_C_FILES =
# The Objective-C source files to be compiled
libgnustep-db2_OBJC_FILES = \
EOAccess_OBJC_FILES = \
EOModelGroup.m \
EOModel.m \
EOEntity.m \
@ -61,10 +60,9 @@ EODatabaseDataSource.m \
EOUtilities.m \
EOPrivate.m
libgnustep-db2_HEADER_FILES_DIR = .
libgnustep-db2_HEADER_FILES_INSTALL_DIR = /EOAccess
EOAccess_HEADER_FILES_DIR = .
libgnustep-db2_HEADER_FILES = \
EOAccess_HEADER_FILES = \
EOModelGroup.h \
EOModel.h \
EOEntity.h \
@ -92,8 +90,8 @@ EOAccess.h \
DOCUMENT_NAME = EOAccess
EOAccess_AUTOGSDOC_HEADERS = $(libgnustep-db2_HEADER_FILES)
EOAccess_AUTOGSDOC_SOURCE = $(libgnustep-db2_OBJC_FILES)
EOAccess_AUTOGSDOC_HEADERS = $(EOAccess_HEADER_FILES)
EOAccess_AUTOGSDOC_SOURCE = $(EOAccess_OBJC_FILES)
EOAccess_HEADER_FILES_DIR = $(HEADER_DIR)
EOAccess_AGSDOC_FILES = EOAccess.gsdoc $(EOAccess_AUTOGSDOC_HEADERS)
#$(EOAccess_AUTOGSDOC_SOURCE)
@ -111,10 +109,11 @@ EOAccess_AGSDOC_FLAGS = \
-include Makefile.preamble
include ../common.make
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/library.make
include $(GNUSTEP_MAKEFILES)/native-library.make
# Only build the doc if doc=yes was passed on the command line
ifeq ($(doc),yes)
include $(GNUSTEP_MAKEFILES)/documentation.make

7
EOAccess/Makefile.preamble
View file

@ -52,7 +52,7 @@ ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I..
ADDITIONAL_LDFLAGS =
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS = -L../EOControl/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS =
#
# Flags dealing with installing and uninstalling
@ -72,7 +72,10 @@ endif
ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
LIBRARIES_DEPEND_UPON += -lgnustep-db2control
ADDITIONAL_NATIVE_LIBS += EOControl
ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl
ifeq ($(FOUNDATION_HAS_KVC), yes)
ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DFOUNDATION_HAS_KVC=1

5
EOAdaptors/Postgres95/Makefile.preamble
View file

@ -56,7 +56,8 @@ ADDITIONAL_LIB_DIRS += \
-L../../EOAccess/$(GNUSTEP_OBJ_DIR)
# Libraries linked to the framework
LIBRARIES_DEPEND_UPON += -lgnustep-db2control -lgnustep-db2
ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl
ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
@ -68,4 +69,4 @@ endif
# Additional directories to be created during installation
ADDITIONAL_INSTALL_DIRS =
include config.mak
include config.mak

20
EOControl/GNUmakefile
View file

@ -31,13 +31,13 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
# The library to be compiled
LIBRARY_NAME=libgnustep-db2control
NATIVE_LIBRARY_NAME=EOControl
# The C source files to be compiled
libgnustep-db2control_C_FILES =
EOControl_C_FILES =
# The Objective-C source files to be compiled
libgnustep-db2control_OBJC_FILES = \
EOControl_OBJC_FILES = \
EOSortOrdering.m \
EOFetchSpecification.m \
EOGenericRecord.m \
@ -73,10 +73,10 @@ EOEventCenter.m \
EODebug.m \
EOPrivate.m
libgnustep-db2control_HEADER_FILES_DIR = .
libgnustep-db2control_HEADER_FILES_INSTALL_DIR = /EOControl
EOControl_HEADER_FILES_DIR = .
EOControl_HEADER_FILES_INSTALL_DIR = /EOControl
libgnustep-db2control_HEADER_FILES = \
EOControl_HEADER_FILES = \
EOSortOrdering.h \
EOFetchSpecification.h \
EOGenericRecord.h \
@ -106,8 +106,8 @@ EODeprecated.h \
EOControl.h
DOCUMENT_NAME = EOControl
EOControl_AUTOGSDOC_HEADERS = $(libgnustep-db2control_HEADER_FILES)
EOControl_AUTOGSDOC_SOURCE = $(libgnustep-db2control_OBJC_FILES)
EOControl_AUTOGSDOC_HEADERS = $(EOControl_HEADER_FILES)
EOControl_AUTOGSDOC_SOURCE = $(EOControl_OBJC_FILES)
EOControl_HEADER_FILES_DIR = $(HEADER_DIR)
EOControl_AGSDOC_FILES = EOControl.gsdoc $(EOControl_AUTOGSDOC_HEADERS)
#$(EOControl_AUTOGSDOC_SOURCE)
@ -125,10 +125,10 @@ EOControl_AGSDOC_FLAGS = \
}' -Up EOControl
-include Makefile.preamble
include ../common.make
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/library.make
include $(GNUSTEP_MAKEFILES)/native-library.make
# Only build the doc if doc=yes was passed on the command line
ifeq ($(doc),yes)
include $(GNUSTEP_MAKEFILES)/documentation.make

2
EOInterface/GNUmakefile
View file

@ -101,7 +101,7 @@ EOInterface_AGSDOC_FLAGS = \
-include Makefile.preamble
include ../common.make
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/native-library.make

7
EOInterface/Makefile.preamble
View file

@ -43,7 +43,7 @@ ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I..
ADDITIONAL_LDFLAGS =
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS = -L../EOControl/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS =
#
# Flags dealing with installing and uninstalling
@ -63,4 +63,7 @@ endif
ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
LIBRARIES_DEPEND_UPON += -lgnustep-db2control
ADDITIONAL_NATIVE_LIB_DIRS += ../EOControl ../EOAccess
ADDITIONAL_NATIVE_LIBS += EOControl EOAccess

13
EOModeler/GNUmakefile
View file

@ -31,13 +31,13 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
# The library to be compiled
NATIVE_LIBRARY_NAME=gnustep-db2modeler
NATIVE_LIBRARY_NAME=EOModeler
# The C source files to be compiled
gnustep-db2modeler_C_FILES =
EOModeler_C_FILES =
# The Objective-C source files to be compiled
gnustep-db2modeler_OBJC_FILES = \
EOModeler_OBJC_FILES = \
EOModelExtensions.m \
EOMInspector.m \
EOModelExtensions.m \
@ -47,10 +47,10 @@ EOModelerApp.m \
EOModelerEditor.m
gnustep-db2modeler_HEADER_FILES_DIR = .
gnustep-db2modeler_HEADER_FILES_INSTALL_DIR = /EOModeler
EOModeler_HEADER_FILES_DIR = .
EOModeler_HEADER_FILES_INSTALL_DIR = /EOModeler
gnustep-db2modeler_HEADER_FILES = \
EOModeler_HEADER_FILES = \
EOModelExtensions.h \
EOMInspector.h \
EOModelExtensions.h \
@ -61,6 +61,7 @@ EOModelerEditor.h \
EODefines.h
-include Makefile.preamble
include ../common.make
-include GNUmakefile.local

7
EOModeler/Makefile.preamble
View file

@ -51,7 +51,7 @@ ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I..
ADDITIONAL_LDFLAGS =
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS = -L../EOControl/$(GNUSTEP_OBJ_DIR) -L../EOAccess/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS=
#
# Flags dealing with installing and uninstalling
@ -71,4 +71,7 @@ endif
ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
LIBRARIES_DEPEND_UPON += -lgnustep-db2control -lgnustep-db2
ADDITIONAL_NATIVE_LIB_DIRS += ../EOAccess ../EOControl
ADDITIONAL_NATIVE_LIBS += EOControl EOAccess

21
GDL2Palette/GNUmakefile
View file

@ -35,22 +35,9 @@ GDL2_PRINCIPAL_CLASS = GDL2Palette
SUBPROJECTS+=../EOModeler ../EOInterface
include $(GNUSTEP_MAKEFILES)/aggregate.make
ADDITIONAL_LIB_DIRS+=-L../EOAccess/$(GNUSTEP_OBJ_DIR) \
-L../EOControl/$(GNUSTEP_OBJ_DIR)
ifeq ($(FOUNDATION_LIB),apple)
ADDITIONAL_INCLUDE_DIRS+=-F../EOModeler -F../EOInterface
ADDITIONAL_LIB_DIRS+=-F../EOModeler -F../EOInterface
PALETTE_LIBS +=-framework gnustep-db2modeler -framework EOInterface
else
ADDITIONAL_INCLUDE_DIRS+=-I../
ADDITIONAL_LIB_DIRS+=-L../EOModeler/$(GNUSTEP_OBJ_DIR) \
-L../EOInterface/$(GNUSTEP_OBJ_DIR)
PALETTE_LIBS+=-lgnustep-db2modeler -lEOInterface
endif
PALETTE_LIBS+=$(AUXILIARY_TOOL_LIBS)
ADDITIONAL_INCLUDE_DIRS+=-I../
ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../EOModeler
ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl EOInterface EOModeler
GDL2_RESOURCE_FILES=GDL2Palette.tiff GDL2ConnectionInspector.gorm palette.table
@ -62,5 +49,7 @@ GDL2_OBJC_FILES= \
Foundation+Categories.m \
KeyWrapper.m
include ../common.make
PALETTE_LIBS=$(ADDITIONAL_OBJC_LIBS)
include $(GNUSTEP_MAKEFILES)/palette.make

3
GNUmakefile → GNUmakefile.in
View file

@ -39,7 +39,7 @@ SVN_BASE_URL=http://svn.gna.org/svn/gnustep/libs
SUBPROJECTS = EOControl EOAccess EOAdaptors Tools
ifeq ($(GUI_MAKE_LOADED),yes)
SUBPROJECTS += EOInterface EOModeler DBModeler
SUBPROJECTS += @SUBPROJECTS@ EOInterface EOModeler DBModeler
endif
include config.make
@ -49,6 +49,7 @@ DOCUMENT_NAME = GDL2
GDL2_AGSDOC_FILES = GDL2.gsdoc
-include Makefile.preamble
include common.make
include $(GNUSTEP_MAKEFILES)/aggregate.make
ifeq ($(doc),yes)

1
Tools/GNUmakefile
View file

@ -84,6 +84,7 @@ eoutil_HEADER_FILES =
-include Makefile.preamble
include ../common.make
-include GNUmakefile.local

4
Tools/Makefile.preamble
View file

@ -53,8 +53,8 @@ ifneq ($(FOUNDATION_LIB),gnu)
ADDITIONAL_TOOL_LIBS += -lgnustep-baseadd
endif
ADDITIONAL_TOOL_LIBS += -lgnustep-db2 -lgnustep-db2control
ADDITIONAL_NATIVE_LIBS+=EOControl EOAccess
ADDITIONAL_NATIVE_LIB_DIRS+=EOControl EOAccess
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS += -L../EOAccess/$(GNUSTEP_OBJ_DIR) -L../EOControl/$(GNUSTEP_OBJ_DIR)

6
common.make Normal file
View file

@ -0,0 +1,6 @@
ifeq ($(FOUNDATION_LIB), apple)
ADDITIONAL_LIB_DIRS += $(foreach libdir,$(ADDITIONAL_NATIVE_LIB_DIRS),-F$(libdir))
else
ADDITIONAL_LIB_DIRS += $(foreach libdir,$(ADDITIONAL_NATIVE_LIB_DIRS),-L$(libdir)/$(GNUSTEP_OBJ_DIR))
endif

3
config.make.in
View file

@ -1,3 +0,0 @@
ifeq ($(GUI_MAKE_LOADED),yes)
SUBPROJECTS += @SUBPROJECTS@
endif

59
configure vendored
View file

@ -718,13 +718,13 @@ echo X"$0" |
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
srcdir=$ac_confdir
if test ! -r $srcdir/$ac_unique_file; then
if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
if test ! -r $srcdir/$ac_unique_file; then
if test ! -r "$srcdir/$ac_unique_file"; then
if test "$ac_srcdir_defaulted" = yes; then
{ echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
{ (exit 1); exit 1; }; }
@ -733,7 +733,7 @@ if test ! -r $srcdir/$ac_unique_file; then
{ (exit 1); exit 1; }; }
fi
fi
(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
{ echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
{ (exit 1); exit 1; }; }
srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
@ -947,7 +947,7 @@ esac
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
cd "$ac_popdir"
cd $ac_popdir
done
fi
@ -1877,7 +1877,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -1935,7 +1936,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2051,7 +2053,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2105,7 +2108,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2150,7 +2154,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2194,7 +2199,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2517,7 +2523,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2687,7 +2694,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2827,7 +2835,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2975,7 +2984,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3062,7 +3072,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3135,7 +3146,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3232,7 +3244,7 @@ echo "${ECHO_T}$VERSION" >&6
#--------------------------------------------------------------------
# Write the Makefiles
#--------------------------------------------------------------------
ac_config_files="$ac_config_files gdl2.make config.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak"
ac_config_files="$ac_config_files gdl2.make GNUmakefile EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -3759,7 +3771,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" ;;
"GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
"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" ;;
@ -4033,6 +4045,11 @@ esac
if test x"$ac_file" != x-; then
{ echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@ -4071,12 +4088,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
fi;;
esac
done` || { (exit 1); exit 1; }
if test x"$ac_file" != x-; then
{ echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub

2
configure.ac
View file

@ -79,5 +79,5 @@ AC_SUBST(GCC_VERSION)
#--------------------------------------------------------------------
# Write the Makefiles
#--------------------------------------------------------------------
AC_CONFIG_FILES([gdl2.make config.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak])
AC_CONFIG_FILES([gdl2.make GNUmakefile EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak])
AC_OUTPUT

2
gdl2.make.in
View file

@ -41,6 +41,6 @@ GDL2_SUBMINOR_VERSION = @SUBMINOR_VERSION@
AUXILIARY_CPPFLAGS += -DGDL2=1
# Additional libraries for the linker
AUXILIARY_TOOL_LIBS += -lgnustep-db2 -lgnustep-db2control
ADDITIONAL_NATIVE_LIBS+=EOControl EOAccess
endif