[els_webview]set initial zoom ratio in the load,started callback

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

diff --git a/configure.ac b/configure.ac
index 440ea68..4bcf7e8 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -180,17 +180,6 @@ PKG_CHECK_MODULES([ELEMENTARY],
    ]
 )
 
-AC_ARG_WITH(eet-eet,
-[  --with-eet-eet=PATH              specify a specific path to eet utility],
-[
-  v=$withval;
-  eet_eet=$v
-  echo "  Elementary eet explicitly set to "$eet_eet;
-],[
-  eet_eet=$(pkg-config --variable=prefix eet)/bin/eet
-])
-AC_SUBST(eet_eet)
-        
 requirement_elm="edje >= ${EDJE_VERSION} 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}"
 
 have_elementary_x="no"
@@ -216,6 +205,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"
@@ -460,21 +471,13 @@ ELM_LIBINTL_H_DEF="#undef"
 AC_CHECK_HEADER(libintl.h, [ELM_LIBINTL_H_DEF="#define"])
 AC_SUBST(ELM_LIBINTL_H_DEF)
 
-AC_ARG_WITH(edje-cc,
-[  --with-edje-cc=PATH              specify a specific path to edje_cc],
-[
-  v=$withval;
-  edje_cc=$v
-  echo "  Elementary edje_cc explicitly set to "$edje_cc;
-],[
-  edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
-])
-AC_SUBST(edje_cc)
-
 my_libs="-lm"
 AC_SUBST(my_libs)
 AC_SUBST(requirement_elm)
 
+EFL_WITH_BIN([eet], [eet-eet], [eet])
+EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
+
 EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 
 AC_OUTPUT([
@@ -530,6 +533,7 @@ echo "    EWeather...........: ${have_elementary_eweather}"
 echo "    Ethumb.............: ${have_elementary_ethumb}"
 echo "    EWebKit............: ${have_elementary_ewebkit}"
 echo
+echo "  eet..................: ${eet_eet}"
 echo "  edje_cc..............: ${edje_cc}"
 echo
 echo "Compilation............: make (or gmake)"