Merge branch 'master' into sandbox

[modchxj/mod_chxj.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 34e3043..25f971a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -263,17 +263,8 @@ APR_HEADER_DIR="`${APR_CONFIG} --includes | sed -e 's/-I//g' | sed -e 's/ //g'`"
 AC_CHECK_HEADERS([apr_shm.h apr_global_mutex.h])
 AC_CHECK_HEADERS([apr.h])
 AC_CHECK_HEADERS([ap_config.h])
-#AC_CHECK_HEADERS([ap_regex.h],
-#  AC_DEFINE([HAVE_AP_REGEX_H], [], [Define to 1 if you have the <ap_regex.h> header file.]),[],
-#[[
-##ifdef HAVE_APR_H
-##include "apr.h"
-##endif
-##ifdef HAVE_AP_CONFIG_H
-##include "ap_config.h"
-##endif
-#]])
 AC_CHECK_HEADERS([ap_regex.h],use_pcre_flag="no",use_pcre_flag="yes")
+AC_CHECK_HEADERS([libgen.h])
 if test "x$use_pcre_flag" = "xyes" ; then
   if test "x$with_pcre_config" = "x" ; then
     AC_PATH_PROG(PCRE_CONFIG, pcre-config, no, /usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin)
@@ -307,6 +298,8 @@ AC_SUBST(QDEFS)
 AC_SUBST(DDEFS)
 AC_SUBST(LIBS)
 AC_SUBST(CFLAGS)
+AC_SUBST(APR_CONFIG)
+AC_SUBST(APU_CONFIG)
 
 
 AC_CONFIG_FILES([Makefile src/Makefile])