[Merge conflict resolved]

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

diff --git a/configure.ac b/configure.ac
index 8ce4ecb..fcfbb5a 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,8 @@ AM_INIT_AUTOMAKE([1.6 dist-bzip2])
 AM_CONFIG_HEADER([elementary_config.h])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+AC_GNU_SOURCE
+
 AC_C_BIGENDIAN
 AC_ISC_POSIX
 AC_PROG_CC
@@ -437,33 +439,44 @@ if test "x$want_elementary_ethumb" = "xyes" -a "x$have_elementary_ethumb" = "xno
 fi
 AC_SUBST(ELM_ETHUMB_DEF)
 
-ELM_LIBXML2_DEF="#undef"
-have_elementary_libxml2="no"
-want_elementary_libxml2="auto"
-AC_ARG_ENABLE([libxml-2.0],
-   [AC_HELP_STRING([--disable-libxml-2.0], [disable libxml-2.0 support. @<:@default=detect@:>@])],
-   [want_elementary_libxml2=$enableval], [])
+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_libxml2" != "xno"; then
-    PKG_CHECK_MODULES([ELEMENTARY_LIBXML2],
+if test "x$want_elementary_sqlite3" != "xno"; then
+    PKG_CHECK_MODULES([ELEMENTARY_SQLITE3],
        [
-        libxml-2.0
+        sqlite3
        ],
        [
-        AC_DEFINE(HAVE_ELEMENTARY_LIBXML2, 1, [Libxml-2.0 support for Elementary])
-        have_elementary_libxml2="yes"
-        ELM_ETHUMB_DEF="#define"
-        requirement_elm="libxml-2.0 ${requirement_elm}"
+        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_libxml2="no"]
+       [have_elementary_sqlite3="no"]
     )
 else
-    have_elementary_libxml2="no"
+    have_elementary_sqlite3="no"
 fi
-if test "x$want_elementary_libxml2" = "xyes" -a "x$have_elementary_libxml2" = "xno"; then
-    AC_MSG_ERROR(Libxml-2.0 support requested, but no libxml-2.0 found by pkg-config.])
+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
-AC_SUBST(ELM_LIBXML2_DEF)
+
+ELM_DEBUG_DEF="#undef"
+want_elementary_debug="no"
+AC_ARG_ENABLE([debug],
+   [AC_HELP_STRING([--enable-debug], [enable elementary debug support. @<:@default=disabled@:>@])],
+   [want_elementary_debug=$enableval], [])
+
+if test "x$want_elementary_debug" = "xyes"; then
+        AC_DEFINE(HAVE_ELEMENTARY_DEBUG, 1, [Elementary debug.])
+        ELM_DEBUG_DEF="#define"
+fi
+AC_SUBST(ELM_DEBUG_DEF)
 
 ELM_ALLOCA_H_DEF="#undef"
 AC_CHECK_HEADER(alloca.h, [ELM_ALLOCA_H_DEF="#define"])
@@ -473,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)
@@ -494,7 +516,9 @@ src/lib/Elementary.h
 src/bin/Makefile
 src/modules/Makefile
 src/modules/test_entry/Makefile
+src/modules/test_map/Makefile
 src/modules/ctxpopup_copypasteUI/Makefile
+src/modules/ctxpopup_copypasteshareUI/Makefile
 src/modules/popup_copypasteUI/Makefile
 src/edje_externals/Makefile
 data/Makefile
@@ -502,12 +526,12 @@ data/themes/Makefile
 data/images/Makefile
 data/objects/Makefile
 data/desktop/Makefile
-data/xmls/Makefile
 data/edje_externals/Makefile
 config/Makefile
 config/default/Makefile
 config/standard/Makefile
 config/illume/Makefile
+config/slp/Makefile
 ])
 
 #####################################################################