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

[Didier 'Ptitjes]

The following commit has been merged in the upstream branch:
commit 2dd434e9a5934a99a7816f70e38dbb49f21c959a
Author: Didier 'Ptitjes <ptitjes at free.fr>
Date:   Sat Dec 6 12:26:00 2008 +0100

    Setup sqlite3 dependency again
    Signed-off-by: Didier 'Ptitjes <ptitjes at free.fr>

diff --git a/ophonekitd/configure.ac b/ophonekitd/configure.ac
index 0c5ef10..2d7b206 100644
--- a/ophonekitd/configure.ac
+++ b/ophonekitd/configure.ac
@@ -15,6 +15,7 @@ PKG_CHECK_MODULES(FRAMEWORKD_GLIB, libframeworkd-glib)
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
 PKG_CHECK_MODULES(DBUS, dbus-1 glib-2.0 gthread-2.0)
 PKG_CHECK_MODULES(FRAMEWORKD_PHONEGUI, libframeworkd-phonegui)
+PKG_CHECK_MODULES(SQLITE, sqlite3)
 
 AC_SUBST(DBUS_GLIB_CFLAGS)
 AC_SUBST(DBUS_GLIB_LIBS)
@@ -24,6 +25,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_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool)
 AC_SUBST(DBUSBINDINGTOOL)
diff --git a/ophonekitd/src/Makefile.am b/ophonekitd/src/Makefile.am
index 4c02fb8..d28775a 100644
--- a/ophonekitd/src/Makefile.am
+++ b/ophonekitd/src/Makefile.am
@@ -14,6 +14,8 @@ ophonekitd_SOURCES = $(dbus_sources) \
 	ophonekitd-main.h \
 	ophonekitd-phonegui.c \
 	ophonekitd-phonegui.h \
+	ophonekitd-phonelog.c \
+	ophonekitd-phonelog.h \
 	ophonekitd-dbus-usage.c \
 	ophonekitd-dbus-usage.h \
 	ophonekitd-dbus.c \
@@ -25,11 +27,13 @@ ophonekitd_CFLAGS = \
 	@DBUS_GLIB_CFLAGS@ \
 	@DBUS_CFLAGS@ \
 	@FRAMEWORKD_GLIB_CFLAGS@ \
-	@FRAMEWORKD_PHONEGUI_LIBS@ -ggdb
+	@FRAMEWORKD_PHONEGUI_LIBS@  \
+	@SQLITE_LIBS@ -ggdb
 
 ophonekitd_LDFLAGS = \
 	-ldl \
 	@DBUS_GLIB_LIBS@ \
 	@DBUS_LIBS@ \
 	@FRAMEWORKD_GLIB_LIBS@ \
-	@FRAMEWORKD_PHONEGUI_LIBS@
+	@FRAMEWORKD_PHONEGUI_LIBS@ \
+	@SQLITE_LIBS@

-- 
libframeworkd-phonegui