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

[Julien 'Ainulindale' Cassignol]

The following commit has been merged in the upstream branch:
commit 7a39a094bc4388220cda18da70b1ff9887c088b7
Author: Julien 'Ainulindale' Cassignol <ainulindale at gmail.com>
Date:   Tue Nov 25 15:46:31 2008 +0100

    Revert "Add sqlite3 use"
    This reverts commit eb52376ce43c7fb488f7165a407f3c50858cdfd3.
    
    Commit wasn't working, and not complete. Please ask for review before commiting on that kind of package.

diff --git a/ophonekitd/configure.ac b/ophonekitd/configure.ac
index 7ff8ca8..f63e6ec 100644
--- a/ophonekitd/configure.ac
+++ b/ophonekitd/configure.ac
@@ -14,7 +14,6 @@ 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)
@@ -22,8 +21,6 @@ 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 24efedb..164c0a7 100644
--- a/ophonekitd/src/Makefile.am
+++ b/ophonekitd/src/Makefile.am
@@ -6,21 +6,17 @@ ophonekitd_SOURCES = \
 	ophonekitd-main.c \
 	ophonekitd-main.h \
 	ophonekitd-phonegui.c \
-	ophonekitd-phonegui.h \
-	ophonekitd-phonelog.c \
-	ophonekitd-phonelog.h
+	ophonekitd-phonegui.h
 
 ophonekitd_CFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	@DBUS_GLIB_CFLAGS@ \
 	@FRAMEWORKD_GLIB_CFLAGS@ \
-	@FRAMEWORKD_PHONEGUI_LIBS@ \
-	@SQLITE_LIBS@
+	@FRAMEWORKD_PHONEGUI_LIBS@
 
 ophonekitd_LDFLAGS = \
 	-ldl \
 	@DBUS_GLIB_LIBS@ \
 	@FRAMEWORKD_GLIB_LIBS@ \
-	@FRAMEWORKD_PHONEGUI_LIBS@ \
-	@SQLITE_LIBS@
+	@FRAMEWORKD_PHONEGUI_LIBS@

-- 
libframeworkd-phonegui