Monotone-Parent: d8ee782e0279aa96226ceac45acca9d744f3f234

Monotone-Revision: 089ae441ff03d28570373f845e09e2601d6611ee

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-14T17:31:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-02-14 17:31:23 +00:00
parent 716230fce7
commit b4307939db
35 changed files with 3368 additions and 113 deletions
-1
View File
@@ -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
-1
View File
@@ -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
-1
View File
@@ -52,4 +52,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/wobundle.make
-include GNUmakefile.postamble
include ../../fhsbundle.make
+6 -5
View File
@@ -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
+4 -1
View File
@@ -80,7 +80,10 @@ static BOOL defaultMailDomainIsConfigured = NO;
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)
+2
View File
@@ -48,6 +48,8 @@
- (NSString *) asQPSubjectString: (NSString *) encoding;
- (NSRange) _rangeOfURLInRange: (NSRange) refRange;
#ifndef GNUSTEP_BASE_LIBRARY
- (BOOL) boolValue;
#endif
-1
View File
@@ -19,4 +19,3 @@ Sieve_RESOURCE_FILES += \
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make
-include GNUmakefile.postamble
include ../../fhsbundle.make
+2 -2
View File
@@ -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)