Use the output of "gnustep-config --base-libs" to determine which libs our libraries must be linked against

fix/2152-escaped_dn_components
Wolfgang Sourdeau 2012-11-07 10:14:03 -05:00
parent 29800475e0
commit baef7f83a6
13 changed files with 16 additions and 12 deletions

2
configure vendored
View File

@ -474,6 +474,8 @@ checkLinking() {
checkDependencies() {
cfgwrite ""
cfgwrite "# library dependencies"
cfgwrite "BASE_LIBS := `gnustep-config --base-libs`"
checkLinking "xml2" optional;
checkLinking "ldap" optional;

View File

@ -68,7 +68,8 @@ libNGObjWeb_LIBRARIES_DEPEND_UPON += \
$(sope-mime-libs) \
$(sope-core-libs) \
$(sope-xml-libs) \
-lgnustep-base -lobjc
$(BASE_LIBS)
NGObjWeb_LIBRARIES_DEPEND_UPON += \
$(sope-mime-libs) \
$(sope-core-libs)\

View File

@ -42,7 +42,7 @@ endif
libWEExtensions_LIBRARIES_DEPEND_UPON += \
-lNGObjWeb \
-lNGExtensions -lEOControl \
-lgnustep-base -lobjc -lm
$(BASE_LIBS)
ifeq ($(frameworks),yes)
WEExtensions_LIBRARIES_DEPEND_UPON += \

View File

@ -21,7 +21,7 @@ libWOExtensions_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
libWOExtensions_LIBRARIES_DEPEND_UPON += \
-lNGObjWeb \
-lgnustep-base -lobjc
$(BASE_LIBS)
ifeq ($(frameworks),yes)
WOExtensions_LIBRARIES_DEPEND_UPON += \

View File

@ -17,7 +17,7 @@ libEOControl_LIBRARIES_DEPEND_UPON += -lFoundation
endif
ifeq ($(FOUNDATION_LIB),gnu)
libEOControl_LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc -lm
libEOControl_LIBRARIES_DEPEND_UPON += $(BASE_LIBS)
endif
# Apple

View File

@ -23,7 +23,7 @@ endif
libNGExtensions_LIBRARIES_DEPEND_UPON += \
-lEOControl -lDOM -lSaxObjC \
-lz -lgnustep-base -lm
-lz $(BASE_LIBS)
NGExtensions_LIBRARIES_DEPEND_UPON += \
-framework EOControl \

View File

@ -10,7 +10,7 @@ NGStreams_INCLUDE_DIRS += $(libNGStreams_INCLUDE_DIRS)
# dependencies
libNGStreams_LIBRARIES_DEPEND_UPON += \
-lz -lgnustep-base -lobjc
-lz $(BASE_LIBS)
NGStreams_LIBRARIES_DEPEND_UPON += \
-framework NGExtensions -framework EOControl \
-framework DOM -framework SaxObjC \

View File

@ -29,7 +29,7 @@ endif
# dependencies
libGDLAccess_LIBRARIES_DEPEND_UPON += -lEOControl -lgnustep-base -lobjc
libGDLAccess_LIBRARIES_DEPEND_UPON += -lEOControl $(BASE_LIBS)
GDLAccess_LIBRARIES_DEPEND_UPON += -framework EOControl
ifneq ($(frameworks),yes)

View File

@ -15,7 +15,8 @@ ADDITIONAL_CPPFLAGS += -Wall -Wno-protocol
libNGLdap_LIBRARIES_DEPEND_UPON += \
-lNGExtensions -lEOControl \
-lgnustep-base -lobjc
$(BASE_LIBS)
NGLdap_LIBRARIES_DEPEND_UPON += \
-framework NGExtensions -framework EOControl \
-framework DOM -framework SaxObjC

View File

@ -19,7 +19,7 @@ libNGMime_INCLUDE_DIRS += \
libNGMime_LIBRARIES_DEPEND_UPON += \
-lNGStreams -lNGExtensions -lEOControl \
-lgnustep-base -lobjc
$(BASE_LIBS)
NGMime_LIBRARIES_DEPEND_UPON += \
-framework NGStreams -framework NGExtensions -framework EOControl \

View File

@ -26,7 +26,7 @@ ADDITIONAL_CPPFLAGS += \
ADDITIONAL_INCLUDE_DIRS += -I.. -I../..
libDOM_LIBRARIES_DEPEND_UPON += -lSaxObjC -lgnustep-base -lobjc
libDOM_LIBRARIES_DEPEND_UPON += -lSaxObjC $(BASE_LIBS)
ifneq ($(GNUSTEP_BUILD_DIR),)
libDOM_LIB_DIRS += -L$(GNUSTEP_BUILD_DIR)/../SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)

View File

@ -63,4 +63,4 @@ saxxml_LDFLAGS += -framework Foundation
xmln_LDFLAGS += -framework Foundation
endif
libSaxObjC_LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc
libSaxObjC_LIBRARIES_DEPEND_UPON += $(BASE_LIBS)

View File

@ -24,7 +24,7 @@ XmlRpc_HEADER_FILES = $(libXmlRpc_HEADER_FILES)
XmlRpc_OBJC_FILES = $(libXmlRpc_OBJC_FILES)
libXmlRpc_LIBRARIES_DEPEND_UPON += -lSaxObjC -lgnustep-base -lobjc
libXmlRpc_LIBRARIES_DEPEND_UPON += -lSaxObjC $(BASE_LIBS)
ifneq ($(GNUSTEP_BUILD_DIR),)
libXmlRpc_LIB_DIRS += \