* version up.

[modchxj/mod_chxj.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 00d0aa8..a2cf4f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([mod_chxj],[0.13.0-rc],[konn@users.sourceforge.jp])
+AC_INIT([mod_chxj],[0.14.2rc1],[konn@users.sourceforge.jp])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/mod_chxj.c])
 AC_CANONICAL_TARGET
@@ -180,7 +180,7 @@ AC_ARG_WITH(openssl,
     CPPFLAGS="${CPPFLAGS} -I${openssl_prefix}/include"
     LDFLAGS="${LDFLAGS} -L${openssl_prefix}/lib"
     LDFLAGS="${LDFLAGS} -R${openssl_prefix}/lib"
-    OPENSSL_PATH="--with-openssl ${openssl_prefix}"
+    OPENSSL_PATH="--with-openssl=${openssl_prefix}"
   fi
 ])
 
@@ -262,6 +262,7 @@ if test "x$with_apu_config" != "x" ; then
   APU_CONFIG=$with_apu_config
 fi
 
+CFLAGS="${CFLAGS} -DLIBICONV_PLUG"
 case $host_os in
   freebsd*)
     CFLAGS="${CFLAGS} -I/usr/local/include "
@@ -272,6 +273,10 @@ if test "x${with_apache_header}" = "x" ; then
   with_apache_header=`${APXS} -q includedir`
 fi
 
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_CHECK_FUNCS([open mmap close memset memcpy strcasecmp strncasecmp strstr])
+
 LIBS="${LIBS} `${WAND_CONFIG} --ldflags` `${WAND_CONFIG} --libs | sed -e s/-ldpstk//` "
 LIBS="${LIBS} `${APR_CONFIG} --ldflags` `${APR_CONFIG} --libs` "
 LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` "
@@ -295,8 +300,25 @@ 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],use_pcre_flag="no",use_pcre_flag="yes")
 AC_CHECK_HEADERS([libgen.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",
+[[#ifdef HAVE_APR_H
+# include "apr.h"
+#endif
+#ifdef HAVE_AP_CONFIG_H
+# include "ap_config.h"
+#endif
+]])
 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)
@@ -320,9 +342,6 @@ fi
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
-# Checks for library functions.
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([open mmap close memset memcpy strcasecmp strncasecmp strstr])
 
 AC_SUBST(with_apache_header)
 AC_SUBST(CC)
@@ -335,5 +354,5 @@ AC_SUBST(APU_CONFIG)
 AC_SUBST(OPENSSL_PATH)
 
 
-AC_CONFIG_FILES([Makefile src/Makefile support/centos/mod-chxj.spec])
+AC_CONFIG_FILES([Makefile src/Makefile support/centos/mod-chxj.spec support/freebsd/Makefile])
 AC_OUTPUT