[Merge conflict resolved]

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

diff --git a/configure.ac b/configure.ac
index c7d40e8..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
@@ -63,6 +65,8 @@ VMIN=v_min
 AC_SUBST(VMAJ)
 AC_SUBST(VMIN)
 
+VERSION="1.0.0"
+
 EDJE_VERSION="1.0.0"
 
 case "$host_os" in
@@ -205,6 +209,28 @@ if test "x$want_elementary_x" = "xyes" -a "x$have_elementary_x" = "xno"; then
     AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config.])
 fi
 
+have_conformant_autoscroll="no"
+want_conformant_autoscroll="yes"
+AC_ARG_ENABLE([ecore-x],
+   [AC_HELP_STRING([--disable-ecore-x], [disable ecore-x support. @<:@default=detect@:>@])],
+   [want_conformant_autoscroll=$enableval], [])
+
+if test "x$want_conformant_autoscroll" != "xno"; then
+   PKG_CHECK_MODULES([ELEMENTARY_X],
+      [ecore-x >= 1.0.0],
+      [
+       AC_DEFINE(HAVE_CONFORMANT_AUTOSCROLL, 1, [autoscroll with conformant])
+       have_conformant_autoscroll="yes"
+       requirement_elm="ecore-x >= 1.0.0 ${requirement_elm}"
+      ],
+      [have_conformant_autoscroll="no"]
+   )
+else
+    have_conformant_autoscroll="no"
+fi
+if test "x$want_conformant_autoscroll" = "xyes" -a "x$have_conformant_autoscroll" = "xno"; then
+    AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config.])
+fi
 
 have_elementary_fb="no"
 want_elementary_fb="auto"
@@ -385,34 +411,6 @@ if test "x$want_elementary_eweather" = "xyes" -a "x$have_elementary_eweather" =
 fi
 AC_SUBST(ELM_EWEATHER_DEF)
 
-ELM_EWEBKIT_DEF="#undef"
-have_elementary_ewebkit="no"
-want_elementary_ewebkit="auto"
-AC_ARG_ENABLE([ewebkit],
-   [AC_HELP_STRING([--disable-ewebkit], [disable ewebkit support. @<:@default=detect@:>@])],
-   [want_elementary_ewebkit=$enableval], [])
-
-if test "x$want_elementary_ewebkit" != "xno"; then
-    PKG_CHECK_MODULES([ELEMENTARY_EWEBKIT],
-       [
-        ewebkit
-       ],
-       [
-        AC_DEFINE(HAVE_ELEMENTARY_EWEBKIT, 1, [EWebKit support for Elementary])
-        have_elementary_ewebkit="yes"
-        ELM_EWEBKIT_DEF="#define"
-        requirement_elm="ewebkit ${requirement_elm}"
-       ],
-       [have_elementary_ewebkit="no"]
-    )
-else
-    have_elementary_ewebkit="no"
-fi
-if test "x$want_elementary_ewebkit" = "xyes" -a "x$have_elementary_ewebkit" = "xno"; then
-    AC_MSG_ERROR([EWebKit support requested, but no ewebkit found by pkg-config.])
-fi
-AC_SUBST(ELM_EWEBKIT_DEF)
-
 ELM_ETHUMB_DEF="#undef"
 have_elementary_ethumb="no"
 want_elementary_ethumb="auto"
@@ -441,6 +439,45 @@ 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],
+   [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"])
 AC_SUBST(ELM_ALLOCA_H_DEF)
@@ -449,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)
@@ -470,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
@@ -483,6 +531,7 @@ config/Makefile
 config/default/Makefile
 config/standard/Makefile
 config/illume/Makefile
+config/slp/Makefile
 ])
 
 #####################################################################
@@ -509,7 +558,7 @@ echo "    EDBus..............: ${have_elementary_edbus}"
 echo "    EFreet.............: ${have_elementary_efreet}"
 echo "    EWeather...........: ${have_elementary_eweather}"
 echo "    Ethumb.............: ${have_elementary_ethumb}"
-echo "    EWebKit............: ${have_elementary_ewebkit}"
+echo "    Xml2...............: ${have_elementary_libxml2}"
 echo
 echo "  eet..................: ${eet_eet}"
 echo "  edje_cc..............: ${edje_cc}"