Merge "[elm_searchbar]: cancel,clicked signal sent at end."

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

diff --git a/configure.ac b/configure.ac
old mode 100644 (file)
new mode 100755 (executable)
index 6ea6a99..38fa434
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,7 @@ dnl managed by evil
       have_socket="yes"
       ;;
 esac
+AC_CHECK_FUNCS(strcasestr, AC_DEFINE(HAVE_STRCASESTR))
 AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"])
 
 m4_ifdef([v_mic],
@@ -215,9 +216,19 @@ PKG_CHECK_MODULES([ELEMENTARY],
     ecore-file >= 1.0.0
     ecore-imf >= 1.0.0
     edje >= 1.0.999
+    icu-i18n >= 4.6.0
    ]
 )
 
+PKG_CHECK_MODULES([ECORE_CON],
+       [ecore-con],
+       [
+        have_ecore_con="yes"
+        AC_DEFINE(HAVE_ECORE_CON, 1, [Use Ecore_Con for downloding files])
+        requirement_elm="ecore-con ${requirement_elm}"
+       ],
+       [have_ecore_con="no"])
+
 PKG_CHECK_MODULES([EIO],
        [eio],
        [
@@ -229,7 +240,18 @@ PKG_CHECK_MODULES([EIO],
 
 AM_CONDITIONAL([HAVE_EIO], [test "x${have_eio}" = "xyes"])
 
-requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}"
+PKG_CHECK_MODULES([EMOTION],
+       [emotion],
+       [
+        have_emotion="yes"
+        AC_DEFINE(HAVE_EMOTION, 1, [Use Emotion for asynchronous file access])
+        requirement_elm="emotion ${requirement_elm}"
+       ],
+       [have_emotion="no"])
+
+AM_CONDITIONAL([HAVE_EMOTION], [test "x${have_emotion}" = "xyes"])
+
+requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 icu-i18n >= 4.6.0 ${requirement_elm}"
 
 have_elementary_x="no"
 want_elementary_x="auto"
@@ -254,6 +276,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"
@@ -564,6 +608,9 @@ 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
 src/examples/Makefile
 data/Makefile
@@ -576,6 +623,7 @@ config/Makefile
 config/default/Makefile
 config/standard/Makefile
 config/illume/Makefile
+config/slp/Makefile
 $po_makefile_in
 ])
 
@@ -605,7 +653,8 @@ echo "    EWeather...............: ${have_elementary_eweather}"
 echo "    EMap...................: ${have_elementary_emap}"
 echo "    Ethumb.................: ${have_elementary_ethumb}"
 echo "    Quick Launch...........: ${have_fork}"
-echo "    eio....................: ${have_eio}"
+echo "    EIO....................: ${have_eio}"
+echo "    Emotion................: ${have_emotion}"
 echo
 echo "  eet......................: ${eet_eet}"
 echo "  edje_cc..................: ${edje_cc}"