SOURCES (gda-1_2): libgda-configure.patch - fix dirs

freetz freetz at pld-linux.org
Fri Aug 11 19:48:15 CEST 2006


Author: freetz                       Date: Fri Aug 11 17:48:15 2006 GMT
Module: SOURCES                       Tag: gda-1_2
---- Log message:
- fix dirs

---- Files affected:
SOURCES:
   libgda-configure.patch (1.3 -> 1.3.6.1) 

---- Diffs:

================================================================
Index: SOURCES/libgda-configure.patch
diff -u SOURCES/libgda-configure.patch:1.3 SOURCES/libgda-configure.patch:1.3.6.1
--- SOURCES/libgda-configure.patch:1.3	Thu Mar 23 20:31:54 2006
+++ SOURCES/libgda-configure.patch	Fri Aug 11 19:48:10 2006
@@ -1,84 +1,146 @@
-diff -aurN libgda-1.9.100.orig/configure.in libgda-1.9.100/configure.in
---- libgda-1.9.100.orig/configure.in	2005-10-09 18:21:20.000000000 +0200
-+++ libgda-1.9.100/configure.in	2006-03-23 20:26:26.969415960 +0100
-@@ -160,7 +160,7 @@
+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 19:42:10.602573938 +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_CFLAGS="-I${bdbdir}/include"
 -			BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
++			BDB_CFLAGS="-I${includedir}"
 +			BDB_LIBS="-L${libdir} ${bdblib}"
  		fi
  	fi
  fi
-@@ -213,7 +213,7 @@
+@@ -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_CFLAGS="-I${odbcdir}/include"
 -			ODBC_LIBS="-L${odbcdir}/lib ${odbclib}"
++			ODBC_CFLAGS="-I${includedir}"
 +			ODBC_LIBS="-L${libdir} ${odbclib}"
  		fi
  	fi
  fi
-@@ -270,7 +270,7 @@
+@@ -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_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
-@@ -329,7 +329,7 @@
+@@ -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_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"
-@@ -395,7 +395,7 @@
- 			AC_MSG_WARN(Postgres include files not found, backend not used)
- 			postgresdir=""
+-                  #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
--		POSTGRES_LIBS="-L${postgresdir}/lib -lpq"
-+		POSTGRES_LIBS="-L${libdir} -lpq"
- 		AC_DEFINE(HAVE_POSTGRES, 1, [Have PostgreSQL])
  	fi
- fi
-@@ -455,19 +455,19 @@
+@@ -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_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_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_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)
-@@ -528,7 +528,7 @@
+@@ -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_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\" -I${ibmdb2dir}/include"
 -		IBMDB2_LIBS="-L${ibmdb2dir}/lib -Wl,-rpath,${ibmdb2dir}/lib -ldb2"
-+		IBMDB2_LIBS="-L${libdir} -Wl,-rpath,${libdir} -ldb2"
++		IBMDB2_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\" -I${includedir}"
++		IBMDB2_LIBS="-L${libdir} -Wl,-rpath,${ibmdb2dir}/lib -ldb2"
  	fi
  fi
  
-@@ -586,8 +586,8 @@
+@@ -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
@@ -89,58 +151,64 @@
  			SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
  			AC_CHECK_LIB(ct,tdsdump_on,[
  			AC_MSG_WARN(linking against freetds libct)
-@@ -672,7 +672,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="-L${libdir} -lm -ldl -lclntsh"
- 	fi
- fi
- 
-@@ -710,7 +710,7 @@
+@@ -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_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
  
-@@ -748,7 +748,7 @@
+@@ -750,8 +750,8 @@
+ 	then
  		AC_MSG_WARN(Xbase backend not used)
  	else
- 		XBASE_CFLAGS=-I${xbasedir}/include
+-		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
-@@ -778,7 +778,7 @@
+@@ -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 -o -f $d/include/mdbtools.h -a -f $d/$lib/libmdbsql
-+		if test -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdbsql.so -o -f $d/include/mdb/mmdbtools.h -a -f $d/$lib/libmdbsql
+-		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
-@@ -789,8 +789,8 @@
+@@ -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${mdbdir}/include/mdb
++		MDB_CFLAGS=-I${includedir}/mdb
 +		MDB_LIBS="-L${libdir} -lmdb -lmdbsql"
  		AC_DEFINE(HAVE_MDB, 1, [Have MDB])
  	fi
  fi
-@@ -829,7 +829,7 @@
+@@ -867,8 +867,8 @@
+ 	then
  		AC_MSG_WARN(LDAP backend not used)
  	else
- 		LDAP_CFLAGS="-I${ldapdir}/include"
+-		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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libgda-configure.patch?r1=1.3&r2=1.3.6.1&f=u



More information about the pld-cvs-commit mailing list