1 --- libgda-3.1.4/configure.in.orig 2008-04-10 12:39:53.000000000 +0200
2 +++ libgda-3.1.4/configure.in 2008-05-31 21:49:29.441860785 +0200
4 # - If binary compatibility has been broken (e.g. removed or changed interfaces), set GDA_CURRENT += 1, GDA_REVISION and GDA_AGE to 0
5 # - If interfaces is the same as the previous version, set GDA_REVISION += 1
14 dnl this is the shared link library extension, which varies by platform
16 - cygwin*) libext=".dll.a" ;;
18 + cygwin*) mylibext=".dll.a" ;;
19 + *) mylibext=".so" ;;
22 dnl Test for Berkeley DB
24 AC_MSG_CHECKING(for Berkeley DB files)
25 for d in $dir /usr /usr/local
27 - if test -f $d/$lib/libdb$libext -a -f $d/include/db.h
28 + if test -f $d/$lib/libdb$mylibext -a -f $d/include/db.h
30 AC_MSG_RESULT(found Berkeley DB in $d)
34 AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
35 BDB_CFLAGS="-I${bdbdir}/include"
36 - BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
37 + BDB_LIBS="${bdblib}"
42 AC_MSG_CHECKING(for ODBC files)
43 for d in $dir /usr /usr/local
45 - if test -f $d/$lib/libodbc$libext -a -f $d/include/sql.h
46 + if test -f $d/$lib/libodbc$mylibext -a -f $d/include/sql.h
48 AC_MSG_RESULT(found ODBC in $d)
53 - if test -f $d/$lib/libiodbc$libext -a -f $d/include/sql.h
54 + if test -f $d/$lib/libiodbc$mylibext -a -f $d/include/sql.h
56 AC_MSG_RESULT(found iODBC in $d)
60 AC_DEFINE(HAVE_ODBC, 1, [Have ODBC])
61 ODBC_CFLAGS="-I${odbcdir}/include"
62 - ODBC_LIBS="-L${odbcdir}/lib ${odbclib}"
63 + ODBC_LIBS="${odbclib}"
71 - if test -f $d/$lib/mysql/libmysqlclient.a -o -f $d/$lib/mysql/libmysqlclient$libext
72 + if test -f $d/$lib/mysql/libmysqlclient.a -o -f $d/$lib/mysql/libmysqlclient$mylibext
74 AC_MSG_RESULT(found mysql in $d)
76 mysqllibdir_suffix=/mysql
79 - if test -f $d/$lib/libmysqlclient.a -o -f $d/$lib/libmysqlclient$libext
80 + if test -f $d/$lib/libmysqlclient.a -o -f $d/$lib/libmysqlclient$mylibext
82 AC_MSG_RESULT(found mysql in $d)
86 AC_DEFINE(HAVE_MYSQL, 1, [Have MySQL])
87 MYSQL_CFLAGS="-I${mysqldir}/include${mysqldir_suffix}"
88 - MYSQL_LIBS="-L${mysqldir}/lib${mysqllibdir_suffix} -lmysqlclient"
89 + MYSQL_LIBS="-lmysqlclient"
97 - if test -f $d/$lib/msql/libmsql.a -o -f $d/$lib/msql/libmsql$libext
98 + if test -f $d/$lib/msql/libmsql.a -o -f $d/$lib/msql/libmsql$mylibext
100 AC_MSG_RESULT(found mSQL in $d)
102 msqllibdir_suffix=/msql
105 - if test -f $d/$lib/libmsql.a -o -f $d/$lib/libmsql$libext
106 + if test -f $d/$lib/libmsql.a -o -f $d/$lib/libmsql$mylibext
108 AC_MSG_RESULT(found mSQL in $d)
112 AC_DEFINE(HAVE_MSQL, 1, [Have mSQL])
113 MSQL_CFLAGS="-I${msqldir}/include${msqldir_suffix}"
114 - MSQL_LIBS="-L${msqldir}/lib${msqllibdir_suffix} -lmsql"
116 AC_MSG_CHECKING(for mSQL 3.x API)
118 #include "${msqldir}/include${msqldir_suffix}/msql.h"
120 AC_MSG_CHECKING(for Postgres files)
121 for d in $dir /usr /usr/local/postgres /opt/postgres /opt/packages/postgres /disk/postgres /usr/local/pgsql
123 - if test -f $d/$lib/libpq.a -o -f $d/$lib/libpq$libext
124 + if test -f $d/$lib/libpq.a -o -f $d/$lib/libpq$mylibext
126 AC_MSG_RESULT(found Postgres in $d)
129 AC_MSG_WARN(Postgres include files not found, backend not used)
132 - POSTGRES_LIBS="-L${postgresdir}/lib -lpq"
133 + POSTGRES_LIBS="-lpq"
134 AC_DEFINE(HAVE_POSTGRES, 1, [Have PostgreSQL])
137 @@ -535,13 +535,13 @@
138 AC_MSG_CHECKING(for freetds files)
139 for d in $dir /usr/local/freetds /usr /opt/freetds /opt/packages/freetds /opt/freetds-0.50
141 - if test -f "$d/include/tds.h" -a -e "$d/$lib/libtds$libext" -a -f "$d/include/tdsver.h"
142 + if test -f "$d/include/tds.h" -a -e "$d/$lib/libtds$mylibext" -a -f "$d/include/tdsver.h"
144 AC_MSG_RESULT(found freetds in $d)
146 freetds_incdir="$d/include"
148 - elif test -f "$d/include/freetds/tds.h" -a -e "$d/$lib/libtds$libext" -a -f "$d/include/freetds/tdsver.h"
149 + elif test -f "$d/include/freetds/tds.h" -a -e "$d/$lib/libtds$mylibext" -a -f "$d/include/freetds/tdsver.h"
151 AC_MSG_RESULT(found freetds in $d and includes in $d/include/freetds)
154 AC_MSG_WARN(tds backend not used)
156 AC_MSG_CHECKING(for freetds version)
157 - freetdsvercheck="`grep \"^#define \(VERSION_NO \|TDS_VERSION_NO \)\" $freetds_incdir/tdsver.h|sed 's|^.*".*v\(.*\)"|\1|'`"
158 + freetdsvercheck=$(grep "^#define \(VERSION_NO \|TDS_VERSION_NO \)" $freetds_incdir/tdsver.h|sed 's|^.*".*v\(.*\)"|\1|')
159 if test "x$freetdsvercheck" = "x"
161 AC_MSG_WARN(freetds version check failed - backend not used)
164 AC_MSG_RESULT($freetdsvercheck)
165 FREETDS_CFLAGS="-I${freetds_incdir}"
166 - FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
167 + FREETDS_LIBS="-ltds"
168 AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
170 freetds_version_major="`echo $freetdsvercheck|sed 's:^\([[^.]]*\).*:\1:'`"
171 @@ -695,13 +695,11 @@
173 SYBASE_DIR=${sybasedir}
174 SYBASE_CFLAGS="-I${sybasedir}/include"
175 - SYBASE_LIBS="-lnsl -ldl -lm"
176 AC_MSG_CHECKING(for Sybase host system type)
179 - *linux*) sybase_ctlibs="-L${sybasedir}/lib -lct -lcs -lsybtcl -lcomn -lintl"
180 - sybase_blklibs="-L${sybasedir}/lib -lblk ${sybase_ctlibs}"
181 - SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
184 AC_CHECK_LIB(ct,tdsdump_on,[
185 AC_MSG_WARN(linking against freetds libct)
186 AC_DEFINE(HAVE_SYBASE, 1, [Have Sybase])
189 AC_DEFINE(HAVE_ORACLE, 1, [Have ORACLE])
190 ORACLE_CFLAGS=" -I$oracledir/include/oracle/client -I$oracledir/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I$oracledir/network/public"
191 - ORACLE_LIBS="-L$oracledir/lib -lm -ldl -lclntsh"
192 + ORACLE_LIBS="-lm -ldl -lclntsh"
196 @@ -825,13 +823,13 @@
197 FIREBIRD_CFLAGS="-I${firebirddir}/include"
198 if test -f $firebirddir/lib/libfbembed.so
200 - FIREBIRD_LIBS="-L${firebirddir}/lib -lfbembed"
201 + FIREBIRD_LIBS="-lfbembed"
203 if test -f $firebirddir/lib/libfbclient.so
205 - FIREBIRD_LIBS="-L${firebirddir}/lib -lfbclient"
206 + FIREBIRD_LIBS="-lfbclient"
208 - FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
209 + FIREBIRD_LIBS="-lgds -ldl -lcrypt"
214 AC_MSG_WARN(Xbase backend not used)
216 XBASE_CFLAGS=-I${xbasedir}/include
217 - XBASE_LIBS="-L${xbasedir}/lib -lxbase"
218 + XBASE_LIBS="-lxbase"
219 AC_DEFINE(HAVE_XBASE, 1, [Have Xbase])
224 for d in $dir /usr /usr/local /opt/gnome
226 - if test -f $d/include/mdbtools.h -a -f $d/$lib/libmdb$libext -o -f $d/include/mdbtools.h -a -f $d/$lib/libmdb.a
227 + if test -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdb$mylibext -o -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdb.a
229 AC_MSG_RESULT(found MDB Tools in $d)
233 AC_MSG_WARN(MDB backend not used)
235 - MDB_CFLAGS=-I${mdbdir}/include
236 - MDB_LIBS="-L${mdbdir}/lib -lmdb"
237 + MDB_CFLAGS=-I${mdbdir}/include/mdb
239 AC_DEFINE(HAVE_MDB, 1, [Have MDB])
241 save_CFLAGS="$CFLAGS"
243 AC_MSG_WARN(LDAP backend not used)
245 LDAP_CFLAGS="-I${ldapdir}/include"
246 - LDAP_LIBS="-L${ldapdir}/lib -lldap -llber"
247 + LDAP_LIBS="-lldap -llber"
248 AC_DEFINE(HAVE_LDAP, 1, [Have LDAP])
251 --- libgda-3.1.4/providers/sybase/gda-sybase-provider.c.orig 2008-04-03 21:31:00.000000000 +0200
252 +++ libgda-3.1.4/providers/sybase/gda-sybase-provider.c 2008-05-31 19:59:27.097602895 +0200
255 #include <libgda/sql-delimiter/gda-sql-delimiter.h>
258 +# define CS_MAX_CHAR 256
261 #define PARENT_TYPE GDA_TYPE_SERVER_PROVIDER
263 static void gda_sybase_provider_class_init (GdaSybaseProviderClass *klass);