From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 11 Oct 2004 11:56:22 +0000 (+0000)
Subject: fixed makefiles to search FHS locations at the last resort
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e1cdb0dc6630792c7d1e9d680e9377dd6b4b52;p=sope

fixed makefiles to search FHS locations at the last resort


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

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 46c9472b..fa95f4f6 100644
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -38,9 +38,7 @@ ADDITIONAL_LIB_DIRS += \
 	-L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)	\
 	-L$(RELBUILD_DIR_SxXml)/XmlRpc/$(GNUSTEP_OBJ_DIR_NAME)		\
 	-L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)		\
-	-L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)		\
-	-L/usr/local/lib -L/usr/lib
-
+	-L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
 else
 libNGObjWeb_LIB_DIRS += \
 	-L./$(GNUSTEP_OBJ_DIR)			\
@@ -50,10 +48,11 @@ libNGObjWeb_LIB_DIRS += \
 	-L$(CORE_ROOT)/EOControl/$(GNUSTEP_OBJ_DIR)		\
 	-L$(SOPE_ROOT)/sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR)	\
 	-L$(SOPE_ROOT)/sope-xml/DOM/$(GNUSTEP_OBJ_DIR)		\
-	-L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)	\
-	-L/usr/local/lib -L/usr/lib
+	-L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
 libNGObjWeb_LIBRARIES_DEPEND_UPON += \
 	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC
diff --git a/sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m b/sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m
index f30a7dc4..bba2cd43 100644
--- a/sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m
+++ b/sope-appserver/NGObjWeb/NGHttp/NGUrlFormCoder.m
@@ -22,7 +22,9 @@
 #include "NGUrlFormCoder.h"
 #include "common.h"
 
+#if !LIB_FOUNDATION_LIBRARY
 static BOOL debugDecoding = NO;
+#endif
 
 static __inline__ int _valueOfHexChar(unsigned char _c) {
   switch (_c) {
diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
index da492fd6..e366fdcc 100644
--- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble
+++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
@@ -52,4 +52,4 @@ ADDITIONAL_LIB_DIRS += \
 	-L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
index 2a4e218f..b5d03081 100644
--- a/sope-appserver/SoOFS/GNUmakefile.preamble
+++ b/sope-appserver/SoOFS/GNUmakefile.preamble
@@ -61,7 +61,7 @@ ADDITIONAL_LIB_DIRS += \
 	-L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 # platform specific settings
 
diff --git a/sope-core/EOControl/GNUmakefile.preamble b/sope-core/EOControl/GNUmakefile.preamble
index 54a39901..623b0612 100644
--- a/sope-core/EOControl/GNUmakefile.preamble
+++ b/sope-core/EOControl/GNUmakefile.preamble
@@ -1,10 +1,10 @@
-# $Id: GNUmakefile.preamble 4 2004-08-20 17:04:31Z helge $
+# GNUstep Makefile
 
 libEOControl_INCLUDE_DIRS += -I..
 
 ADDITIONAL_CPPFLAGS += -Wall
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 # libFoundation, gstep-base
 
diff --git a/sope-core/samples/GNUmakefile.preamble b/sope-core/samples/GNUmakefile.preamble
index 78d0a98a..3ca7db78 100644
--- a/sope-core/samples/GNUmakefile.preamble
+++ b/sope-core/samples/GNUmakefile.preamble
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile.preamble 9 2004-08-20 18:40:42Z helge $
+# compilation settings
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I..			\
@@ -9,8 +9,9 @@ ADDITIONAL_LIB_DIRS += \
 	-L../EOControl/$(GNUSTEP_OBJ_DIR)    \
 	-L../NGExtensions/$(GNUSTEP_OBJ_DIR) \
 	-L../NGStreams/$(GNUSTEP_OBJ_DIR)    \
-	-L/usr/local/lib -L/usr/lib
 
 ADDITIONAL_TOOL_LIBS += \
 	-lNGStreams -lNGExtensions -lEOControl	\
 	-lDOM -lSaxObjC
+
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble
index b6728038..32c4fe03 100644
--- a/sope-gdl1/GDLAccess/GNUmakefile.preamble
+++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble
@@ -23,5 +23,4 @@ ADDITIONAL_LIB_DIRS += \
 	-L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)
 endif
 
-ADDITIONAL_LIB_DIRS += \
-        -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
diff --git a/sope-gdl1/PostgreSQL/GNUmakefile.preamble b/sope-gdl1/PostgreSQL/GNUmakefile.preamble
index 609de918..3794dd8d 100644
--- a/sope-gdl1/PostgreSQL/GNUmakefile.preamble
+++ b/sope-gdl1/PostgreSQL/GNUmakefile.preamble
@@ -68,7 +68,7 @@ ifneq ($(PGSQL),)
 ADDITIONAL_LIB_DIRS += -L$(PGSQL)/lib
 endif
 
-ADDITIONAL_LIB_DIRS += \
+SYSTEM_LIB_DIR += \
 	-L/usr/local/lib	        \
 	-L/usr/local/pgsql/lib/	        \
 	-L/usr/lib
diff --git a/sope-ical/samples/GNUmakefile.preamble b/sope-ical/samples/GNUmakefile.preamble
index 1619772e..d6d42dee 100644
--- a/sope-ical/samples/GNUmakefile.preamble
+++ b/sope-ical/samples/GNUmakefile.preamble
@@ -14,8 +14,9 @@ ADDITIONAL_LIB_DIRS += \
 	-L$(SOPE_CORE)/NGExtensions/$(GNUSTEP_OBJ_DIR)	\
 	-L$(SOPE_CORE)/NGStreams/$(GNUSTEP_OBJ_DIR)	\
 	-L$(SOPE_XML)/DOM/$(GNUSTEP_OBJ_DIR)    	\
-	-L$(SOPE_XML)/SaxObjC/$(GNUSTEP_OBJ_DIR)	\
-	-L/usr/local/lib -L/usr/lib
+	-L$(SOPE_XML)/SaxObjC/$(GNUSTEP_OBJ_DIR)
+
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 
 ADDITIONAL_TOOL_LIBS += \
diff --git a/sope-ldap/NGLdap/GNUmakefile.preamble b/sope-ldap/NGLdap/GNUmakefile.preamble
index dc912f82..d8ab652f 100644
--- a/sope-ldap/NGLdap/GNUmakefile.preamble
+++ b/sope-ldap/NGLdap/GNUmakefile.preamble
@@ -1,6 +1,5 @@
 # compiler flags
 
-
 ADDITIONAL_INCLUDE_DIRS += \
 	-I..				\
 	-I../../sope-core/NGExtensions	\
@@ -9,7 +8,7 @@ ADDITIONAL_INCLUDE_DIRS += \
 
 ifneq ($(FOUNDATION_LIB),apple)
 ADDITIONAL_INCLUDE_DIRS += -I/usr/local/openldap/include
-ADDITIONAL_LIB_DIRS     += -L/usr/local/openldap/lib
+SYSTEM_LIB_DIR += -L/usr/local/openldap/lib
 endif
 
 
@@ -63,7 +62,7 @@ ADDITIONAL_LIB_DIRS += \
 	-L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)
 endif
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib
 
 # Apple
 
diff --git a/sope-ldap/samples/GNUmakefile.preamble b/sope-ldap/samples/GNUmakefile.preamble
index 19685b49..31536a32 100644
--- a/sope-ldap/samples/GNUmakefile.preamble
+++ b/sope-ldap/samples/GNUmakefile.preamble
@@ -31,7 +31,7 @@ ADDITIONAL_LIB_DIRS += \
 	-L../NGLdap/$(GNUSTEP_OBJ_DIR)
 endif
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 ADDITIONAL_TOOL_LIBS += \
 	-lNGStreams -lNGExtensions -lEOControl	\
diff --git a/sope-mime/samples/GNUmakefile.preamble b/sope-mime/samples/GNUmakefile.preamble
index 6f1e792d..c25e552f 100644
--- a/sope-mime/samples/GNUmakefile.preamble
+++ b/sope-mime/samples/GNUmakefile.preamble
@@ -15,8 +15,9 @@ ADDITIONAL_LIB_DIRS += \
 	-L$(SOPE_CORE)/NGExtensions/$(GNUSTEP_OBJ_DIR)	\
 	-L$(SOPE_CORE)/NGStreams/$(GNUSTEP_OBJ_DIR)	\
 	-L$(SOPE_XML)/DOM/$(GNUSTEP_OBJ_DIR)    	\
-	-L$(SOPE_XML)/SaxObjC/$(GNUSTEP_OBJ_DIR)	\
-	-L/usr/local/lib -L/usr/lib
+	-L$(SOPE_XML)/SaxObjC/$(GNUSTEP_OBJ_DIR)
+
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 ADDITIONAL_TOOL_LIBS += \
 	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
diff --git a/sope-xml/samples/GNUmakefile.preamble b/sope-xml/samples/GNUmakefile.preamble
index 84b0930e..bdd0263f 100644
--- a/sope-xml/samples/GNUmakefile.preamble
+++ b/sope-xml/samples/GNUmakefile.preamble
@@ -23,4 +23,4 @@ ADDITIONAL_LIB_DIRS += \
 	-L../XmlRpc/$(GNUSTEP_OBJ_DIR)
 endif
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
diff --git a/xmlrpc_call/GNUmakefile.preamble b/xmlrpc_call/GNUmakefile.preamble
index 16c65267..aeef14e2 100644
--- a/xmlrpc_call/GNUmakefile.preamble
+++ b/xmlrpc_call/GNUmakefile.preamble
@@ -60,4 +60,4 @@ ADDITIONAL_LIB_DIRS += \
 	-L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib