fixed some 64bit lib lookup locations

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1309 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index aa96278c5651cfa4256fccf4eb24fd90d6943edd..c9bc8a501220d9eaf0ed76d73c3752499ef55afe 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -50,11 +50,7 @@ ADDITIONAL_LIB_DIRS += \
        $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
-else
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
-endif
+SYSTEM_LIB_DIR += $(CONFIGURE_SYSTEM_LIB_DIR)
 
 
 # dependencies

diff --git a/sope-appserver/samples/WOxExtTest/GNUmakefile.preamble b/sope-appserver/samples/WOxExtTest/GNUmakefile.preamble
index b8b82ebe66b374247c09e64768261f48a9e75f2e..bb80cdc6a96e3aec36abbe8fb6d59919f6655440 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/GNUmakefile.preamble
+++ b/sope-appserver/samples/WOxExtTest/GNUmakefile.preamble
@@ -37,4 +37,4 @@ ADDITIONAL_LIB_DIRS += \
        $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += $(CONFIGURE_SYSTEM_LIB_DIR)

diff --git a/sope-appserver/samples/davpropget/GNUmakefile.preamble b/sope-appserver/samples/davpropget/GNUmakefile.preamble
index 13d5354d481cddcea3cab1bbad5e1494aa43ce11..cc39519c2784a0c6baf688c9c97bdbc2108e55c5 100644 (file)
--- a/sope-appserver/samples/davpropget/GNUmakefile.preamble
+++ b/sope-appserver/samples/davpropget/GNUmakefile.preamble
@@ -6,4 +6,4 @@ davpropget_TOOL_LIBS += \
        -lNGStreams -lNGExtensions -lEOControl \
        -lDOM -lXmlRpc -lSaxObjC
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += $(CONFIGURE_SYSTEM_LIB_DIR)

diff --git a/sope-appserver/samples/davpropget/davpropget.m b/sope-appserver/samples/davpropget/davpropget.m
index 913ab4bf57261efcfe5c804e8ad0c8f9e61995ff..f903b3a1106f7718c1fc65b2e72b6bb8277a811c 100644 (file)
--- a/sope-appserver/samples/davpropget/davpropget.m
+++ b/sope-appserver/samples/davpropget/davpropget.m
@@ -72,7 +72,7 @@ static SaxDAVHandler             *davsax   = nil;
 
     url  = [[NSURL URLWithString:[args objectAtIndex:1]] copy];
     prop = ([args count] > 2) ? [[args objectAtIndex:2] copy] : nil;
-    ns   = ([args count] > 3) ? [[args objectAtIndex:3] copy] : DEFAULT_NS;
+    ns   = ([args count] > 3) ? [[args objectAtIndex:3] copy] : (id)DEFAULT_NS;
     
     if ((tmp = [url user])) {
       creds = [NSString stringWithFormat:@"%@:%@", tmp, [url password]];

diff --git a/sope-appserver/samples/parsedav/GNUmakefile.preamble b/sope-appserver/samples/parsedav/GNUmakefile.preamble
index d801e418d945b810dc2c787f020514a7102637f0..3dcd221ab02d99ac374b0067bdb281ffaa250773 100644 (file)
--- a/sope-appserver/samples/parsedav/GNUmakefile.preamble
+++ b/sope-appserver/samples/parsedav/GNUmakefile.preamble
@@ -13,4 +13,4 @@ parsedav_TOOL_LIBS += \
        -lNGStreams -lNGExtensions -lEOControl \
        -lDOM -lXmlRpc -lSaxObjC
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += $(CONFIGURE_SYSTEM_LIB_DIR)