From a20619b8e45d0df366aabde9ff4174410cdc63f6 Mon Sep 17 00:00:00 2001
From: sreitenbach <sreitenbach@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Sun, 3 Feb 2008 13:52:01 +0000
Subject: [PATCH] * 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
---
 SoObjects/Appointments/GNUmakefile  |  1 -
 SoObjects/Contacts/GNUmakefile      |  1 -
 SoObjects/Mailer/GNUmakefile        |  1 -
 SoObjects/SOGo/GNUmakefile          | 11 ++++++-----
 SoObjects/SOGo/LDAPUserManager.m    |  5 ++++-
 SoObjects/SOGo/NSString+Utilities.h |  2 ++
 SoObjects/Sieve/GNUmakefile         |  1 -
 SoObjects/common.make               |  4 ++--
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile
index 8924bd4b..31caa3fd 100644
--- 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 3f08626c..dd0ae6da 100644
--- 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 907df787..4530e0c1 100644
--- 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 526cb226..4a00f5d5 100644
--- 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 0e116885..691f7830 100644
--- 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 0f2e95a9..75bc6dc9 100644
--- 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 ea2446e4..9921fefd 100644
--- 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 096c7a6d..12400eea 100644
--- 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)
 
-- 
2.39.5