From baef7f83a658ca22bc056cc2a5f1c816079f0768 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 7 Nov 2012 10:14:03 -0500 Subject: [PATCH] Use the output of "gnustep-config --base-libs" to determine which libs our libraries must be linked against --- configure | 2 ++ sope-appserver/NGObjWeb/GNUmakefile.preamble | 3 ++- sope-appserver/WEExtensions/GNUmakefile.preamble | 2 +- sope-appserver/WOExtensions/GNUmakefile.preamble | 2 +- sope-core/EOControl/GNUmakefile.preamble | 2 +- sope-core/NGExtensions/GNUmakefile.preamble | 2 +- sope-core/NGStreams/GNUmakefile.preamble | 2 +- sope-gdl1/GDLAccess/GNUmakefile.preamble | 2 +- sope-ldap/NGLdap/GNUmakefile.preamble | 3 ++- sope-mime/GNUmakefile.preamble | 2 +- sope-xml/DOM/GNUmakefile.preamble | 2 +- sope-xml/SaxObjC/GNUmakefile.preamble | 2 +- sope-xml/XmlRpc/GNUmakefile.preamble | 2 +- 13 files changed, 16 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 71c6efd..0c4b5cf 100755 --- a/configure +++ b/configure @@ -474,6 +474,8 @@ checkLinking() { checkDependencies() { cfgwrite "" cfgwrite "# library dependencies" + cfgwrite "BASE_LIBS := `gnustep-config --base-libs`" + checkLinking "xml2" optional; checkLinking "ldap" optional; diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble index c954d1b..2acc173 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble @@ -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)\ diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble index cb7e685..5cfc2e5 100644 --- a/sope-appserver/WEExtensions/GNUmakefile.preamble +++ b/sope-appserver/WEExtensions/GNUmakefile.preamble @@ -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 += \ diff --git a/sope-appserver/WOExtensions/GNUmakefile.preamble b/sope-appserver/WOExtensions/GNUmakefile.preamble index 8f70856..5302697 100644 --- a/sope-appserver/WOExtensions/GNUmakefile.preamble +++ b/sope-appserver/WOExtensions/GNUmakefile.preamble @@ -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 += \ diff --git a/sope-core/EOControl/GNUmakefile.preamble b/sope-core/EOControl/GNUmakefile.preamble index 9c3c1b3..1bf2f5c 100644 --- a/sope-core/EOControl/GNUmakefile.preamble +++ b/sope-core/EOControl/GNUmakefile.preamble @@ -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 diff --git a/sope-core/NGExtensions/GNUmakefile.preamble b/sope-core/NGExtensions/GNUmakefile.preamble index ae176ae..cd1ea2e 100644 --- a/sope-core/NGExtensions/GNUmakefile.preamble +++ b/sope-core/NGExtensions/GNUmakefile.preamble @@ -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 \ diff --git a/sope-core/NGStreams/GNUmakefile.preamble b/sope-core/NGStreams/GNUmakefile.preamble index 0a8c0dc..5f85e65 100644 --- a/sope-core/NGStreams/GNUmakefile.preamble +++ b/sope-core/NGStreams/GNUmakefile.preamble @@ -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 \ diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble index afe4bf9..b4f0aa1 100644 --- a/sope-gdl1/GDLAccess/GNUmakefile.preamble +++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble @@ -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) diff --git a/sope-ldap/NGLdap/GNUmakefile.preamble b/sope-ldap/NGLdap/GNUmakefile.preamble index 43667d3..a7e966d 100644 --- a/sope-ldap/NGLdap/GNUmakefile.preamble +++ b/sope-ldap/NGLdap/GNUmakefile.preamble @@ -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 diff --git a/sope-mime/GNUmakefile.preamble b/sope-mime/GNUmakefile.preamble index 5b1582a..6138ac0 100644 --- a/sope-mime/GNUmakefile.preamble +++ b/sope-mime/GNUmakefile.preamble @@ -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 \ diff --git a/sope-xml/DOM/GNUmakefile.preamble b/sope-xml/DOM/GNUmakefile.preamble index dfc6271..954c2d1 100644 --- a/sope-xml/DOM/GNUmakefile.preamble +++ b/sope-xml/DOM/GNUmakefile.preamble @@ -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) diff --git a/sope-xml/SaxObjC/GNUmakefile.preamble b/sope-xml/SaxObjC/GNUmakefile.preamble index 49892f8..e6208f4 100644 --- a/sope-xml/SaxObjC/GNUmakefile.preamble +++ b/sope-xml/SaxObjC/GNUmakefile.preamble @@ -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) diff --git a/sope-xml/XmlRpc/GNUmakefile.preamble b/sope-xml/XmlRpc/GNUmakefile.preamble index ba06dae..0149a88 100644 --- a/sope-xml/XmlRpc/GNUmakefile.preamble +++ b/sope-xml/XmlRpc/GNUmakefile.preamble @@ -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 += \