--- configure.in.orig	2006-04-12 00:28:52 +0400
+++ configure.in	2006-05-17 15:06:07 +0400
@@ -118,9 +118,10 @@
 dnl **************************************************************
 
 GDA_REQUIRED=1.2.0
+GDA_PACKAGE=libgda-2.0
 AC_MSG_CHECKING(for GDA)
-LIBGDA_CFLAGS=`$PKG_CONFIG --silence-errors --cflags "libgda >= $GDA_REQUIRED"`
-LIBGDA_LIBS=`$PKG_CONFIG --silence-errors --libs "libgda >= $GDA_REQUIRED"`
+LIBGDA_CFLAGS=`$PKG_CONFIG --silence-errors --cflags "$GDA_PACKAGE >= $GDA_REQUIRED"`
+LIBGDA_LIBS=`$PKG_CONFIG --silence-errors --libs "$GDA_PACKAGE >= $GDA_REQUIRED"`
 AC_SUBST(LIBGDA_CFLAGS)
 AC_SUBST(LIBGDA_LIBS)
 if test "x$LIBGDA_LIBS" = x; then
@@ -129,10 +130,10 @@
 	SQL_PKG_LIB="-lqofsql"
 	AC_SUBST(LIBQOFSQL_LIBRARY_VERSION)
 else
-    GDA_VERSION=`$PKG_CONFIG --modversion libgda`
+    GDA_VERSION=`$PKG_CONFIG --modversion $GDA_PACKAGE`
     AC_MSG_RESULT([yes, using GDA: ${GDA_VERSION}])
     AC_DEFINE(HAVE_GDA,,[We have found GDA])
-	GDA_PKG_LIB="-lgda-2"
+  	GDA_PKG_LIB="-lgda-2 -lgdasql"
     HAVE_GDA="use_gda"
 	AC_SUBST(GDA_VERSION)
 fi


--- Makefile.am.orig	2006-03-25 20:18:32 +0300
+++ backend/file/Makefile.am	2006-03-25 20:17:42 +0300
@@ -18,6 +18,7 @@
 libqof_backend_qsf_la_LDFLAGS = -version-info $(LIBQOF_BACKEND_QSF_LIBRARY_VERSION)
 
 libqof_backend_qsf_la_LIBADD = \
+  ${top_builddir}/qof/libqof.la \
   ${LIBXML2_LIBS} \
   ${GLIB_LIBS}
 

--- Makefile.am.orig	2006-06-20 15:40:16 +0400
+++ Makefile.am	2006-12-29 00:41:28 +0300
@@ -1,6 +1,6 @@
-SUBDIRS = lib backend qof . po doc
+SUBDIRS = lib qof backend . po doc
 
-DIST_SUBDIRS = lib backend qof . po doc
+DIST_SUBDIRS = lib qof backend . po doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = qof-1.pc

--- configure.in.orig	2006-05-17 16:22:06 +0400
+++ configure.in	2006-05-17 16:22:40 +0400
@@ -122,8 +122,6 @@
 AC_MSG_CHECKING(for GDA)
 LIBGDA_CFLAGS=`$PKG_CONFIG --silence-errors --cflags "$GDA_PACKAGE >= $GDA_REQUIRED"`
 LIBGDA_LIBS=`$PKG_CONFIG --silence-errors --libs "$GDA_PACKAGE >= $GDA_REQUIRED"`
-AC_SUBST(LIBGDA_CFLAGS)
-AC_SUBST(LIBGDA_LIBS)
 if test "x$LIBGDA_LIBS" = x; then
   AC_MSG_RESULT([No, GDA not found; will build using internal SQL library.])
 	LIBQOFSQL_LIBRARY_VERSION=1:1:0
@@ -133,10 +131,12 @@
     GDA_VERSION=`$PKG_CONFIG --modversion $GDA_PACKAGE`
     AC_MSG_RESULT([yes, using GDA: ${GDA_VERSION}])
     AC_DEFINE(HAVE_GDA,,[We have found GDA])
-  	GDA_PKG_LIB="-lgda-2 -lgdasql"
+  	LIBGDA_LIBS="$LIBGDA_LIBS -lgdasql"
     HAVE_GDA="use_gda"
 	AC_SUBST(GDA_VERSION)
 fi
+AC_SUBST(LIBGDA_CFLAGS)
+AC_SUBST(LIBGDA_LIBS)
 
 AM_CONDITIONAL(USE_LIBGDA, [ test x"$HAVE_GDA" != x])
 AM_CONDITIONAL(USE_LIBGDA, [ test "$HAVE_GDA" = "use_gda"])

--- qof/qofsql.c.orig	2006-08-29 13:36:12 +0400
+++ qof/qofsql.c	2006-12-29 00:47:25 +0300
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include "glib.h"
 #ifdef HAVE_GDA
-#include <sql/sql_parser.h>
+#include <libsql/sql_parser.h>
 #else
 #include "sql_parser.h"
 #endif

--- backend/sqlite/Makefile.am.orig	2006-08-29 15:41:09 +0400
+++ backend/sqlite/Makefile.am	2006-12-29 00:50:26 +0300
@@ -15,6 +15,7 @@
  -version-info $(LIBQOF_BACKEND_QSQL_VERSION)
 
 libqof_backend_sqlite_la_LIBADD = \
+ ${top_builddir}/qof/libqof.la \
  ${GLIB_LIBS} \
  ${sqlite_LIBS}