github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 11:44:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2.5.x changes to trunk.

Browse Source
This commit is contained in:
b1v1r
2009-05-31 08:45:50 +00:00
parent 12b9bcd33a
commit e5becf8407
9 changed files with 240 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apache2/build/find_xml.m4
View File

@@ -12,9 +12,9 @@ AC_DEFUN([CHECK_LIBXML2],
[dnl
AC_ARG_WITH(
xml,
[AC_HELP_STRING([--with-xml=PATH],[Path to xml prefix or config script])],
[test_paths="${with_xml}"],
libxml,
[AC_HELP_STRING([--with-libxml=PATH],[Path to libxml2 prefix or config script])],
[test_paths="${with_libxml}"],
[test_paths="/usr/local/libxml2 /usr/local/xml2 /usr/local/xml /usr/local /opt/libxml2 /opt/libxml /opt/xml2 /opt/xml /opt /usr"])
AC_MSG_CHECKING([for libxml2 config script])
@@ -23,31 +23,31 @@ for x in ${test_paths}; do
dnl # Determine if the script was specified and use it directly
if test ! -d "$x" -a -e "$x"; then
LIBXML2_CONFIG="`basename $x`"
xml_path=`echo $x | sed "s/\/\?${LIBXML2_CONFIG}\$//"`
libxml2_path=`echo $x | sed "s/\/\?${LIBXML2_CONFIG}\$//"`
break
fi
dnl # Try known config script names/locations
for LIBXML2_CONFIG in xml2-config xml-2-config xml-config; do
if test -e "${x}/bin/${LIBXML2_CONFIG}"; then
xml_path="${x}/bin"
libxml2_path="${x}/bin"
break
elif test -e "${x}/${LIBXML2_CONFIG}"; then
xml_path="${x}"
libxml2_path="${x}"
break
else
xml_path=""
libxml2_path=""
fi
done
if test -n "$xml_path"; then
if test -n "$libxml2_path"; then
break
fi
done
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
if test -n "${xml_path}"; then
LIBXML2_CONFIG="${xml_path}/${LIBXML2_CONFIG}"
if test -n "${libxml2_path}"; then
LIBXML2_CONFIG="${libxml2_path}/${LIBXML2_CONFIG}"
AC_MSG_RESULT([${LIBXML2_CONFIG}])
LIBXML2_CFLAGS="`${LIBXML2_CONFIG} --cflags`"
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(xml CFLAGS: $LIBXML2_CFLAGS); fi
@@ -64,9 +64,9 @@ AC_SUBST(LIBXML2_CFLAGS)
if test -z "${LIBXML2_LIBS}"; then
AC_MSG_NOTICE([*** xml library not found.])
ifelse([$2], , AC_MSG_ERROR([xml library is required]), $2)
ifelse([$2], , AC_MSG_ERROR([libxml2 is required]), $2)
else
AC_MSG_NOTICE([using '${LIBXML2_LIBS}' for xml Library])
AC_MSG_NOTICE([using '${LIBXML2_LIBS}' for libxml2])
ifelse([$1], , , $1)
fi
])