[svn] commit: r916 - in /branches/each-ds: configure.ac src/bin/auth/Makefile.am

[BIND 10 source code commits]

Author: jreed
Date: Mon Feb 22 23:32:10 2010
New Revision: 916

Log:
Find the sqlite3 header and library by using pkgconfig sqlite3.pc file.

Modified:
    branches/each-ds/configure.ac
    branches/each-ds/src/bin/auth/Makefile.am

Modified: branches/each-ds/configure.ac
==============================================================================
--- branches/each-ds/configure.ac (original)
+++ branches/each-ds/configure.ac Mon Feb 22 23:32:10 2010
@@ -136,6 +136,8 @@
 AC_SUBST(GTEST_LDFLAGS)
 AC_SUBST(GTEST_LDADD)
 
+PKG_CHECK_MODULES(SQLITE, sqlite3)
+
 # Checks for library functions.
 
 AC_CONFIG_FILES([Makefile

Modified: branches/each-ds/src/bin/auth/Makefile.am
==============================================================================
--- branches/each-ds/src/bin/auth/Makefile.am (original)
+++ branches/each-ds/src/bin/auth/Makefile.am Mon Feb 22 23:32:10 2010
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
+AM_CXXFLAGS = -I$(top_builddir)/include -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext $(SQLITE_CFLAGS)
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
@@ -12,7 +12,7 @@
 b10_auth_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
 b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
 b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
-b10_auth_LDADD += -lsqlite3
+b10_auth_LDADD += $(SQLITE_LIBS)
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
 # and can't use @datadir@ because doesn't expand default ${prefix}