* make SoObjects gnustep-make 2 compatible

git-svn-id: http://svn.opengroupware.org/SOGo/inverse/branches/1.0-gsmake2@1351 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile
index 8924bd4bef0f4aa15743398e249f9b0f8c6bc61b..31caa3fd5086a7ecbe8d1a5582a77e29506ceb73 100644 (file)
--- a/SoObjects/Appointments/GNUmakefile
+++ b/SoObjects/Appointments/GNUmakefile
@@ -56,4 +56,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/wobundle.make
 -include GNUmakefile.postamble
-include ../../fhswobundle.make

diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile
index 3f08626cf8f3dcf88a86c3f95027927490b7e2ee..dd0ae6daa5002770ad1f40bf0b12cebd0bd80fda 100644 (file)
--- a/SoObjects/Contacts/GNUmakefile
+++ b/SoObjects/Contacts/GNUmakefile
@@ -26,4 +26,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile
index 907df7878305cfe00b6b574fb40c541b4587844d..4530e0c11f6f896ae03e07131f1ce907c7b74170 100644 (file)
--- a/SoObjects/Mailer/GNUmakefile
+++ b/SoObjects/Mailer/GNUmakefile
@@ -54,4 +54,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/wobundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index 526cb2264c92cd3e9a23c3cf3b55555035116400..4a00f5d597ecc8d5c771ba496c8d8f5299565972 100644 (file)
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -1,6 +1,6 @@
 # GNUstep makefile
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 -include ../../Version
 -include ./Version
@@ -13,11 +13,11 @@ TOOL_NAME = \
 #      agenor_emails4uid       \
 #      agenor_defaults
 
-libSOGo_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libSOGo_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libSOGo_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 
 libSOGo_HEADER_FILES_DIR         = .
 libSOGo_HEADER_FILES_INSTALL_DIR = /SOGo
-FHS_HEADER_DIRS = SOGo
 
 libSOGo_HEADER_FILES = \
        SOGoCache.h                     \
@@ -107,8 +107,9 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include ../common.make
+ifneq ($(FHS_INSTALL_ROOT),)
+GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
+endif
 include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
--include ../../fhslib.make
--include ../../fhstools.make

diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m
index 0e11688526c21abdbdbfe947302524d470c7e9ef..691f783063363af21561d1e16147a914ea293923 100644 (file)
--- a/SoObjects/SOGo/LDAPUserManager.m
+++ b/SoObjects/SOGo/LDAPUserManager.m
@@ -65,7 +65,10 @@ static NSString *defaultMailDomain = nil;
   
   sourceID = [udSource objectForKey: @"id"];
   ldapSource = [LDAPSource sourceFromUDSource: udSource];
-  [sources setObject: ldapSource forKey: sourceID];
+  if (sourceID)
+    [sources setObject: ldapSource forKey: sourceID];
+  else
+    NSLog(@"LDAPUserManager.m: WARNING: id field missing in a LDAP source, check the SOGoLDAPSources default");
   metadata = [NSMutableDictionary dictionary];
   value = [udSource objectForKey: @"canAuthenticate"];
   if (value)

diff --git a/SoObjects/SOGo/NSString+Utilities.h b/SoObjects/SOGo/NSString+Utilities.h
index 0f2e95a99d4b4bd080a091e2069e70d79813fd1f..75bc6dc970cb1e0660724dec06a9dd8d660d5077 100644 (file)
--- a/SoObjects/SOGo/NSString+Utilities.h
+++ b/SoObjects/SOGo/NSString+Utilities.h
@@ -48,6 +48,8 @@
 
 - (NSString *) asQPSubjectString: (NSString *) encoding;
 
+- (NSRange) _rangeOfURLInRange: (NSRange) refRange;
+
 #ifndef GNUSTEP_BASE_LIBRARY
 - (BOOL) boolValue;
 #endif

diff --git a/SoObjects/Sieve/GNUmakefile b/SoObjects/Sieve/GNUmakefile
index ea2446e483907da3c5b52d939d210563a53a84f5..9921fefdd9a2b6af374ec05de1cb9d437391f369 100644 (file)
--- a/SoObjects/Sieve/GNUmakefile
+++ b/SoObjects/Sieve/GNUmakefile
@@ -19,4 +19,3 @@ Sieve_RESOURCE_FILES += \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

diff --git a/SoObjects/common.make b/SoObjects/common.make
index 096c7a6de687108797b219f124c5870cf91d1496..12400eea79b4379257776aee94fdefc3362a4f18 100644 (file)
--- a/SoObjects/common.make
+++ b/SoObjects/common.make
@@ -1,12 +1,12 @@
 # common make file for SoObject bundles
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
 include ./Version
 
 BUNDLE_EXTENSION     = .SOGo
-BUNDLE_INSTALL_DIR   = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
+BUNDLE_INSTALL_DIR   = $(SOGO_LIBDIR)
 WOBUNDLE_EXTENSION   = $(BUNDLE_EXTENSION)
 WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR)