Make neither expat nor xerces-c default.

(That is, use --with-expat or --with-xerces)

diff --git a/configure.ac b/configure.ac
index 3583b007aa96ae7274518002108b8129975f990a..c6b02fa337849eb064ee72c0ecff110857bce728 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ fi
 
 CHECK_SSL
 AX_LIB_EXPAT
+AX_LIB_XERCES
 #AM_PATH_PYTHON([2.3], , [:])
 AZ_PYTHON_DEFAULT
 AZ_PYTHON_WITH

diff --git a/m4/ax_lib_expat.m4 b/m4/ax_lib_expat.m4
index c93680b77aeaceed1463d87d1fc94ceb6978228e..90bd1b4a6173e37921538601126714beb767a217 100644 (file)
--- a/m4/ax_lib_expat.m4
+++ b/m4/ax_lib_expat.m4
@@ -70,14 +70,17 @@ AC_DEFUN([AX_LIB_EXPAT],
         fi
         ],
         [
-        dnl Default behavior is implicit yes
-        if test -f /usr/local/include/expat.h ; then
-            expat_prefix=/usr/local
-        elif test -f /usr/include/expat.h ; then
-            expat_prefix=/usr
-        else
-            expat_prefix=""
-        fi
+#        dnl Default behavior is implicit yes
+#        if test -f /usr/local/include/expat.h ; then
+#            expat_prefix=/usr/local
+#        elif test -f /usr/include/expat.h ; then
+#            expat_prefix=/usr
+#        else
+#            expat_prefix=""
+#        fi
+        dnl Default behavior is implicit no
+        expat_prefix=""
+        expat_requested="no"
         ]
     )
 

diff --git a/m4/ax_lib_xerces.m4 b/m4/ax_lib_xerces.m4
index 737e31f3649b321446329a3c4ac04aad625b829f..dfc38e1d9938fac8f86d7f344a384d26a59d1f5a 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"
         ]
     )