ICU package dependency is removed from elementary.

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

diff --git a/configure.ac b/configure.ac
old mode 100644 (file)
new mode 100755 (executable)
index 3d4f5c2..45c83ab
--- 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],
@@ -222,13 +223,11 @@ PKG_CHECK_MODULES([ECORE_CON],
        [ecore-con],
        [
         have_ecore_con="yes"
-        AC_DEFINE(HAVE_ECORE_CON, 1, [Use Ecore_Con for connections])
+        AC_DEFINE(HAVE_ECORE_CON, 1, [Use Ecore_Con for downloding files])
         requirement_elm="ecore-con ${requirement_elm}"
        ],
        [have_ecore_con="no"])
 
-AM_CONDITIONAL([HAVE_ECORE_CON], [test "x${have_ecore_con}" = "xyes"])
-
 PKG_CHECK_MODULES([EIO],
        [eio],
        [
@@ -276,6 +275,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"
@@ -586,6 +607,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
@@ -598,6 +622,7 @@ config/Makefile
 config/default/Makefile
 config/standard/Makefile
 config/illume/Makefile
+config/slp/Makefile
 $po_makefile_in
 ])