[gnome-db] patch for gASQL configure.in

[Rodrigo Moya <rodrigo gnome-db org>]

Hi!

Vivien, here's a patch for fixing the gda/gnome-db detection in gASQL.

I haven't been able to test it, since I'm getting a strange error in
libltdl:

checking if the linker (/usr/bin/ld) is GNU ld... (cached) yes
checking for BSD-compatible nm... (cached) /usr/bin/nm -B
checking whether ln -s works... (cached) yes
./../ltconfig: ./../ltconfig: No such file or directory
configure: error: libtool configure failed
configure: error: ./configure failed for libltdl

any idea?

the patch also fixes the Bonobo detection, which was broken, as it was
in libgda/gnome-db (the AM_PATH_BONOBO macro seems to not work anymore).

Can I commit?

cheers
-- 
Rodrigo Moya <rodrigo gnome-db org> - <rodrigo ximian com>
http://www.gnome-db.org/ - http://www.ximian.com/

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gASQL/ChangeLog,v
retrieving revision 1.13
diff -u -r1.13 ChangeLog
--- ChangeLog	2001/09/05 22:14:14	1.13
+++ ChangeLog	2001/11/27 21:51:18
@@ -1,3 +1,8 @@
+11/27/2001
+  * fixed Bonobo check in configure.in. AM_PATH_BONOBO does not seem to
+    work
+  * fixed libgda/gnome-db detection
+
 09/05/2001
   * added checks for LibGlade which is now required
   * fixed various compile warnings
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gASQL/configure.in,v
retrieving revision 1.16
diff -u -r1.16 configure.in
--- configure.in	2001/09/05 22:14:14	1.16
+++ configure.in	2001/11/27 21:51:18
@@ -56,7 +56,25 @@
 dnl
 dnl Check if Bonobo is there
 dnl
-AM_PATH_BONOBO(1.07,,AC_MSG_ERROR(Bonobo >= 1.07 is needed to compile gASQL))
+AC_MSG_CHECKING(for Bonobo >= 1.0.9)
+if gnome-config --libs bonobo > /dev/null 2>&1
+then
+	verstxt=`gnome-config --modversion bonobo`
+	vers=`echo "$verstxt" | sed -e "s/^bonobo-//" | \
+		awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	if test "$vers" -ge 1000009
+	then
+		BONOBO_LIBS=`gnome-config --libs bonobox`
+		BONOBO_CFLAGS=`gnome-config --cflags bonobox`
+		AC_MSG_RESULT(found)
+	else
+		AC_MSG_ERROR([
+		*** Bonobo 1.0.9 or later is necessary to build gASQL.])
+	fi
+else
+	AC_MSG_ERROR([
+		*** Bonobo 1.0.9 or later is necessary to build gASQL.])
+fi
 
 dnl
 dnl Checking for XML
@@ -165,39 +183,11 @@
 			GNOMEDB_LIBS=`${gdbconf} --libs`
 			AC_MSG_RESULT(found)
 			gnomedbdir=`$gdbconf --prefix`
-		fi
-	fi
-fi
-
-dnl see if we find the libs at the right location
-if test x$use_gnomedb = x
-then
-	AC_MSG_CHECKING(for specified gnome-db files)
-	gnomedbdir=""
-	for d in $dir /usr
-	do
-		if test -f $d/lib/libgnomedb.so
-		then
-			AC_MSG_RESULT(found gnome-db in $d)
-			use_gnomedb="Yes"
-			gnomedbdir=$d
-			break
-		fi
-	done
-	if test x$gnomedbdir = x
-	then
-		AC_MSG_WARN(gnome-db not found)
-		use_gnomedb="No"
-	else
-		if test -f ${gnomedbdir}/include/gnome-db/gnome-db.h
-		then
-			GNOMEDB_CFLAGS=-I${gnomedbdir}/include/gnome-db
 		else
-			AC_MSG_WARN(gnome-db include files not found)
-			gnomedbdir=""
 			use_gnomedb="No"
 		fi
-		GNOMEDB_LIBS='-L${gnomedbdir}/lib -lgnomedb -lgnomedbcomponents'
+	else
+		use_gnomedb="No"
 	fi
 fi
 
@@ -240,39 +230,11 @@
 			GDA_LIBS=`${gdaconf} --libs client`
 			AC_MSG_RESULT(found)
 			gdadir=`$gdaconf --prefix`
-		fi
-	fi
-fi
-
-dnl see if we find the libs at the right location
-if test x$use_gda = x
-then
-	AC_MSG_CHECKING(for specified gda files)
-	gdadir=""
-	for d in $dir /usr
-	do
-		if test -f $d/lib/libgda-client.so
-		then
-			AC_MSG_RESULT(found gda in $d)
-			use_gda="Yes"
-			gdadir=$d
-			break
-		fi
-	done
-	if test x$gdadir = x
-	then
-		AC_MSG_WARN(gda not found)
-		use_gda="No"
-	else
-		if test -f ${gnomedbdir}/include/gda/gda.h
-		then
-			GDA_CFLAGSS=-I${gnomedbdir}/include/gda
 		else
-			AC_MSG_WARN(gnome-db include files not found)
-			gdadir=""
 			use_gda="No"
 		fi
-		GDA_LIBS='-L${gdadir}/lib -lgda-common -lgda-client'
+	else
+		use_gda="No"
 	fi
 fi
 
@@ -342,6 +304,8 @@
 AC_SUBST(GNOMEDB_LIBS)
 AC_SUBST(GDA_CFLAGS)
 AC_SUBST(GDA_LIBS)
+AC_SUBST(BONOBO_CFLAGS)
+AC_SUBST(BONOBO_LIBS)
 AC_SUBST(GNOME_XML_CFLAGS)
 AC_SUBST(GNOME_XML_LIBS)
 AC_SUBST(CFLAGS)