packages: libgda4/libgda4-configure.patch - updated for 4.2.0

[megabajt]

Author: megabajt                     Date: Wed Nov  3 21:29:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 4.2.0

---- Files affected:
packages/libgda4:
   libgda4-configure.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/libgda4/libgda4-configure.patch
diff -u packages/libgda4/libgda4-configure.patch:1.1 packages/libgda4/libgda4-configure.patch:1.2
--- packages/libgda4/libgda4-configure.patch:1.1	Mon Mar  9 17:40:46 2009
+++ packages/libgda4/libgda4-configure.patch	Wed Nov  3 22:28:56 2010
@@ -1,7 +1,7 @@
-diff -urN libgda-3.99.12/configure.in libgda-3.99.12.new/configure.in
---- libgda-3.99.12/configure.in	2009-02-18 21:29:06.000000000 +0100
-+++ libgda-3.99.12.new/configure.in	2009-03-08 15:50:56.000000000 +0100
-@@ -416,7 +416,7 @@
+diff -urN libgda-4.2.0/configure.ac libgda-4.2.0.new//configure.ac
+--- libgda-4.2.0/configure.ac	2010-09-26 20:52:03.000000000 +0200
++++ libgda-4.2.0.new//configure.ac	2010-10-01 18:30:53.182115395 +0200
+@@ -627,7 +627,7 @@
  	else
  		AC_DEFINE(HAVE_ODBC, 1, [Have ODBC])
  		ODBC_CFLAGS="-I${odbcdir}/include"
@@ -10,7 +10,7 @@
  	fi
  fi
  
-@@ -648,7 +648,7 @@
+@@ -861,7 +861,7 @@
  		AC_MSG_WARN(tds backend not used)
  	else
  		AC_MSG_CHECKING(for freetds version)
@@ -19,7 +19,7 @@
  		if test "x$freetdsvercheck" = "x"
  		then
  			AC_MSG_WARN(freetds version check failed - backend not used)
-@@ -657,7 +657,7 @@
+@@ -870,7 +870,7 @@
  		else
  			AC_MSG_RESULT($freetdsvercheck)
  			FREETDS_CFLAGS="-I${freetds_incdir}"
@@ -28,7 +28,7 @@
  			AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
  
  			freetds_version_major="`echo $freetdsvercheck|sed 's:^\([[^.]]*\).*:\1:'`"
-@@ -789,13 +789,11 @@
+@@ -1002,13 +1002,11 @@
  	else
  		SYBASE_DIR=${sybasedir}
  		SYBASE_CFLAGS="-I${sybasedir}/include"
@@ -44,27 +44,7 @@
  			AC_CHECK_LIB(ct,tdsdump_on,[
  			AC_MSG_WARN(linking against freetds libct)
  			AC_DEFINE(HAVE_SYBASE, 1, [Have Sybase])
-@@ -992,7 +990,7 @@
- 	mdbdir=""
- 	for d in $dir /usr /usr/local /opt/gnome
- 	do
--		if test -f $d/include/mdbtools.h -a -f $d/$lib/libmdb$linklibext -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$linklibext -o -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdb.a
- 		then
- 			AC_MSG_RESULT(found MDB Tools in $d)
- 			mdbdir=$d
-@@ -1003,8 +1001,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"
-@@ -1083,7 +1081,7 @@
+@@ -1229,7 +1227,7 @@
  		AC_MSG_WARN(LDAP backend not used)
  	else
  		LDAP_CFLAGS="-I${ldapdir}/include"
@@ -73,3 +53,26 @@
  		AC_DEFINE(HAVE_LDAP, 1, [Have LDAP])
  	fi
  fi
+diff -urN libgda-4.2.0/m4/mdbtools.m4 libgda-4.2.0.new//m4/mdbtools.m4
+--- libgda-4.2.0/m4/mdbtools.m4	2010-09-24 22:07:47.000000000 +0200
++++ libgda-4.2.0.new//m4/mdbtools.m4	2010-10-01 18:32:05.105428163 +0200
+@@ -118,7 +118,7 @@
+ 	    for d in $mdb_test_dir
+ 	    do
+ 	        AC_MSG_CHECKING([for MDB Tools files in $d])
+-	        if test -f $d/include/mdbtools.h -a -f $d/$mdb_loclibdir/libmdb$mdb_libext -o -f $d/include/mdbtools.h -a -f $d/$mdb_loclibdir/libmdb.a
++	        if test -f $d/include/mdb/mdbtools.h -a -f $d/$mdb_loclibdir/libmdb$mdb_libext -o -f $d/include/mdb/mdbtools.h -a -f $d/$mdb_loclibdir/libmdb.a
+ 	        then
+   	            save_CFLAGS="$CFLAGS"
+ 	            CFLAGS="$CFLAGS -I$d/include $mdb_glib_cflags"
+@@ -137,8 +137,8 @@
+ 	            if test x$mdbdir != x
+ 		    then
+ 		        AC_MSG_RESULT([found])
+-			MDB_CFLAGS=-I${mdbdir}/include
+-	    		MDB_LIBS="-L${mdbdir}/lib -lmdb"
++			MDB_CFLAGS=-I${mdbdir}/include/mdb
++	    		MDB_LIBS="-lmdb"
+ 		        break
+   		    else
+ 		        AC_MSG_RESULT([not found])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgda4/libgda4-configure.patch?r1=1.1&r2=1.2&f=u