r15101 - gnucash/branches/gda-dev - Use pkg-config in configure.in to set CFLAGS and LIBS for libgda.

Phil Longstaff plongstaff at cvs.gnucash.org
Thu Nov 9 09:13:48 EST 2006


Author: plongstaff
Date: 2006-11-09 09:13:46 -0500 (Thu, 09 Nov 2006)
New Revision: 15101
Trac: http://svn.gnucash.org/trac/changeset/15101

Modified:
   gnucash/branches/gda-dev/configure.in
   gnucash/branches/gda-dev/src/backend/gda/Makefile.am
Log:
Use pkg-config in configure.in to set CFLAGS and LIBS for libgda.
Doesn't test properly for existence of libgda package yet.



Modified: gnucash/branches/gda-dev/configure.in
===================================================================
--- gnucash/branches/gda-dev/configure.in	2006-11-09 02:05:06 UTC (rev 15100)
+++ gnucash/branches/gda-dev/configure.in	2006-11-09 14:13:46 UTC (rev 15101)
@@ -536,6 +536,12 @@
 
 AC_DEFINE(QOF_DISABLE_DEPRECATED,1, [Don't use deprecated qof functions])
 
+### -----------------------
+### LIBGDA
+LIBGDA_LIBS=`$PKG_CONFIG --silence-errors --libs libgda-2.0`
+LIBGDA_CFLAGS=`$PKG_CONFIG --silence-errors --cflags libgda-2.0`
+AC_SUBST(LIBGDA_LIBS)
+AC_SUBST(LIBGDA_CFLAGS)
 ### --------------------------------------------------------------------------
 ### Variables
 ### Set up all the initial variable values...

Modified: gnucash/branches/gda-dev/src/backend/gda/Makefile.am
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/Makefile.am	2006-11-09 02:05:06 UTC (rev 15100)
+++ gnucash/branches/gda-dev/src/backend/gda/Makefile.am	2006-11-09 14:13:46 UTC (rev 15101)
@@ -3,8 +3,6 @@
 # Now a shared library AND a GModule
 lib_LTLIBRARIES = libgnc-backend-gda.la
 
-LIBGDA_DIR = /opt/libgda-1.99.1
-
 AM_CFLAGS = \
   -I.. -I../.. \
   -DLOCALE_DIR=\""$(datadir)/locale"\" \
@@ -15,7 +13,7 @@
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GCONF_CFLAGS} \
-  -I/usr/include/libxml2 -I$(LIBGDA_DIR)/include/libgda-1.99
+  ${LIBGDA_CFLAGS}
 
 libgnc_backend_gda_la_SOURCES = \
   gnc-backend-gda.c \
@@ -43,4 +41,4 @@
 
 libgnc_backend_gda_la_LDFLAGS = -module -avoid-version
 libgnc_backend_gda_la_LIBADD = \
-	-L$(LIBGDA_DIR)/lib -lgda-3 -lgda_handlers-3 -lgda_sql_delimiter-3 -lglib-2.0 -lxslt -lxml2 -lz -lm
+	${LIBGDA_LIBS}



More information about the gnucash-changes mailing list