o removed waywars #endif

[asdcplib.git] / m4 / ax_lib_xerces.m4

diff --git a/m4/ax_lib_xerces.m4 b/m4/ax_lib_xerces.m4
index 737e31f3649b321446329a3c4ac04aad625b829f..a83a6d0da97d18602905809b6d3c5515d79ecd9d 100644 (file)
--- a/m4/ax_lib_xerces.m4
+++ b/m4/ax_lib_xerces.m4
@@ -73,14 +73,17 @@ AC_DEFUN([AX_LIB_XERCES],
         fi
         ],
         [
-        dnl Default behavior is implicit yes
-        if test -d /usr/local/include/xercesc ; then
-            xerces_prefix=/usr/local
-        elif test -d /usr/include/xercesc ; then
-            xerces_prefix=/usr
-        else
-            xerces_prefix=""
-        fi
+#        dnl Default behavior is implicit yes
+#        if test -d /usr/local/include/xercesc ; then
+#            xerces_prefix=/usr/local
+#        elif test -d /usr/include/xercesc ; then
+#            xerces_prefix=/usr
+#        else
+#            xerces_prefix=""
+#        fi
+        dnl Default behavior is implicit no
+        xerces_prefix=""
+        xerces_requested="no"
         ]
     )
 
@@ -133,7 +136,7 @@ AC_DEFUN([AX_LIB_XERCES],
         CPPFLAGS="$CPPFLAGS -I$xerces_include_dir -I$xerces_include_dir2"
 
         saved_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS $xerces_ldflags $PTHREAD_LDFLAGS"
+        LDFLAGS="$xerces_ldflags $PTHREAD_LDFLAGS $LDFLAGS"
 
         saved_LIBS="$LIBS"
         LIBS="$xerces_libs $PTHREAD_LIBS $LIBS"
@@ -288,6 +291,7 @@ XMLPlatformUtils::Initialize();
         fi
     fi
     if test "$HAVE_XERCES" = "yes"; then
-        CPPFLAGS="$CPPFLAGS -DHAVE_XERCES_C=1"
+        CPPFLAGS="$CPPFLAGS $XERCES_CPPFLAGS -DHAVE_XERCES_C=1"
+        LDFLAGS="$LDFLAGS $XERCES_LDFLAGS $XERCES_LIBS"
     fi
 ])