[packages/libgda3.git] / libgda3-configure.patch

--- 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);
Commit	Line	Data
d58dc8fa JB	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
	3	@@ -31,7 +31,7 @@
	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
	6	#
	7	-GDA_CURRENT=3
	8	+GDA_CURRENT=4
	9	GDA_REVISION=0
	10	GDA_AGE=1
	11
	12	@@ -219,8 +219,8 @@
	13
	14	dnl this is the shared link library extension, which varies by platform
	15	case $host_os in
	16	- cygwin*) libext=".dll.a" ;;
	17	- *) libext=".so" ;;
	18	+ cygwin*) mylibext=".dll.a" ;;
	19	+ *) mylibext=".so" ;;
	20	esac
	21
	22	dnl Test for Berkeley DB
	23	@@ -248,7 +248,7 @@
	24	AC_MSG_CHECKING(for Berkeley DB files)
	25	for d in $dir /usr /usr/local
	26	do
	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
	29	then
	30	AC_MSG_RESULT(found Berkeley DB in $d)
	31	bdblib="-ldb"
	32	@@ -263,7 +263,7 @@
bc04c5c3 JB	33	else
	34	AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
	35	BDB_CFLAGS="-I${bdbdir}/include"
	36	- BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
d58dc8fa	37	+ BDB_LIBS="${bdblib}"
bc04c5c3 JB	38	fi
	39	fi
	40	fi
d58dc8fa JB	41	@@ -296,14 +296,14 @@
	42	AC_MSG_CHECKING(for ODBC files)
	43	for d in $dir /usr /usr/local
	44	do
	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
	47	then
	48	AC_MSG_RESULT(found ODBC in $d)
	49	odbclib="-lodbc"
	50	odbcdir=$d
	51	break
	52	fi
	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
	55	then
	56	AC_MSG_RESULT(found iODBC in $d)
	57	odbclib="-liodbc"
	58	@@ -324,7 +324,7 @@
bc04c5c3 JB	59	else
	60	AC_DEFINE(HAVE_ODBC, 1, [Have ODBC])
	61	ODBC_CFLAGS="-I${odbcdir}/include"
	62	- ODBC_LIBS="-L${odbcdir}/lib ${odbclib}"
d58dc8fa	63	+ ODBC_LIBS="${odbclib}"
bc04c5c3 JB	64	fi
	65	fi
	66
d58dc8fa JB	67	@@ -359,14 +359,14 @@
	68	else
	69	mysqldir_suffix=
	70	fi
	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
	73	then
	74	AC_MSG_RESULT(found mysql in $d)
	75	mysqldir=$d
	76	mysqllibdir_suffix=/mysql
	77	break
	78	fi
	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
	81	then
	82	AC_MSG_RESULT(found mysql in $d)
	83	mysqldir=$d
	84	@@ -380,7 +380,7 @@
bc04c5c3 JB	85	else
	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"
d58dc8fa	89	+ MYSQL_LIBS="-lmysqlclient"
bc04c5c3 JB	90	fi
	91	else
	92	mysqldir=yes
d58dc8fa JB	93	@@ -418,14 +418,14 @@
	94	else
	95	msqldir_suffix=
	96	fi
	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
	99	then
	100	AC_MSG_RESULT(found mSQL in $d)
	101	msqldir=$d
	102	msqllibdir_suffix=/msql
	103	break
	104	fi
	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
	107	then
	108	AC_MSG_RESULT(found mSQL in $d)
	109	msqldir=$d
	110	@@ -439,7 +439,7 @@
bc04c5c3 JB	111	else
	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"
d58dc8fa	115	+ MSQL_LIBS="-lmsql"
bc04c5c3 JB	116	AC_MSG_CHECKING(for mSQL 3.x API)
	117	AC_TRY_RUN([
	118	#include "${msqldir}/include${msqldir_suffix}/msql.h"
d58dc8fa JB	119	@@ -475,7 +475,7 @@
	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
	122	do
	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
	125	then
	126	AC_MSG_RESULT(found Postgres in $d)
	127	postgresdir=$d
	128	@@ -505,7 +505,7 @@
bc04c5c3 JB	129	AC_MSG_WARN(Postgres include files not found, backend not used)
	130	postgresdir=""
	131	fi
	132	- POSTGRES_LIBS="-L${postgresdir}/lib -lpq"
d58dc8fa	133	+ POSTGRES_LIBS="-lpq"
bc04c5c3 JB	134	AC_DEFINE(HAVE_POSTGRES, 1, [Have PostgreSQL])
	135	fi
	136	fi
d58dc8fa JB	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
	140	do
	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"
	143	then
	144	AC_MSG_RESULT(found freetds in $d)
	145	freetdsdir="$d"
	146	freetds_incdir="$d/include"
	147	break
	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"
	150	then
	151	AC_MSG_RESULT(found freetds in $d and includes in $d/include/freetds)
	152	freetdsdir="$d"
	153	@@ -554,7 +554,7 @@
bc04c5c3 JB	154	AC_MSG_WARN(tds backend not used)
	155	else
	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"
	160	then
	161	AC_MSG_WARN(freetds version check failed - backend not used)
d58dc8fa	162	@@ -563,7 +563,7 @@
bc04c5c3 JB	163	else
	164	AC_MSG_RESULT($freetdsvercheck)
	165	FREETDS_CFLAGS="-I${freetds_incdir}"
	166	- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
d58dc8fa	167	+ FREETDS_LIBS="-ltds"
bc04c5c3 JB	168	AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
	169
	170	freetds_version_major="`echo $freetdsvercheck\|sed 's:^\([[^.]]\).:\1:'`"
d58dc8fa JB	171	@@ -695,13 +695,11 @@
	172	else
	173	SYBASE_DIR=${sybasedir}
	174	SYBASE_CFLAGS="-I${sybasedir}/include"
	175	- SYBASE_LIBS="-lnsl -ldl -lm"
bc04c5c3 JB	176	AC_MSG_CHECKING(for Sybase host system type)
	177	AC_MSG_RESULT($host)
	178	case "$host" in
	179	- linux) sybase_ctlibs="-L${sybasedir}/lib -lct -lcs -lsybtcl -lcomn -lintl"
	180	- sybase_blklibs="-L${sybasedir}/lib -lblk ${sybase_ctlibs}"
d58dc8fa JB	181	- SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
	182	+ linux)
	183	+ SYBASE_LIBS="-lct"
bc04c5c3 JB	184	AC_CHECK_LIB(ct,tdsdump_on,[
bc04c5c3 JB	185	AC_MSG_WARN(linking against freetds libct)
d58dc8fa JB	186	AC_DEFINE(HAVE_SYBASE, 1, [Have Sybase])
d58dc8fa JB	187	@@ -785,7 +783,7 @@
bc04c5c3 JB	188	else
	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"
d58dc8fa	192	+ ORACLE_LIBS="-lm -ldl -lclntsh"
bc04c5c3 JB	193	fi
	194	fi
	195
d58dc8fa	196	@@ -825,13 +823,13 @@
bc04c5c3	197	FIREBIRD_CFLAGS="-I${firebirddir}/include"
350ed337 PZ	198	if test -f $firebirddir/lib/libfbembed.so
	199	then
	200	- FIREBIRD_LIBS="-L${firebirddir}/lib -lfbembed"
d58dc8fa	201	+ FIREBIRD_LIBS="-lfbembed"
350ed337 PZ	202	else
	203	if test -f $firebirddir/lib/libfbclient.so
	204	then
	205	- FIREBIRD_LIBS="-L${firebirddir}/lib -lfbclient"
d58dc8fa	206	+ FIREBIRD_LIBS="-lfbclient"
350ed337 PZ	207	else
350ed337 PZ	208	- FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
d58dc8fa	209	+ FIREBIRD_LIBS="-lgds -ldl -lcrypt"
350ed337 PZ	210	fi
350ed337 PZ	211	fi
bc04c5c3	212	fi
d58dc8fa	213	@@ -871,7 +869,7 @@
bc04c5c3 JB	214	AC_MSG_WARN(Xbase backend not used)
	215	else
	216	XBASE_CFLAGS=-I${xbasedir}/include
	217	- XBASE_LIBS="-L${xbasedir}/lib -lxbase"
d58dc8fa	218	+ XBASE_LIBS="-lxbase"
bc04c5c3 JB	219	AC_DEFINE(HAVE_XBASE, 1, [Have Xbase])
	220	fi
	221	fi
d58dc8fa	222	@@ -898,7 +896,7 @@
bc04c5c3 JB	223	mdbdir=""
	224	for d in $dir /usr /usr/local /opt/gnome
	225	do
350ed337	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
d58dc8fa	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
bc04c5c3 JB	228	then
	229	AC_MSG_RESULT(found MDB Tools in $d)
	230	mdbdir=$d
d58dc8fa	231	@@ -909,8 +907,8 @@
bc04c5c3 JB	232	then
	233	AC_MSG_WARN(MDB backend not used)
	234	else
	235	- MDB_CFLAGS=-I${mdbdir}/include
350ed337	236	- MDB_LIBS="-L${mdbdir}/lib -lmdb"
d58dc8fa JB	237	+ MDB_CFLAGS=-I${mdbdir}/include/mdb
d58dc8fa JB	238	+ MDB_LIBS="-lmdb"
bc04c5c3 JB	239	AC_DEFINE(HAVE_MDB, 1, [Have MDB])
	240
	241	save_CFLAGS="$CFLAGS"
d58dc8fa	242	@@ -989,7 +987,7 @@
bc04c5c3 JB	243	AC_MSG_WARN(LDAP backend not used)
	244	else
	245	LDAP_CFLAGS="-I${ldapdir}/include"
	246	- LDAP_LIBS="-L${ldapdir}/lib -lldap -llber"
d58dc8fa	247	+ LDAP_LIBS="-lldap -llber"
bc04c5c3 JB	248	AC_DEFINE(HAVE_LDAP, 1, [Have LDAP])
	249	fi
	250	fi
d58dc8fa JB	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
	253	@@ -37,6 +37,10 @@
	254
	255	#include <libgda/sql-delimiter/gda-sql-delimiter.h>
	256
	257	+#ifndef CS_MAX_CHAR
	258	+# define CS_MAX_CHAR 256
	259	+#endif
	260	+
	261	#define PARENT_TYPE GDA_TYPE_SERVER_PROVIDER
	262
	263	static void gda_sybase_provider_class_init (GdaSybaseProviderClass *klass);