Remove db-util dependency

Change-Id: I446cbe96c6776bc74baba7f5e2561a557abd34e8
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 7eb32e1..aa806f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,11 +20,11 @@ COMMON_CFLAGS = -I${srcdir}/lib/include \
                $(GLIB_CFLAGS) \
                $(GTHREAD_CFLAGS) \
                $(DLOG_CFLAGS) \
+               $(SQLITE3_CFLAGS) \
                $(INIPARSER_CFLAGS) \
                $(LIBPMCONTROL_CFLAGS) \
                $(LIBSYSTEMDLOGIN_CFLAGS) \
                $(SECURITY_CFLAGS) \
-               $(DB_UTIL_CFLAGS) \
                $(SYSTEM_INFO_CFLAGS) \
                $(SMACK_CFLAGS) \
                $(USB_DEVICE_CFLAGS) \
@@ -35,11 +35,11 @@ COMMON_LDADD =      libmedia-utils.la \
                $(GLIB_LIBS) \
                $(GTHREAD_LIBS) \
                $(DLOG_LIBS) \
+               $(SQLITE3_LIBS) \
                $(INIPARSER_LIBS) \
                $(LIBPMCONTROL_LIBS) \
                $(LIBSYSTEMDLOGIN_LIBS) \
                $(SECURITY_LIBS) \
-               $(DB_UTIL_LIBS) \
                $(SYSTEM_INFO_LIBS) \
                $(SYSTEM_DEVICE_LIBS) \
                $(SMACK_LIBS) \
@@ -70,7 +70,6 @@ libmedia_utils_la_CFLAGS = -I${srcdir}/lib/include \
                              $(DLOG_CFLAGS) \
                              $(GIO_CFLAGS) \
                              $(SQLITE3_CFLAGS) \
-                             $(DB_UTIL_CFLAGS) \
                              $(PHONESTATUS_CFLAGS) \
                              $(TZ_PLATFORM_CONFIG_CFLAGS) \
                              $(LIBSMACK_CFLAGS) \
@@ -83,7 +82,6 @@ libmedia_utils_la_LIBADD  =   $(GLIB_LIBS) \
                               $(DLOG_LIBS) \
                              $(GIO_LIBS) \
                              $(SQLITE3_LIBS) \
-                             $(DB_UTIL_LIBS) \
                              $(PHONESTATUS_LIBS) \
                              $(TZ_PLATFORM_CONFIG_LIBS) \
                              $(LIBSMACK_LIBS) \
@@ -113,11 +111,12 @@ media_server_SOURCES = src/common/media-common-utils.c \
                        src/server/media-server-main.c
 
 media_server_CFLAGS = -I${srcdir}/src/server/include \
+                       $(SQLITE3_CFLAGS) \
                        $(COMMON_CFLAGS) \
                         $(PHONESTATUS_CFLAGS) \
                         $(SYSTEM_INFO_CFLAGS)
 
-media_server_CFLAGS += $(SQLITE3_CFLAGS) \
+media_server_CFLAGS += $(SECURITY_CFLAGS) \
                                           $(USB_DEVICE_CFLAGS) \
                                           $(POWER_DEFS_CFLAGS) \
                                           $(POWER_TV_CFLAGS)
@@ -126,7 +125,8 @@ media_server_CFLAGS += -fPIE
 
 media_server_LDFLAGS = -pie
 
-media_server_LDADD = $(COMMON_LDADD) \
+media_server_LDADD = $(SQLITE3_LIBS) \
+                    $(COMMON_LDADD) \
                     $(PHONESTATUS_LIBS) \
                     $(SYSTEM_INFO_LIBS)
 
@@ -196,7 +196,6 @@ mediadb_update_CFLAGS = -I${srcdir}/lib/include \
                         -D_FILE_OFFSET_BITS=64 \
                        $(GTHREAD_CFLAGS) \
                        $(SQLITE3_CFLAGS) \
-                       $(DB_UTIL_CFLAGS) \
                        $(GLIB_CFLAGS) \
                        $(GIO_CFLAGS)
 
@@ -207,7 +206,6 @@ mediadb_update_LDFLAGS = -pie
 mediadb_update_LDADD = libmedia-utils.la \
                        $(GLIB_LIBS) \
                        $(SQLITE3_LIBS) \
-                       $(DB_UTIL_LIBS) \
                        $(GTHREAD_LIBS) \
                        $(GIO_LIBS) \
                        -ldl

diff --git a/configure.ac b/configure.ac
index 23b803e..329f102 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-#                                               -*- Autoconf -*-
+
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
@@ -75,14 +75,10 @@ PKG_CHECK_MODULES(GIO, gio-2.0)
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
-PKG_CHECK_MODULES(SQLITE, sqlite3)
+PKG_CHECK_MODULES(SQLITE3, sqlite3)
 AC_SUBST(SQLITE3_CFLAGS)
 AC_SUBST(SQLITE3_LIBS)
 
-PKG_CHECK_MODULES(DB_UTIL, db-util)
-AC_SUBST(DB_UTIL_CFLAGS)
-AC_SUBST(DB_UTIL_LIBS)
-
 PKG_CHECK_MODULES(INIPARSER, iniparser)
 AC_SUBST(INIPARSER_CFLAGS)
 AC_SUBST(INIPARSER_LIBS)

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index 333969e..2ebbbd7 100755 (executable)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -20,7 +20,6 @@
  */
 
 #include <unistd.h>
-#include <db-util.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/smack.h>
@@ -71,9 +70,9 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
 
        /*Connect DB*/
        if (need_write)
-               ret = db_util_open_with_options(db_path, db_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
+               ret = sqlite3_open_v2(db_path, db_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
        else
-               ret = db_util_open_with_options(db_path, db_handle, SQLITE_OPEN_READONLY, NULL);
+               ret = sqlite3_open_v2(db_path, db_handle, SQLITE_OPEN_READONLY, NULL);
 
 
        if (SQLITE_OK != ret) {
@@ -95,7 +94,7 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
                if (*db_handle)
                        MSAPI_DBG_ERR("[error when register busy handler] %s", sqlite3_errmsg(*db_handle));
 
-               db_util_close(*db_handle);
+               sqlite3_close_v2(*db_handle);
                *db_handle = NULL;
 
                return MS_MEDIA_ERR_DB_CONNECT_FAIL;
@@ -109,7 +108,7 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
                if (*db_handle)
                        MSAPI_DBG_ERR("[error when change the journal mode] %s", sqlite3_errmsg(*db_handle));
 
-               db_util_close(*db_handle);
+               sqlite3_close_v2(*db_handle);
                *db_handle = NULL;
 
                if (ret == SQLITE_CORRUPT) {
@@ -427,7 +426,7 @@ int media_db_disconnect(sqlite3 *handle)
 
        MSAPI_RETVM_IF(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
 
-       ret = db_util_close(handle);
+       ret = sqlite3_close_v2(handle);
        if (SQLITE_OK != ret) {
                MSAPI_DBG_ERR("error when db close [%s]", sqlite3_errmsg(handle));
                handle = NULL;

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index b1291c7..c8772c3 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -16,7 +16,6 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(libsystemd-login)