[Merge conflict resolved]

[framework/uifw/elementary.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d89d471..fcfbb5a 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -326,7 +326,7 @@ fi
 
 ELM_EDBUS_DEF="#undef"
 have_elementary_edbus="no"
-want_elementary_edbus="no"
+want_elementary_edbus="auto"
 AC_ARG_ENABLE([edbus],
    [AC_HELP_STRING([--disable-edbus], [disable edbus support. @<:@default=detect@:>@])],
    [want_elementary_edbus=$enableval], [])
@@ -355,7 +355,7 @@ AC_SUBST(ELM_EDBUS_DEF)
 
 ELM_EFREET_DEF="#undef"
 have_elementary_efreet="no"
-want_elementary_efreet="no"
+want_elementary_efreet="auto"
 AC_ARG_ENABLE([efreet],
    [AC_HELP_STRING([--disable-efreet], [disable efreet support. @<:@default=detect@:>@])],
    [want_elementary_efreet=$enableval], [])
@@ -439,6 +439,33 @@ if test "x$want_elementary_ethumb" = "xyes" -a "x$have_elementary_ethumb" = "xno
 fi
 AC_SUBST(ELM_ETHUMB_DEF)
 
+ELM_SQLITE3_DEF="#undef"
+have_elementary_sqlite3="no"
+want_elementary_sqlite3="auto"
+AC_ARG_ENABLE([sqlite3],
+   [AC_HELP_STRING([--disable-sqlite3], [disable sqlite3 support. @<:@default=detect@:>@])],
+   [want_elementary_sqlite3=$enableval], [])
+
+if test "x$want_elementary_sqlite3" != "xno"; then
+    PKG_CHECK_MODULES([ELEMENTARY_SQLITE3],
+       [
+        sqlite3
+       ],
+       [
+        AC_DEFINE(HAVE_ELEMENTARY_SQLITE3, 1, [sqlite3 support for Elementary])
+        have_elementary_sqlite3="yes"
+        ELM_SQLITE3_DEF="#define"
+        requirement_elm="sqlite3 ${requirement_elm}"
+       ],
+       [have_elementary_sqlite3="no"]
+    )
+else
+    have_elementary_sqlite3="no"
+fi
+if test "x$want_elementary_sqlite3" = "xyes" -a "x$have_elementary_sqlite3" = "xno"; then
+    AC_MSG_ERROR(sqlite3 support requested, but no sqlite3 found by pkg-config.])
+fi
+
 ELM_DEBUG_DEF="#undef"
 want_elementary_debug="no"
 AC_ARG_ENABLE([debug],
@@ -459,6 +486,15 @@ ELM_LIBINTL_H_DEF="#undef"
 AC_CHECK_HEADER(libintl.h, [ELM_LIBINTL_H_DEF="#define"])
 AC_SUBST(ELM_LIBINTL_H_DEF)
 
+EFL_CHECK_THREADS([
+  TH=1
+] , [
+  AC_MSG_ERROR(no thread support found. required.)
+  exit 1
+])
+AC_SUBST(EFL_PTHREAD_CFLAGS)
+AC_SUBST(EFL_PTHREAD_LIBS)
+
 my_libs="-lm"
 AC_SUBST(my_libs)
 AC_SUBST(requirement_elm)