--- libgda-3.1.4/configure.in.orig	2008-04-10 12:39:53.000000000 +0200
+++ libgda-3.1.4/configure.in	2008-05-31 21:49:29.441860785 +0200
@@ -31,7 +31,7 @@
 # - If binary compatibility has been broken (e.g. removed or changed interfaces), set GDA_CURRENT += 1, GDA_REVISION and GDA_AGE to 0
 # - If interfaces is the same as the previous version, set GDA_REVISION += 1
 #
-GDA_CURRENT=3
+GDA_CURRENT=4
 GDA_REVISION=0
 GDA_AGE=1
 
@@ -219,8 +219,8 @@
 
 dnl this is the shared link library extension, which varies by platform
 case $host_os in
-	cygwin*) libext=".dll.a" ;;
-	*) libext=".so" ;;
+	cygwin*) mylibext=".dll.a" ;;
+	*) mylibext=".so" ;;
 esac
 
 dnl Test for Berkeley DB
@@ -248,7 +248,7 @@
 		AC_MSG_CHECKING(for Berkeley DB files)
 		for d in $dir /usr /usr/local
 		do
-			if test -f $d/$lib/libdb$libext -a -f $d/include/db.h
+			if test -f $d/$lib/libdb$mylibext -a -f $d/include/db.h
 			then
 				AC_MSG_RESULT(found Berkeley DB in $d)
 				bdblib="-ldb"
@@ -263,7 +263,7 @@
 		else
 			AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
 			BDB_CFLAGS="-I${bdbdir}/include"
-			BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
+			BDB_LIBS="${bdblib}"
 		fi
 	fi
 fi
@@ -296,14 +296,14 @@
 	AC_MSG_CHECKING(for ODBC files)
 	for d in $dir /usr /usr/local
 	do
-		if test -f $d/$lib/libodbc$libext -a -f $d/include/sql.h
+		if test -f $d/$lib/libodbc$mylibext -a -f $d/include/sql.h
 		then
 			AC_MSG_RESULT(found ODBC in $d)
 			odbclib="-lodbc"
 			odbcdir=$d
 			break
 		fi
-		if test -f $d/$lib/libiodbc$libext -a -f $d/include/sql.h
+		if test -f $d/$lib/libiodbc$mylibext -a -f $d/include/sql.h
 		then
 			AC_MSG_RESULT(found iODBC in $d)
 			odbclib="-liodbc"
@@ -324,7 +324,7 @@
 	else
 		AC_DEFINE(HAVE_ODBC, 1, [Have ODBC])
 		ODBC_CFLAGS="-I${odbcdir}/include"
-		ODBC_LIBS="-L${odbcdir}/lib ${odbclib}"
+		ODBC_LIBS="${odbclib}"
 	fi
 fi
 
@@ -359,14 +359,14 @@
 			else
 				mysqldir_suffix=
 			fi
-			if test -f $d/$lib/mysql/libmysqlclient.a -o -f $d/$lib/mysql/libmysqlclient$libext
+			if test -f $d/$lib/mysql/libmysqlclient.a -o -f $d/$lib/mysql/libmysqlclient$mylibext
 			then
 				AC_MSG_RESULT(found mysql in $d)
 				mysqldir=$d
 				mysqllibdir_suffix=/mysql
 				break
 			fi
-			if test -f $d/$lib/libmysqlclient.a -o -f $d/$lib/libmysqlclient$libext
+			if test -f $d/$lib/libmysqlclient.a -o -f $d/$lib/libmysqlclient$mylibext
 			then
 				AC_MSG_RESULT(found mysql in $d)
 				mysqldir=$d
@@ -380,7 +380,7 @@
 		else
 			AC_DEFINE(HAVE_MYSQL, 1, [Have MySQL])
 			MYSQL_CFLAGS="-I${mysqldir}/include${mysqldir_suffix}"
-			MYSQL_LIBS="-L${mysqldir}/lib${mysqllibdir_suffix} -lmysqlclient"
+			MYSQL_LIBS="-lmysqlclient"
 		fi
 	else
 		mysqldir=yes
@@ -418,14 +418,14 @@
 		else
 			msqldir_suffix=
 		fi
-		if test -f $d/$lib/msql/libmsql.a -o -f $d/$lib/msql/libmsql$libext
+		if test -f $d/$lib/msql/libmsql.a -o -f $d/$lib/msql/libmsql$mylibext
 		then
 			AC_MSG_RESULT(found mSQL in $d)
 			msqldir=$d
 			msqllibdir_suffix=/msql
 			break
 		fi
-		if test -f $d/$lib/libmsql.a -o -f $d/$lib/libmsql$libext
+		if test -f $d/$lib/libmsql.a -o -f $d/$lib/libmsql$mylibext
 		then
 			AC_MSG_RESULT(found mSQL in $d)
 			msqldir=$d
@@ -439,7 +439,7 @@
 	else
 		AC_DEFINE(HAVE_MSQL, 1, [Have mSQL])
 		MSQL_CFLAGS="-I${msqldir}/include${msqldir_suffix}"
-		MSQL_LIBS="-L${msqldir}/lib${msqllibdir_suffix} -lmsql"
+		MSQL_LIBS="-lmsql"
                 AC_MSG_CHECKING(for mSQL 3.x API)
                 AC_TRY_RUN([
                   #include "${msqldir}/include${msqldir_suffix}/msql.h"
@@ -475,7 +475,7 @@
 	AC_MSG_CHECKING(for Postgres files)
 	for d in $dir /usr /usr/local/postgres /opt/postgres /opt/packages/postgres /disk/postgres /usr/local/pgsql
 	do
-		if test -f $d/$lib/libpq.a -o -f $d/$lib/libpq$libext
+		if test -f $d/$lib/libpq.a -o -f $d/$lib/libpq$mylibext
 		then
 			AC_MSG_RESULT(found Postgres in $d)
 			postgresdir=$d
@@ -505,7 +505,7 @@
 			AC_MSG_WARN(Postgres include files not found, backend not used)
 			postgresdir=""
 		fi
-		POSTGRES_LIBS="-L${postgresdir}/lib -lpq"
+		POSTGRES_LIBS="-lpq"
 		AC_DEFINE(HAVE_POSTGRES, 1, [Have PostgreSQL])
 	fi
 fi
@@ -535,13 +535,13 @@
 	AC_MSG_CHECKING(for freetds files)
 	for d in $dir /usr/local/freetds /usr /opt/freetds /opt/packages/freetds /opt/freetds-0.50
 	do
-		if test -f "$d/include/tds.h" -a -e "$d/$lib/libtds$libext" -a -f "$d/include/tdsver.h"
+		if test -f "$d/include/tds.h" -a -e "$d/$lib/libtds$mylibext" -a -f "$d/include/tdsver.h"
 		then
 			AC_MSG_RESULT(found freetds in $d)
 			freetdsdir="$d"
 			freetds_incdir="$d/include"
 			break
-		elif test -f "$d/include/freetds/tds.h" -a -e "$d/$lib/libtds$libext" -a -f "$d/include/freetds/tdsver.h"
+		elif test -f "$d/include/freetds/tds.h" -a -e "$d/$lib/libtds$mylibext" -a -f "$d/include/freetds/tdsver.h"
 		then
 			AC_MSG_RESULT(found freetds in $d and includes in $d/include/freetds)
 			freetdsdir="$d"
@@ -554,7 +554,7 @@
 		AC_MSG_WARN(tds backend not used)
 	else
 		AC_MSG_CHECKING(for freetds version)
-		freetdsvercheck="`grep \"^#define \(VERSION_NO \|TDS_VERSION_NO \)\" $freetds_incdir/tdsver.h|sed 's|^.*".*v\(.*\)"|\1|'`"
+		freetdsvercheck=$(grep "^#define \(VERSION_NO \|TDS_VERSION_NO \)" $freetds_incdir/tdsver.h|sed 's|^.*".*v\(.*\)"|\1|')
 		if test "x$freetdsvercheck" = "x"
 		then
 			AC_MSG_WARN(freetds version check failed - backend not used)
@@ -563,7 +563,7 @@
 		else
 			AC_MSG_RESULT($freetdsvercheck)
 			FREETDS_CFLAGS="-I${freetds_incdir}"
-			FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
+			FREETDS_LIBS="-ltds"
 			AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
 
 			freetds_version_major="`echo $freetdsvercheck|sed 's:^\([[^.]]*\).*:\1:'`"
@@ -695,13 +695,11 @@
 	else
 		SYBASE_DIR=${sybasedir}
 		SYBASE_CFLAGS="-I${sybasedir}/include"
-		SYBASE_LIBS="-lnsl -ldl -lm"
 		AC_MSG_CHECKING(for Sybase host system type)
 		AC_MSG_RESULT($host)
 		case "$host" in
-		*linux*) sybase_ctlibs="-L${sybasedir}/lib -lct -lcs -lsybtcl -lcomn -lintl"
-			sybase_blklibs="-L${sybasedir}/lib -lblk ${sybase_ctlibs}"
-			SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
+		*linux*)
+			SYBASE_LIBS="-lct"
 			AC_CHECK_LIB(ct,tdsdump_on,[
 			AC_MSG_WARN(linking against freetds libct)
 			AC_DEFINE(HAVE_SYBASE, 1, [Have Sybase])
@@ -785,7 +783,7 @@
 	else
 		AC_DEFINE(HAVE_ORACLE, 1, [Have ORACLE])
 		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"
-		ORACLE_LIBS="-L$oracledir/lib -lm -ldl -lclntsh"
+		ORACLE_LIBS="-lm -ldl -lclntsh"
 	fi
 fi
 
@@ -825,13 +823,13 @@
 		FIREBIRD_CFLAGS="-I${firebirddir}/include"
 		if test -f $firebirddir/lib/libfbembed.so
 		then
-			FIREBIRD_LIBS="-L${firebirddir}/lib -lfbembed"
+			FIREBIRD_LIBS="-lfbembed"
 		else
 			if test -f $firebirddir/lib/libfbclient.so
 			then
-				FIREBIRD_LIBS="-L${firebirddir}/lib -lfbclient"
+				FIREBIRD_LIBS="-lfbclient"
 			else
-				FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
+				FIREBIRD_LIBS="-lgds -ldl -lcrypt"
 			fi
 		fi
 	fi
@@ -871,7 +869,7 @@
 		AC_MSG_WARN(Xbase backend not used)
 	else
 		XBASE_CFLAGS=-I${xbasedir}/include
-		XBASE_LIBS="-L${xbasedir}/lib -lxbase"
+		XBASE_LIBS="-lxbase"
 		AC_DEFINE(HAVE_XBASE, 1, [Have Xbase])
 	fi
 fi
@@ -898,7 +896,7 @@
 	mdbdir=""
 	for d in $dir /usr /usr/local /opt/gnome
 	do
-		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
+		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
 		then
 			AC_MSG_RESULT(found MDB Tools in $d)
 			mdbdir=$d
@@ -909,8 +907,8 @@
 	then
 		AC_MSG_WARN(MDB backend not used)
 	else
-		MDB_CFLAGS=-I${mdbdir}/include
-		MDB_LIBS="-L${mdbdir}/lib -lmdb"
+		MDB_CFLAGS=-I${mdbdir}/include/mdb
+		MDB_LIBS="-lmdb"
 		AC_DEFINE(HAVE_MDB, 1, [Have MDB])
 
 		save_CFLAGS="$CFLAGS"
@@ -989,7 +987,7 @@
 		AC_MSG_WARN(LDAP backend not used)
 	else
 		LDAP_CFLAGS="-I${ldapdir}/include"
-		LDAP_LIBS="-L${ldapdir}/lib -lldap -llber"
+		LDAP_LIBS="-lldap -llber"
 		AC_DEFINE(HAVE_LDAP, 1, [Have LDAP])
 	fi
 fi
--- libgda-3.1.4/providers/sybase/gda-sybase-provider.c.orig	2008-04-03 21:31:00.000000000 +0200
+++ libgda-3.1.4/providers/sybase/gda-sybase-provider.c	2008-05-31 19:59:27.097602895 +0200
@@ -37,6 +37,10 @@
 
 #include <libgda/sql-delimiter/gda-sql-delimiter.h>
 
+#ifndef CS_MAX_CHAR
+#  define CS_MAX_CHAR 256
+#endif
+
 #define PARENT_TYPE GDA_TYPE_SERVER_PROVIDER
 
 static void gda_sybase_provider_class_init (GdaSybaseProviderClass *klass);