diff options
| author | msheby <msheby@cinecert.com> | 2008-04-30 01:09:32 +0000 |
|---|---|---|
| committer | msheby <> | 2008-04-30 01:09:32 +0000 |
| commit | f9e0c5ce1dbb77e1a4a2f2f3bc39176326dd3786 (patch) | |
| tree | 44e0a4837e648400da34b9bd222a6d81de0aefa3 | |
| parent | 903233deb3cfe02661768d84b513d51596441007 (diff) | |
Make neither expat nor xerces-c default.
(That is, use --with-expat or --with-xerces)
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | m4/ax_lib_expat.m4 | 19 | ||||
| -rw-r--r-- | m4/ax_lib_xerces.m4 | 19 |
3 files changed, 23 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 3583b00..c6b02fa 100644 --- 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 c93680b..90bd1b4 100644 --- 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 737e31f..dfc38e1 100644 --- 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" ] ) |