You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/09/10 17:09:54 UTC

[28/48] git commit: fixed checking for xml parser

fixed checking for xml parser


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f7c09fd0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f7c09fd0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f7c09fd0

Branch: refs/heads/5.0.x
Commit: f7c09fd0a74df178d9a7dfb1d564229bbbc8237f
Parents: 9a7e6ca
Author: Bryan Call <bc...@apache.org>
Authored: Fri Sep 6 15:53:12 2013 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Sep 6 15:53:12 2013 -0700

----------------------------------------------------------------------
 build/xml.m4 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f7c09fd0/build/xml.m4
----------------------------------------------------------------------
diff --git a/build/xml.m4 b/build/xml.m4
index fc342a9..d4b4356 100644
--- a/build/xml.m4
+++ b/build/xml.m4
@@ -30,14 +30,15 @@ AC_DEFUN([TS_CHECK_XML], [
       TS_CHECK_XML_EXPAT
     elif test "$withval" = "libxml2" ; then
       TS_CHECK_XML_LIBXML2
-    elif test "x$withval" = "x" ; then
-      TS_CHECK_XML_LIBXML2
-      if test "$enable_xml" = "no"; then
-        TS_CHECK_XML_EXPAT
-      fi
     else
       AC_MSG_ERROR([Unrecognised --with-xml option])
     fi
+  ],
+  [
+    TS_CHECK_XML_LIBXML2
+    if test "$enable_xml" = "no"; then
+      TS_CHECK_XML_EXPAT
+    fi
   ])
   if test "$enable_xml" = "no"; then
     AC_MSG_ERROR([An XML parser (expat or libxml2) is required.])