[Patch Rollback] Rollbacked below patch.
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Fri, 8 Oct 2010 11:38:23 +0000 (20:38 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Fri, 8 Oct 2010 11:38:23 +0000 (20:38 +0900)
commit fa1a0b4902a4b91d47fbb45387234cc59f5b6848
Author: Daniel Juyung Seo <juyung.seo@samsung.com>
Date:   Fri Oct 8 17:21:36 2010 +0900
    [Patch] Applied Mike's patch. Changes from xml-2.0 to xml2.

configure.ac

index 485d167..b012fc1 100755 (executable)
@@ -438,30 +438,30 @@ fi
 AC_SUBST(ELM_ETHUMB_DEF)
 
 ELM_LIBXML2_DEF="#undef"
-have_elementary_libxml2="no"
-want_elementary_libxml2="auto"
-AC_ARG_ENABLE([libxml2],
-   [AC_HELP_STRING([--disable-libxml2], [disable libxml2 support. @<:@default=detect@:>@])],
-   [want_elementary_libxml2=$enableval], [])
+have_elementary_libxml-2.0="no"
+want_elementary_libxml-2.0="auto"
+AC_ARG_ENABLE([libxml-2.0],
+   [AC_HELP_STRING([--disable-libxml-2.0], [disable libxml-2.0 support. @<:@default=detect@:>@])],
+   [want_elementary_libxml-2.0=$enableval], [])
 
-if test "x$want_elementary_libxml2" != "xno"; then
+if test "x$want_elementary_libxml-2.0" != "xno"; then
     PKG_CHECK_MODULES([ELEMENTARY_LIBXML2],
        [
-        libxml2
+        libxml-2.0
        ],
        [
-        AC_DEFINE(HAVE_ELEMENTARY_LIBXML2, 1, [Libxml2 support for Elementary])
-        have_elementary_libxml2="yes"
+        AC_DEFINE(HAVE_ELEMENTARY_LIBXML2, 1, [Libxml-2.0 support for Elementary])
+        have_elementary_libxml-2.0="yes"
         ELM_ETHUMB_DEF="#define"
-        requirement_elm="libxml2 ${requirement_elm}"
+        requirement_elm="libxml-2.0 ${requirement_elm}"
        ],
-       [have_elementary_libxml2="no"]
+       [have_elementary_libxml-2.0="no"]
     )
 else
-    have_elementary_libxml2="no"
+    have_elementary_libxml-2.0="no"
 fi
-if test "x$want_elementary_libxml2" = "xyes" -a "x$have_elementary_libxml2" = "xno"; then
-    AC_MSG_ERROR(Libxml2 support requested, but no libxml2 found by pkg-config.])
+if test "x$want_elementary_libxml-2.0" = "xyes" -a "x$have_elementary_libxml-2.0" = "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)
 
@@ -535,7 +535,7 @@ 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 "    Xml2...............: ${have_elementary_libxml-2.0}"
 echo
 echo "  eet..................: ${eet_eet}"
 echo "  edje_cc..............: ${edje_cc}"