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

diff -aurN libgda-1.2.3.orig/configure.in libgda-1.2.3/configure.in
--- libgda-1.2.3.orig/configure.in	2005-10-27 11:18:24.000000000 +0200
+++ libgda-1.2.3/configure.in	2006-08-11 20:01:19.815866962 +0200
@@ -149,8 +149,8 @@
 			AC_MSG_WARN(Berkeley DB backend not used)
 		else
 			AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
-			BDB_CFLAGS="-I${bdbdir}/include"
-			BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
+			BDB_CFLAGS="-I${includedir}"
+			BDB_LIBS="-L${libdir} ${bdblib}"
 		fi
 	fi
 fi
@@ -202,8 +202,8 @@
 			AC_MSG_WARN(ODBC backend not used)
 		else
 			AC_DEFINE(HAVE_ODBC, 1, [Have ODBC])
-			ODBC_CFLAGS="-I${odbcdir}/include"
-			ODBC_LIBS="-L${odbcdir}/lib ${odbclib}"
+			ODBC_CFLAGS="-I${includedir}"
+			ODBC_LIBS="-L${libdir} ${odbclib}"
 		fi
 	fi
 fi
@@ -259,8 +259,8 @@
 			AC_MSG_WARN(MySQL backend not used)
 		else
 			AC_DEFINE(HAVE_MYSQL, 1, [Have MySQL])
-			MYSQL_CFLAGS="-I${mysqldir}/include${mysqldir_suffix}"
-			MYSQL_LIBS="-L${mysqldir}/lib${mysqllibdir_suffix} -lmysqlclient"
+			MYSQL_CFLAGS="-I${includedir}${mysqldir_suffix}"
+			MYSQL_LIBS="-L${libdir}${mysqllibdir_suffix} -lmysqlclient"
 		fi
 	else
 		mysqldir=yes
@@ -318,11 +318,11 @@
 		AC_MSG_WARN(mSQL backend not used)
 	else
 		AC_DEFINE(HAVE_MSQL, 1, [Have mSQL])
-		MSQL_CFLAGS="-I${msqldir}/include${msqldir_suffix}"
-		MSQL_LIBS="-L${msqldir}/lib${msqllibdir_suffix} -lmsql"
+		MSQL_CFLAGS="-I${includedir}${msqldir_suffix}"
+		MSQL_LIBS="-L${libdir}${msqllibdir_suffix} -lmsql"
                 AC_MSG_CHECKING(for mSQL 3.x API)
                 AC_TRY_RUN([
-                  #include "${msqldir}/include${msqldir_suffix}/msql.h"
+                  #include "${includedir}${msqldir_suffix}/msql.h"
                   int main() {
                     int rc = INT64_TYPE;
                     return (rc>0) ? 0 : -1;
@@ -371,26 +371,26 @@
 		then
 			AC_MSG_WARN(Postgres backend not used)
 		else
-			if test -f ${postgresdir}/include/libpq-fe.h
+			if test -f ${includedir}/libpq-fe.h
 			then
-				POSTGRES_CFLAGS=-I${postgresdir}/include
-			elif test -f ${postgresdir}/include/pgsql/libpq-fe.h
+				POSTGRES_CFLAGS=-I${includedir}
+			elif test -f ${includedir}/pgsql/libpq-fe.h
 			then
-				POSTGRES_CFLAGS=-I${postgresdir}/include/pgsql
-			elif test -f ${postgresdir}/include/postgresql/libpq-fe.h
+				POSTGRES_CFLAGS=-I${includedir}/pgsql
+			elif test -f ${includedir}/postgresql/libpq-fe.h
 			then
-				POSTGRES_CFLAGS=-I${postgresdir}/include/postgresql
-                        elif test -f ${postgresdir}/include/postgresql/8.0/libpq-fe.h
+				POSTGRES_CFLAGS=-I${includedir}/postgresql
+                        elif test -f ${includedir}/postgresql/8.0/libpq-fe.h
 			then
-				POSTGRES_CFLAGS=-I${postgresdir}/include/8.0/postgresql
-                        elif test -f ${postgresdir}/include/postgresql/7.4/libpq-fe.h
+				POSTGRES_CFLAGS=-I${includedir}/8.0/postgresql
+                        elif test -f ${includedir}/postgresql/7.4/libpq-fe.h
 			then
-				POSTGRES_CFLAGS=-I${postgresdir}/include/7.4/postgresql
+				POSTGRES_CFLAGS=-I${includedir}/7.4/postgresql
 			else
 				AC_MSG_WARN(Postgres include files not found, backend not used)
 				postgresdir=""
 			fi
-			POSTGRES_LIBS="-L${postgresdir}/lib -lpq"
+			POSTGRES_LIBS="-L${libdir} -lpq"
 			AC_DEFINE(HAVE_POSTGRES, 1, [Have PostgreSQL])
 		fi
 	fi
@@ -440,7 +440,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|^.*"\(.*\)"|\1|'`"
+		freetdsvercheck="`grep VERSION ${includedir}/tdsver.h | sed 's|^.*"\(.*\)"|\1|'`"
 		if test "x$freetdsvercheck" = "x"
 		then
 			AC_MSG_WARN(freetds version check failed - backend not used)
@@ -450,27 +450,27 @@
 			case "$freetdsvercheck" in
 				*v0.5*) AC_MSG_RESULT($freetdsvercheck - using v0.5x api)
 					AC_DEFINE(HAVE_FREETDS_VER0_5X, 1, [Have freetds v0.5x API])
-					FREETDS_CFLAGS="-I${freetds_incdir}"
-					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
+					FREETDS_CFLAGS="-I${includedir}"
+					FREETDS_LIBS="-L${libdir} -ltds"
 					AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
 					;;
 				*v0.60) AC_MSG_RESULT($freetdsvercheck - using v0.60 api)
 					AC_DEFINE(HAVE_FREETDS_VER0_60, 1, [Have freetds v0.60 API])
-					FREETDS_CFLAGS="-I${freetds_incdir}"
-					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
+					FREETDS_CFLAGS="-I${includedir}"
+					FREETDS_LIBS="-L${libdir} -ltds"
 					AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
 					;;
 				*v0.6[[3-9]]*) AC_MSG_RESULT($freetdsvercheck - using v0.63 api)
 					AC_DEFINE(HAVE_FREETDS_VER0_63, 1, [Have freetds v0.63 API])
 					AC_DEFINE(HAVE_FREETDS_VER0_6X, 1, [Have freetds v0.6x API])
-					FREETDS_CFLAGS="-I${freetds_incdir}"
-					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
+					FREETDS_CFLAGS="-I${includedir}"
+					FREETDS_LIBS="-L${libdir} -ltds"
 					AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
 					;;
 				*v0.6*) AC_MSG_RESULT($freetdsvercheck - using v0.6x api)
 					AC_DEFINE(HAVE_FREETDS_VER0_6X, 1, [Have freetds v0.6x API])
-					FREETDS_CFLAGS="-I${freetds_incdir}"
-					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
+					FREETDS_CFLAGS="-I${includedir}"
+					FREETDS_LIBS="-L${libdir} -ltds"
 					AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
 					;;
 				*)	AC_MSG_WARN($freetdsvercheck not supported - backend not used)
@@ -530,8 +530,8 @@
 		AC_MSG_RESULT(found IBM DB2 in $ibmdb2dir)
 		AC_DEFINE(HAVE_IBMDB2, 1, [Have IBM DB2])
 		AC_MSG_WARN(IBM DB2 Provider does not work yet)
-		IBMDB2_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\" -I${ibmdb2dir}/include"
-		IBMDB2_LIBS="-L${ibmdb2dir}/lib -Wl,-rpath,${ibmdb2dir}/lib -ldb2"
+		IBMDB2_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\" -I${includedir}"
+		IBMDB2_LIBS="-L${libdir} -Wl,-rpath,${ibmdb2dir}/lib -ldb2"
 	fi
 fi
 
@@ -584,13 +584,13 @@
 		AC_MSG_WARN(Sybase backend not used)
 	else
 		SYBASE_DIR=${sybasedir}
-		SYBASE_CFLAGS="-I${sybasedir}/include"
+		SYBASE_CFLAGS="-I${includedir}"
 		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}"
+		*linux*) sybase_ctlibs="-L${libdir} -lct -lcs -lsybtcl -lcomn -lintl"
+			sybase_blklibs="-L${libdir} -lblk ${sybase_ctlibs}"
 			SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
 			AC_CHECK_LIB(ct,tdsdump_on,[
 			AC_MSG_WARN(linking against freetds libct)
@@ -712,8 +712,8 @@
 		AC_MSG_WARN(FireBird backend not used)
 	else
 		AC_DEFINE(HAVE_FIREBIRD, 1, [Have FireBird])
-		FIREBIRD_CFLAGS="-I${firebirddir}/include"
-		FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
+		FIREBIRD_CFLAGS="-I${includedir}"
+		FIREBIRD_LIBS="-L${libdir} -lgds -ldl -lcrypt"
 	fi
 fi
 
@@ -750,8 +750,8 @@
 	then
 		AC_MSG_WARN(Xbase backend not used)
 	else
-		XBASE_CFLAGS=-I${xbasedir}/include
-		XBASE_LIBS="-L${xbasedir}/lib -lxbase"
+		XBASE_CFLAGS=-I${includedir}
+		XBASE_LIBS="-L${libdir} -lxbase"
 		AC_DEFINE(HAVE_XBASE, 1, [Have Xbase])
 	fi
 fi
@@ -789,7 +789,7 @@
 	then
 		AC_MSG_WARN(sqlite backend not used)
 	else
-		SQLITE_CFLAGS=-I${sqlitedir}/include
+		SQLITE_CFLAGS=-I${includedir}
 		SQLITE_LIBS="-L${sqlite}/lib -lsqlite3"
 		AC_DEFINE(HAVE_SQLITE, 1, [Have sqlite])
 	fi
@@ -817,7 +817,7 @@
 	mdbdir=""
 	for d in $dir /usr /usr/local /opt/gnome
 	do
-		if test -f $d/include/mdbtools.h -a -f $d/$lib/libmdbsql.so
+		if test -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdbsql.so
 		then
 			AC_MSG_RESULT(found MDB Tools in $d)
 			mdbdir=$d
@@ -828,8 +828,8 @@
 	then
 		AC_MSG_WARN(MDB backend not used)
 	else
-		MDB_CFLAGS=-I${mdbdir}/include
-		MDB_LIBS="-L${mdbdir}/lib -lmdb -lmdbsql"
+		MDB_CFLAGS=-I${includedir}/mdb
+		MDB_LIBS="-L${libdir} -lmdb -lmdbsql"
 		AC_DEFINE(HAVE_MDB, 1, [Have MDB])
 	fi
 fi
@@ -867,8 +867,8 @@
 	then
 		AC_MSG_WARN(LDAP backend not used)
 	else
-		LDAP_CFLAGS="-I${ldapdir}/include"
-		LDAP_LIBS="-L${ldapdir}/lib -lldap -llber"
+		LDAP_CFLAGS="-I${includedir}"
+		LDAP_LIBS="-L${libdir} -lldap -llber"
 		AC_DEFINE(HAVE_LDAP, 1, [Have LDAP])
 	fi
 fi
Commit	Line	Data
47430ed7	1	diff -aurN libgda-1.2.3.orig/configure.in libgda-1.2.3/configure.in
47430ed7	2	--- libgda-1.2.3.orig/configure.in 2005-10-27 11:18:24.000000000 +0200
15c8ba9e	3	+++ libgda-1.2.3/configure.in 2006-08-11 20:01:19.815866962 +0200
47430ed7	4	@@ -149,8 +149,8 @@
47430ed7	5	AC_MSG_WARN(Berkeley DB backend not used)
dc772a6d	6	else
dc772a6d	7	AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
47430ed7	8	- BDB_CFLAGS="-I${bdbdir}/include"
dc772a6d	9	- BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
47430ed7	10	+ BDB_CFLAGS="-I${includedir}"
dc772a6d	11	+ BDB_LIBS="-L${libdir} ${bdblib}"
	12	fi
	13	fi
	14	fi
47430ed7	15	@@ -202,8 +202,8 @@
47430ed7	16	AC_MSG_WARN(ODBC backend not used)
dc772a6d	17	else
dc772a6d	18	AC_DEFINE(HAVE_ODBC, 1, [Have ODBC])
47430ed7	19	- ODBC_CFLAGS="-I${odbcdir}/include"
dc772a6d	20	- ODBC_LIBS="-L${odbcdir}/lib ${odbclib}"
47430ed7	21	+ ODBC_CFLAGS="-I${includedir}"
dc772a6d	22	+ ODBC_LIBS="-L${libdir} ${odbclib}"
	23	fi
	24	fi
	25	fi
47430ed7	26	@@ -259,8 +259,8 @@
47430ed7	27	AC_MSG_WARN(MySQL backend not used)
dc772a6d	28	else
dc772a6d	29	AC_DEFINE(HAVE_MYSQL, 1, [Have MySQL])
47430ed7	30	- MYSQL_CFLAGS="-I${mysqldir}/include${mysqldir_suffix}"
dc772a6d	31	- MYSQL_LIBS="-L${mysqldir}/lib${mysqllibdir_suffix} -lmysqlclient"
47430ed7	32	+ MYSQL_CFLAGS="-I${includedir}${mysqldir_suffix}"
dc772a6d	33	+ MYSQL_LIBS="-L${libdir}${mysqllibdir_suffix} -lmysqlclient"
	34	fi
	35	else
	36	mysqldir=yes
47430ed7	37	@@ -318,11 +318,11 @@
47430ed7	38	AC_MSG_WARN(mSQL backend not used)
dc772a6d	39	else
dc772a6d	40	AC_DEFINE(HAVE_MSQL, 1, [Have mSQL])
47430ed7	41	- MSQL_CFLAGS="-I${msqldir}/include${msqldir_suffix}"
dc772a6d	42	- MSQL_LIBS="-L${msqldir}/lib${msqllibdir_suffix} -lmsql"
47430ed7	43	+ MSQL_CFLAGS="-I${includedir}${msqldir_suffix}"
dc772a6d	44	+ MSQL_LIBS="-L${libdir}${msqllibdir_suffix} -lmsql"
	45	AC_MSG_CHECKING(for mSQL 3.x API)
	46	AC_TRY_RUN([
47430ed7	47	- #include "${msqldir}/include${msqldir_suffix}/msql.h"
	48	+ #include "${includedir}${msqldir_suffix}/msql.h"
	49	int main() {
	50	int rc = INT64_TYPE;
	51	return (rc>0) ? 0 : -1;
	52	@@ -371,26 +371,26 @@
	53	then
	54	AC_MSG_WARN(Postgres backend not used)
	55	else
	56	- if test -f ${postgresdir}/include/libpq-fe.h
	57	+ if test -f ${includedir}/libpq-fe.h
	58	then
	59	- POSTGRES_CFLAGS=-I${postgresdir}/include
	60	- elif test -f ${postgresdir}/include/pgsql/libpq-fe.h
	61	+ POSTGRES_CFLAGS=-I${includedir}
	62	+ elif test -f ${includedir}/pgsql/libpq-fe.h
	63	then
	64	- POSTGRES_CFLAGS=-I${postgresdir}/include/pgsql
	65	- elif test -f ${postgresdir}/include/postgresql/libpq-fe.h
	66	+ POSTGRES_CFLAGS=-I${includedir}/pgsql
	67	+ elif test -f ${includedir}/postgresql/libpq-fe.h
	68	then
	69	- POSTGRES_CFLAGS=-I${postgresdir}/include/postgresql
	70	- elif test -f ${postgresdir}/include/postgresql/8.0/libpq-fe.h
	71	+ POSTGRES_CFLAGS=-I${includedir}/postgresql
	72	+ elif test -f ${includedir}/postgresql/8.0/libpq-fe.h
	73	then
	74	- POSTGRES_CFLAGS=-I${postgresdir}/include/8.0/postgresql
	75	- elif test -f ${postgresdir}/include/postgresql/7.4/libpq-fe.h
	76	+ POSTGRES_CFLAGS=-I${includedir}/8.0/postgresql
	77	+ elif test -f ${includedir}/postgresql/7.4/libpq-fe.h
	78	then
	79	- POSTGRES_CFLAGS=-I${postgresdir}/include/7.4/postgresql
	80	+ POSTGRES_CFLAGS=-I${includedir}/7.4/postgresql
	81	else
	82	AC_MSG_WARN(Postgres include files not found, backend not used)
	83	postgresdir=""
	84	fi
	85	- POSTGRES_LIBS="-L${postgresdir}/lib -lpq"
	86	+ POSTGRES_LIBS="-L${libdir} -lpq"
	87	AC_DEFINE(HAVE_POSTGRES, 1, [Have PostgreSQL])
dc772a6d	88	fi
dc772a6d	89	fi
15c8ba9e	90	@@ -440,7 +440,7 @@
	91	AC_MSG_WARN(tds backend not used)
	92	else
	93	AC_MSG_CHECKING(for freetds version)
	94	- freetdsvercheck="`grep \"^#define \(VERSION_NO \\|TDS_VERSION_NO \)\" $freetds_incdir/tdsver.h\|sed 's\|^."\(.\)"\|\1\|'`"
	95	+ freetdsvercheck="`grep VERSION ${includedir}/tdsver.h \| sed 's\|^."\(.\)"\|\1\|'`"
	96	if test "x$freetdsvercheck" = "x"
	97	then
	98	AC_MSG_WARN(freetds version check failed - backend not used)
47430ed7	99	@@ -450,27 +450,27 @@
47430ed7	100	case "$freetdsvercheck" in
dc772a6d	101	v0.5) AC_MSG_RESULT($freetdsvercheck - using v0.5x api)
dc772a6d	102	AC_DEFINE(HAVE_FREETDS_VER0_5X, 1, [Have freetds v0.5x API])
47430ed7	103	- FREETDS_CFLAGS="-I${freetds_incdir}"
dc772a6d	104	- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
47430ed7	105	+ FREETDS_CFLAGS="-I${includedir}"
dc772a6d	106	+ FREETDS_LIBS="-L${libdir} -ltds"
	107	AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
	108	;;
	109	*v0.60) AC_MSG_RESULT($freetdsvercheck - using v0.60 api)
	110	AC_DEFINE(HAVE_FREETDS_VER0_60, 1, [Have freetds v0.60 API])
47430ed7	111	- FREETDS_CFLAGS="-I${freetds_incdir}"
dc772a6d	112	- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
47430ed7	113	+ FREETDS_CFLAGS="-I${includedir}"
	114	+ FREETDS_LIBS="-L${libdir} -ltds"
	115	AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
	116	;;
	117	v0.6[[3-9]]) AC_MSG_RESULT($freetdsvercheck - using v0.63 api)
	118	AC_DEFINE(HAVE_FREETDS_VER0_63, 1, [Have freetds v0.63 API])
	119	AC_DEFINE(HAVE_FREETDS_VER0_6X, 1, [Have freetds v0.6x API])
	120	- FREETDS_CFLAGS="-I${freetds_incdir}"
	121	- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
	122	+ FREETDS_CFLAGS="-I${includedir}"
dc772a6d	123	+ FREETDS_LIBS="-L${libdir} -ltds"
	124	AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
	125	;;
	126	v0.6) AC_MSG_RESULT($freetdsvercheck - using v0.6x api)
	127	AC_DEFINE(HAVE_FREETDS_VER0_6X, 1, [Have freetds v0.6x API])
47430ed7	128	- FREETDS_CFLAGS="-I${freetds_incdir}"
dc772a6d	129	- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
47430ed7	130	+ FREETDS_CFLAGS="-I${includedir}"
dc772a6d	131	+ FREETDS_LIBS="-L${libdir} -ltds"
	132	AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
	133	;;
	134	*) AC_MSG_WARN($freetdsvercheck not supported - backend not used)
47430ed7	135	@@ -530,8 +530,8 @@
47430ed7	136	AC_MSG_RESULT(found IBM DB2 in $ibmdb2dir)
dc772a6d	137	AC_DEFINE(HAVE_IBMDB2, 1, [Have IBM DB2])
dc772a6d	138	AC_MSG_WARN(IBM DB2 Provider does not work yet)
47430ed7	139	- IBMDB2_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\" -I${ibmdb2dir}/include"
dc772a6d	140	- IBMDB2_LIBS="-L${ibmdb2dir}/lib -Wl,-rpath,${ibmdb2dir}/lib -ldb2"
47430ed7	141	+ IBMDB2_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\" -I${includedir}"
47430ed7	142	+ IBMDB2_LIBS="-L${libdir} -Wl,-rpath,${ibmdb2dir}/lib -ldb2"
dc772a6d	143	fi
	144	fi
	145
47430ed7	146	@@ -584,13 +584,13 @@
	147	AC_MSG_WARN(Sybase backend not used)
	148	else
	149	SYBASE_DIR=${sybasedir}
	150	- SYBASE_CFLAGS="-I${sybasedir}/include"
	151	+ SYBASE_CFLAGS="-I${includedir}"
	152	SYBASE_LIBS="-lnsl -ldl -lm"
dc772a6d	153	AC_MSG_CHECKING(for Sybase host system type)
	154	AC_MSG_RESULT($host)
	155	case "$host" in
	156	- linux) sybase_ctlibs="-L${sybasedir}/lib -lct -lcs -lsybtcl -lcomn -lintl"
	157	- sybase_blklibs="-L${sybasedir}/lib -lblk ${sybase_ctlibs}"
	158	+ linux) sybase_ctlibs="-L${libdir} -lct -lcs -lsybtcl -lcomn -lintl"
	159	+ sybase_blklibs="-L${libdir} -lblk ${sybase_ctlibs}"
	160	SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
	161	AC_CHECK_LIB(ct,tdsdump_on,[
	162	AC_MSG_WARN(linking against freetds libct)
47430ed7	163	@@ -712,8 +712,8 @@
47430ed7	164	AC_MSG_WARN(FireBird backend not used)
dc772a6d	165	else
dc772a6d	166	AC_DEFINE(HAVE_FIREBIRD, 1, [Have FireBird])
47430ed7	167	- FIREBIRD_CFLAGS="-I${firebirddir}/include"
dc772a6d	168	- FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
47430ed7	169	+ FIREBIRD_CFLAGS="-I${includedir}"
dc772a6d	170	+ FIREBIRD_LIBS="-L${libdir} -lgds -ldl -lcrypt"
	171	fi
	172	fi
	173
47430ed7	174	@@ -750,8 +750,8 @@
47430ed7	175	then
dc772a6d	176	AC_MSG_WARN(Xbase backend not used)
dc772a6d	177	else
47430ed7	178	- XBASE_CFLAGS=-I${xbasedir}/include
dc772a6d	179	- XBASE_LIBS="-L${xbasedir}/lib -lxbase"
47430ed7	180	+ XBASE_CFLAGS=-I${includedir}
dc772a6d	181	+ XBASE_LIBS="-L${libdir} -lxbase"
	182	AC_DEFINE(HAVE_XBASE, 1, [Have Xbase])
	183	fi
	184	fi
47430ed7	185	@@ -789,7 +789,7 @@
	186	then
	187	AC_MSG_WARN(sqlite backend not used)
	188	else
	189	- SQLITE_CFLAGS=-I${sqlitedir}/include
	190	+ SQLITE_CFLAGS=-I${includedir}
	191	SQLITE_LIBS="-L${sqlite}/lib -lsqlite3"
	192	AC_DEFINE(HAVE_SQLITE, 1, [Have sqlite])
	193	fi
	194	@@ -817,7 +817,7 @@
dc772a6d	195	mdbdir=""
	196	for d in $dir /usr /usr/local /opt/gnome
	197	do
47430ed7	198	- if test -f $d/include/mdbtools.h -a -f $d/$lib/libmdbsql.so
47430ed7	199	+ if test -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdbsql.so
dc772a6d	200	then
	201	AC_MSG_RESULT(found MDB Tools in $d)
	202	mdbdir=$d
47430ed7	203	@@ -828,8 +828,8 @@
dc772a6d	204	then
	205	AC_MSG_WARN(MDB backend not used)
	206	else
	207	- MDB_CFLAGS=-I${mdbdir}/include
	208	- MDB_LIBS="-L${mdbdir}/lib -lmdb -lmdbsql"
47430ed7	209	+ MDB_CFLAGS=-I${includedir}/mdb
dc772a6d	210	+ MDB_LIBS="-L${libdir} -lmdb -lmdbsql"
	211	AC_DEFINE(HAVE_MDB, 1, [Have MDB])
	212	fi
	213	fi
47430ed7	214	@@ -867,8 +867,8 @@
47430ed7	215	then
dc772a6d	216	AC_MSG_WARN(LDAP backend not used)
dc772a6d	217	else
47430ed7	218	- LDAP_CFLAGS="-I${ldapdir}/include"
dc772a6d	219	- LDAP_LIBS="-L${ldapdir}/lib -lldap -llber"
47430ed7	220	+ LDAP_CFLAGS="-I${includedir}"
dc772a6d	221	+ LDAP_LIBS="-L${libdir} -lldap -llber"
	222	AC_DEFINE(HAVE_LDAP, 1, [Have LDAP])
	223	fi
	224	fi