[src/lib/elm_button.c] Fix for the Text updation in Button for various states.

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

diff --git a/configure.ac b/configure.ac
index 440ea68..adcb39e 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,8 @@ VMIN=v_min
 AC_SUBST(VMAJ)
 AC_SUBST(VMIN)
 
+VERSION="1.0.0"
+
 EDJE_VERSION="1.0.0"
 
 case "$host_os" in
@@ -180,17 +182,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 +207,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"
@@ -396,34 +409,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"
@@ -452,6 +437,34 @@ 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], [])
+
+if test "x$want_elementary_libxml2" != "xno"; then
+    PKG_CHECK_MODULES([ELEMENTARY_LIBXML2],
+       [
+        libxml-2.0
+       ],
+       [
+        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}"
+       ],
+       [have_elementary_libxml2="no"]
+    )
+else
+    have_elementary_libxml2="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.])
+fi
+AC_SUBST(ELM_LIBXML2_DEF)
+
 ELM_ALLOCA_H_DEF="#undef"
 AC_CHECK_HEADER(alloca.h, [ELM_ALLOCA_H_DEF="#define"])
 AC_SUBST(ELM_ALLOCA_H_DEF)
@@ -460,21 +473,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([
@@ -497,6 +502,7 @@ data/themes/Makefile
 data/images/Makefile
 data/objects/Makefile
 data/desktop/Makefile
+data/xmls/Makefile
 data/edje_externals/Makefile
 config/Makefile
 config/default/Makefile
@@ -529,7 +535,9 @@ 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}"
 echo
 echo "Compilation............: make (or gmake)"