SOURCES: libgda3-configure.patch - 3.1.2 - dropped mdb patch (no l...

[patrys]

Author: patrys                       Date: Thu Oct 25 10:27:44 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 3.1.2
- dropped mdb patch (no longer relevant)
- dropped firebird patch (seems applied in another form)
- libgda-virtual.so seems to have disappeared

---- Files affected:
SOURCES:
   libgda3-configure.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/libgda3-configure.patch
diff -u SOURCES/libgda3-configure.patch:1.1 SOURCES/libgda3-configure.patch:1.2
--- SOURCES/libgda3-configure.patch:1.1	Thu May 31 00:05:55 2007
+++ SOURCES/libgda3-configure.patch	Thu Oct 25 12:27:39 2007
@@ -92,15 +92,23 @@
  	fi
  fi
  
-@@ -751,7 +751,7 @@
- 	else
- 		AC_DEFINE(HAVE_FIREBIRD, 1, [Have FireBird])
+@@ -823,13 +823,13 @@
  		FIREBIRD_CFLAGS="-I${firebirddir}/include"
--		FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
-+		FIREBIRD_LIBS="-L${libdir} -lgds -ldl -lcrypt"
+ 		if test -f $firebirddir/lib/libfbembed.so
+ 		then
+-			FIREBIRD_LIBS="-L${firebirddir}/lib -lfbembed"
++			FIREBIRD_LIBS="-L${libdir} -lfbembed"
+ 		else
+ 			if test -f $firebirddir/lib/libfbclient.so
+ 			then
+-				FIREBIRD_LIBS="-L${firebirddir}/lib -lfbclient"
++				FIREBIRD_LIBS="-L${libdir} -lfbclient"
+ 			else
+-				FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
++				FIREBIRD_LIBS="-L${libdir} -lgds -ldl -lcrypt"
+ 			fi
+ 		fi
  	fi
- fi
- 
 @@ -789,7 +789,7 @@
  		AC_MSG_WARN(Xbase backend not used)
  	else
@@ -114,8 +122,8 @@
  	mdbdir=""
  	for d in $dir /usr /usr/local /opt/gnome
  	do
--		if test -f $d/include/mdbtools.h -a -f $d/$lib/libmdbsql$libext -o -f $d/include/mdbtools.h -a -f $d/$lib/libmdbsql.a
-+		if test -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdbsql$libext -o -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdbsql.a
+-		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$libext -o -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdb.a
  		then
  			AC_MSG_RESULT(found MDB Tools in $d)
  			mdbdir=$d
@@ -124,9 +132,9 @@
  		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_LIBS="-L${libdir} -lmdb -lmdbsql"
+-		MDB_LIBS="-L${mdbdir}/lib -lmdb"
++		MDB_LIBS="-L${libdir} -lmdb"
  		AC_DEFINE(HAVE_MDB, 1, [Have MDB])
  
  		save_CFLAGS="$CFLAGS"
================================================================

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