From 0448367acec4b7d484a240ab35e6a61fa443136b Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 20 Aug 2004 22:12:59 +0000
Subject: [PATCH] fixed PostgreSQL72 for SOPE 3.3

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@19 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-gdl1/PostgreSQL72/ChangeLog                |  4 ++++
 sope-gdl1/PostgreSQL72/GNUmakefile.preamble     | 11 +++++++----
 sope-gdl1/PostgreSQL72/NSString+PGVal.m         |  2 --
 sope-gdl1/PostgreSQL72/PostgreSQL72Expression.m |  5 ++---
 sope-gdl1/PostgreSQL72/Version                  |  2 +-
 sope-gdl1/PostgreSQL72/common.h                 |  9 +--------
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/sope-gdl1/PostgreSQL72/ChangeLog b/sope-gdl1/PostgreSQL72/ChangeLog
index f4488afe..ebe74ef0 100644
--- a/sope-gdl1/PostgreSQL72/ChangeLog
+++ b/sope-gdl1/PostgreSQL72/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-21  Helge Hess  <helge.hess@opengroupware.org>
+
+	* fixed for SOPE 3.3 directory layout (v1.0.34)
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
 	* moved from ThirdParty to SOPE/sope-gdl1 (v1.0.33)
diff --git a/sope-gdl1/PostgreSQL72/GNUmakefile.preamble b/sope-gdl1/PostgreSQL72/GNUmakefile.preamble
index 6607d48e..b38a04cf 100644
--- a/sope-gdl1/PostgreSQL72/GNUmakefile.preamble
+++ b/sope-gdl1/PostgreSQL72/GNUmakefile.preamble
@@ -38,24 +38,27 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I$(PGSQL)/include/pgsql        \
 	-I$(PGSQL)/include	        \
 	-I.. -I../..		        \
-	-I../../../SOPE/skyrix-core/	\
+	-I../../sope-core/
+
+ADDITIONAL_INCLUDE_DIRS += \
 	-I/usr/local/include/pgsql	\
 	-I/usr/local/include		\
 	-I/usr/local/pgsql/include	\
 	-I/usr/include/pgsql		\
         -I/usr/include/postgresql       \
 	-I/usr/include			\
-	-I/Library/PostgreSQL/include/	\
+	-I/Library/PostgreSQL/include/
 
 ADDITIONAL_LIB_DIRS += \
 	-L../GDLAccess/$(GNUSTEP_OBJ_DIR)\
+	-L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)
+
+ADDITIONAL_LIB_DIRS += \
 	-L$(PGSQL)/lib		        \
 	-L/usr/local/lib	        \
 	-L/usr/local/pgsql/lib/	        \
 	-L/usr/lib
 
 ifeq ($(FOUNDATION_LIB),apple)
-
 PostgreSQL72_BUNDLE_LIBS += -lssl -lcrypto
-
 endif
diff --git a/sope-gdl1/PostgreSQL72/NSString+PGVal.m b/sope-gdl1/PostgreSQL72/NSString+PGVal.m
index 28839990..75978078 100644
--- a/sope-gdl1/PostgreSQL72/NSString+PGVal.m
+++ b/sope-gdl1/PostgreSQL72/NSString+PGVal.m
@@ -1,8 +1,6 @@
 // $Id: NSString+PGVal.m 1 2004-08-20 10:38:46Z znek $
 
-#import <Foundation/NSString.h>
 #include "PostgreSQL72Channel.h"
-#include <NGExtensions/NSString+Ext.h>
 #include "common.h"
 
 @implementation NSString(PostgreSQL72Values)
diff --git a/sope-gdl1/PostgreSQL72/PostgreSQL72Expression.m b/sope-gdl1/PostgreSQL72/PostgreSQL72Expression.m
index 9eade07f..7cbc6ee5 100644
--- a/sope-gdl1/PostgreSQL72/PostgreSQL72Expression.m
+++ b/sope-gdl1/PostgreSQL72/PostgreSQL72Expression.m
@@ -24,9 +24,8 @@
 */
 // $Id: PostgreSQL72Expression.m 1 2004-08-20 10:38:46Z znek $
 
-#include <Foundation/Foundation.h>
-#include <GDLAccess/EOAccess.h>
 #include "PostgreSQL72Expression.h"
+#include "common.h"
 
 @implementation PostgreSQL72Expression
 
@@ -34,7 +33,7 @@
   return [PostgreSQL72SelectSQLExpression class];
 }
 
-@end
+@end /* PostgreSQL72Expression */
 
 @implementation PostgreSQL72SelectSQLExpression
 
diff --git a/sope-gdl1/PostgreSQL72/Version b/sope-gdl1/PostgreSQL72/Version
index 2544f203..188c9170 100644
--- a/sope-gdl1/PostgreSQL72/Version
+++ b/sope-gdl1/PostgreSQL72/Version
@@ -1,3 +1,3 @@
 # $Id: Version 1 2004-08-20 10:38:46Z znek $
 
-SUBMINOR_VERSION:=33
+SUBMINOR_VERSION:=34
diff --git a/sope-gdl1/PostgreSQL72/common.h b/sope-gdl1/PostgreSQL72/common.h
index 0b8abb07..0d3c6d95 100644
--- a/sope-gdl1/PostgreSQL72/common.h
+++ b/sope-gdl1/PostgreSQL72/common.h
@@ -23,19 +23,12 @@
    If not, write to the Free Software Foundation,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
-// $Id: common.h 1 2004-08-20 10:38:46Z znek $
 
 #ifndef ___PostgreSQL_common_H___
 #define ___PostgreSQL_common_H___
 
 #import <objc/objc-api.h>
 
-#if LIB_FOUNDATION_BOEHM_GC
-#  include <objc/gc.h>
-#  include <objc/gc_typed.h>
-#  include <extensions/GarbageCollector.h>
-#endif
-
 #include <string.h>
 #include <strings.h>
 #include <stdlib.h>
@@ -48,6 +41,6 @@
 #  include <NGExtensions/NGObjectMacros.h>
 #endif
 
-#import <GDLAccess/EOAccess.h>
+#import <GDLAccess/GDLAccess.h>
 
 #endif /* ___PostgreSQL_common_H___ */
-- 
2.39.5