From 775a6ff854262ad0456c947107ee2ac151df72d2 Mon Sep 17 00:00:00 2001
From: dinesh
Date: Thu, 8 Nov 2012 02:46:51 +0000
Subject: Committed patch from Alex Mantaut for issue AXIS2C-1606. Patch uses
 parser wrapper as it should be, build with --enable-libxml2 and
 --disable-guththila options on svn head. Everything compiled fine. Thanks
 Alex for the patch.

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1406900 13f79535-47bb-0310-9956-ffa450edef68
---
 neethi/configure.ac     | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 neethi/test/Makefile.am |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/neethi/configure.ac b/neethi/configure.ac
index 4f20d36..688f53d 100644
--- a/neethi/configure.ac
+++ b/neethi/configure.ac
@@ -62,6 +62,52 @@ AC_ARG_ENABLE(werror, [  --disable-werror        do not treat warnings as errors
   esac ],
 )
 
+AC_MSG_CHECKING(whether to build guththila xml parser library)
+AC_ARG_ENABLE(guththila, [  --enable-guththila
+                          build Guththila XML parser library wrapper (default=yes)],
+[ case "${enableval}" in
+  no)
+    AC_MSG_RESULT(no)
+    guththilla_enabled=no
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    guththilla_enabled=yes
+    ;;
+  esac ], [
+  AC_MSG_RESULT(yes)
+  guththilla_enabled=yes
+])
+
+AS_IF([test $guththilla_enabled = yes], [
+  CFLAGS="$CFLAGS -DAXIS2_GUTHTHILA_ENABLED"
+  CPPFLAGS="$CPPFLAGS -DAXIS2_GUTHTHILA_ENABLED"
+  WRAPPER_DIR="guththila"
+  AC_CONFIG_SUBDIRS(guththila)
+  GUTHTHILA_LIBS="/guththila/src/"
+  GUTHTHILA_DIR="guththila"
+])
+AS_UNSET(guththilla_enabled)
+
+AC_MSG_CHECKING(whether to build libxml2 xml parser library)
+AC_ARG_ENABLE(libxml2, [  --enable-libxml2    
+                          build Libxml2 XML parser library wrapper (default=no)],
+[ case "${enableval}" in
+  no)
+    AC_MSG_RESULT(no)
+    WRAPPER_DIR=""
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    WRAPPER_DIR="libxml2"
+    PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
+    CFLAGS="$CFLAGS -DAXIS2_LIBXML2_ENABLED"
+    CPPFLAGS="$CPPFLAGS $PARSER_CFLAGS -DAXIS2_LIBXML2_ENABLED"
+    LDFLAGS="$LDFLAGS $PARSER_LIBS"
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -84,7 +130,9 @@ dnl AC_FUNC_REALLOC
 VERSION_NO="7:0:7"
 
 AC_SUBST(VERSION_NO)
+AC_SUBST(WRAPPER_DIR)
 
+export WRAPPER_DIR
 
 AC_CONFIG_FILES([Makefile \
     src/Makefile \
diff --git a/neethi/test/Makefile.am b/neethi/test/Makefile.am
index 8a3ebad..4a2f4e0 100644
--- a/neethi/test/Makefile.am
+++ b/neethi/test/Makefile.am
@@ -24,6 +24,6 @@ INCLUDES = -I$(top_builddir)/include \
 
 test_LDADD = $(top_builddir)/src/libneethi.la \
 			../../axiom/src/om/libaxis2_axiom.la \
-			../../axiom/src/parser/guththila/libaxis2_parser.la \
+			../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
 			../../util/src/libaxutil.la \
 			../src/libneethi.la
-- 
cgit v1.1-32-gdbae