From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Sun, 20 Mar 2005 22:14:13 +0000 (+0000)
Subject: fixed some linking issues on OSX
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa568109d0f4a78fd80dd2661be91277538617ba;p=scalable-opengroupware.org

fixed some linking issues on OSX


git-svn-id: http://svn.opengroupware.org/SOGo/trunk@633 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/SOGo/SoObjects/ChangeLog b/SOGo/SoObjects/ChangeLog
index 16308238..f685ff10 100644
--- a/SOGo/SoObjects/ChangeLog
+++ b/SOGo/SoObjects/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-20  Helge Hess  <helge.hess@opengroupware.org>
+
+	* common.make: link against GDLContentStore instead of OGoContentStore
+
 2005-02-24  Helge Hess  <helge.hess@opengroupware.org>
 
 	* common.make (ADDITIONAL_LIB_DIRS): removed SOGoLogic from the linking
diff --git a/SOGo/SoObjects/common.make b/SOGo/SoObjects/common.make
index 9bd89f8c..fa42fa19 100644
--- a/SOGo/SoObjects/common.make
+++ b/SOGo/SoObjects/common.make
@@ -18,7 +18,7 @@ ADDITIONAL_LIB_DIRS += \
 
 BUNDLE_LIBS += \
 	-lSOGo					\
-	-lOGoContentStore			\
+	-lGDLContentStore			\
 	-lGDLAccess				\
 	-lNGObjWeb				\
 	-lNGiCal -lNGMime -lNGLdap		\
diff --git a/SOGo/UI/Scheduler/GNUmakefile.preamble b/SOGo/UI/Scheduler/GNUmakefile.preamble
index efc9130d..73c977c3 100644
--- a/SOGo/UI/Scheduler/GNUmakefile.preamble
+++ b/SOGo/UI/Scheduler/GNUmakefile.preamble
@@ -2,3 +2,4 @@
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I.. -I../.. -I../../..
+
diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.m b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
index 0415de82..9bcb00d8 100644
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
@@ -327,8 +327,9 @@
     return NO;
   
   /* calculate the interval requested by the user (can be larger) */
-  
+
   aptStartDate = [_slotRange startDate];
+  // TODO: gives warning on MacOSX
   aptEndDate   = [[NSCalendarDate alloc] initWithTimeIntervalSince1970:
 					   [aptStartDate timeIntervalSince1970]
 					 + [self durationAsTimeInterval]];
diff --git a/SOGo/UI/common.make b/SOGo/UI/common.make
index 5615c10e..bdb1b862 100644
--- a/SOGo/UI/common.make
+++ b/SOGo/UI/common.make
@@ -39,6 +39,7 @@ BUNDLE_LIBS += \
 	-lSOGoUI				\
 	-lSOGo					\
 	-lOGoContentStore			\
+	-lGDLContentStore			\
 	-lGDLAccess				\
 	-lNGObjWeb				\
 	-lNGMime -lNGiCal -lNGLdap		\