[pkg-fso-commits] [SCM] libframeworkd-phonegui branch, upstream, updated. 640da47bfcff755388d0fb8f443eb34e0dea3c72

[Didier 'Ptitjes]

The following commit has been merged in the upstream branch:
commit eb52376ce43c7fb488f7165a407f3c50858cdfd3
Author: Didier 'Ptitjes <ptitjes at free.fr>
Date:   Tue Nov 25 11:30:46 2008 +0100

    Add sqlite3 use
    Signed-off-by: Didier 'Ptitjes <ptitjes at free.fr>

diff --git a/ophonekitd/configure.ac b/ophonekitd/configure.ac
index f63e6ec..7ff8ca8 100644
--- a/ophonekitd/configure.ac
+++ b/ophonekitd/configure.ac
@@ -14,6 +14,7 @@ AC_HEADER_STDC
 PKG_CHECK_MODULES(FRAMEWORKD_GLIB, libframeworkd-glib)
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
 PKG_CHECK_MODULES(FRAMEWORKD_PHONEGUI, libframeworkd-phonegui)
+PKG_CHECK_MODULES(SQLITE, sqlite3)
 
 AC_SUBST(DBUS_GLIB_CFLAGS)
 AC_SUBST(DBUS_GLIB_LIBS)
@@ -21,6 +22,8 @@ AC_SUBST(FRAMEWORKD_GLIB_CFLAGS)
 AC_SUBST(FRAMEWORKD_GLIB_LIBS)
 AC_SUBST(FRAMEWORKD_PHONEGUI_CFLAGS)
 AC_SUBST(FRAMEWORKD_PHONEGUI_LIBS)
+AC_SUBST(SQLITE_CFLAGS)
+AC_SUBST(SQLITE_LIBS)
 
 AC_OUTPUT([
 Makefile
diff --git a/ophonekitd/src/Makefile.am b/ophonekitd/src/Makefile.am
index 164c0a7..24efedb 100644
--- a/ophonekitd/src/Makefile.am
+++ b/ophonekitd/src/Makefile.am
@@ -6,17 +6,21 @@ ophonekitd_SOURCES = \
 	ophonekitd-main.c \
 	ophonekitd-main.h \
 	ophonekitd-phonegui.c \
-	ophonekitd-phonegui.h
+	ophonekitd-phonegui.h \
+	ophonekitd-phonelog.c \
+	ophonekitd-phonelog.h
 
 ophonekitd_CFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	@DBUS_GLIB_CFLAGS@ \
 	@FRAMEWORKD_GLIB_CFLAGS@ \
-	@FRAMEWORKD_PHONEGUI_LIBS@
+	@FRAMEWORKD_PHONEGUI_LIBS@ \
+	@SQLITE_LIBS@
 
 ophonekitd_LDFLAGS = \
 	-ldl \
 	@DBUS_GLIB_LIBS@ \
 	@FRAMEWORKD_GLIB_LIBS@ \
-	@FRAMEWORKD_PHONEGUI_LIBS@
+	@FRAMEWORKD_PHONEGUI_LIBS@ \
+	@SQLITE_LIBS@

-- 
libframeworkd-phonegui