macosx fixes

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@29 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-gdl1/PostgreSQL/GNUmakefile.preamble b/sope-gdl1/PostgreSQL/GNUmakefile.preamble
index b38a04cf632741f237e65718219f1b415a52b05b..7202e72a0216a17b6a73a67a8320eb6517af7884 100644 (file)
--- a/sope-gdl1/PostgreSQL/GNUmakefile.preamble
+++ b/sope-gdl1/PostgreSQL/GNUmakefile.preamble
@@ -47,18 +47,24 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I/usr/include/pgsql            \
         -I/usr/include/postgresql       \
        -I/usr/include                  \
-       -I/Library/PostgreSQL/include/
 
 ADDITIONAL_LIB_DIRS += \
        -L../GDLAccess/$(GNUSTEP_OBJ_DIR)\
        -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)
 
+ifneq ($(PGSQL),)
+ADDITIONAL_LIB_DIRS += -L$(PGSQL)/lib
+endif
+
 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
+
+ADDITIONAL_INCLUDE_DIRS += -I/Library/PostgreSQL/include/
+
 endif

diff --git a/sope-gdl1/PostgreSQL/NSString+PGVal.m b/sope-gdl1/PostgreSQL/NSString+PGVal.m
index 759780785526f6956a3b88988a86b9070505de97..fbd0e3391ab384d586f0143b309ea1fe27a3eeed 100644 (file)
--- a/sope-gdl1/PostgreSQL/NSString+PGVal.m
+++ b/sope-gdl1/PostgreSQL/NSString+PGVal.m
@@ -1,6 +1,31 @@
-// $Id: NSString+PGVal.m 1 2004-08-20 10:38:46Z znek $
+/* 
+   PostgreSQL72Channel.h
+
+   Copyright (C) 1999 MDlink online service center GmbH and Helge Hess
+   Copyright (C) 2000-2004 SKYRIX Software AG and Helge Hess
+
+   Author: Helge Hess (helge.hess@opengroupware.org)
+
+   This file is part of the PostgreSQL72 Adaptor Library
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
 
 #include "PostgreSQL72Channel.h"
+#include <NGExtensions/NSString+Ext.h>
 #include "common.h"
 
 @implementation NSString(PostgreSQL72Values)

diff --git a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.h b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.h
index 06598fbd4deb759a892c7c3aa2322e41605bec9c..a36b9f7622c7a82bf8b53767483157f5750276c6 100644 (file)
--- a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.h
+++ b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.h
@@ -23,7 +23,6 @@
    If not, write to the Free Software Foundation,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
-// $Id: PostgreSQL72Channel.h 1 2004-08-20 10:38:46Z znek $
 
 #ifndef ___PostgreSQL72_Channel_H___
 #define ___PostgreSQL72_Channel_H___