From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 4 Jul 2006 23:37:41 +0000 (+0000)
Subject: fixed some 64bit lib lookup locations
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f513c7412fc5ae2cc02ea1ac03a17c27df3efd7;p=sope

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 aa96278c..c9bc8a50 100644
--- 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 b8b82ebe..bb80cdc6 100644
--- 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 13d5354d..cc39519c 100644
--- 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 913ab4bf..f903b3a1 100644
--- 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 d801e418..3dcd221a 100644
--- 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)