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 46c9472b400e91c51ff8a37aab60ddab45bfa61a..fa95f4f69dc1348b2f536abc5e49d904dfa108e9 100644 (file)
--- 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 f30a7dc4f372da38911c696e3af64cdc23740149..bba2cd438b5e8f7e9ac91512f26f98f158bf4602 100644 (file)
--- 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 da492fd6d351301f434f23aa09fb555be4b32b1f..e366fdccc64d070bb45912147c379c37b3b47b90 100644 (file)
--- 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 2a4e218f0b62f36d403757305748238043bab3c4..b5d0308105ee82b09e1dfff2dc13c9544ea58651 100644 (file)
--- 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 54a399014ed8e9bfb83159a5aa0554bb3539d06c..623b06121889a802bf7013d07148ec1a48daad16 100644 (file)
--- 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 78d0a98a1b5bb91104a7418440b662d6a8146f7f..3ca7db781bcb695d51fae1ee22053a54030a3711 100644 (file)
--- 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 b6728038b2c8444247cdd5ccce9c380d90d99619..32c4fe0330611e9db1f2a947c8761f17db32fc83 100644 (file)
--- 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 609de9182d93661ad0ce2b7024aee59c41fb0ce8..3794dd8d77ad192783425c9af6a129daa0ab0745 100644 (file)
--- 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 1619772eecbcfee8d159015340005192e26aeb6d..d6d42dee2a55e8e5ea347109947b5acd985da50f 100644 (file)
--- 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 dc912f82757f114a5880e79650f409207e426d37..d8ab652f4b4d1e53efb0447ecc70dd0ef4f2835c 100644 (file)
--- 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 19685b49bc00f60a2030d128fbd0e1b11aa6031e..31536a322a1a86c64f45e3f2664a2babd58575aa 100644 (file)
--- 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 6f1e792d1af1ae05c1bdddcf1eb3f5800c71082c..c25e552f2d13127ce1d9de76674a5c7cd52358af 100644 (file)
--- 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 84b0930e9eb0bccf8bf88a2b8b2bb50d4bd67e8d..bdd0263fc8065fbad27f5ad61d3fbe353070e470 100644 (file)
--- 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 16c652672f017beb79df7218d020c463ee77a4a6..aeef14e278e9150b4a32246ced264ead2dec4b3e 100644 (file)
--- 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