* version up.

[modchxj/mod_chxj.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 22bd2a8..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.12.36],[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
@@ -74,6 +74,8 @@ Please specify the --with-pcre-config option. And, please specify the place of t
 ])
 fi
 
+
+
 dnl ==================================================
 dnl
 dnl filename in img tag convertion.
@@ -178,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
 ])
 
@@ -260,7 +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 "
@@ -271,11 +273,16 @@ 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` "
 LIBS="${LIBS} ${MYSQL_COOKIE_LIBS}"
 LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} "
+LIBS="${LIBS} css/src/.libs/libscss.a"
 LIBS="${LIBS} -lcrypto -lssl "
 CFLAGS="${CFLAGS} `${WAND_CONFIG} --cppflags` `${WAND_CONFIG} --cflags`"
 CFLAGS="${CFLAGS} `${APR_CONFIG} --includes` `${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags`"
@@ -293,6 +300,7 @@ 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([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.]),[],
 #[[
@@ -334,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)
@@ -344,8 +349,10 @@ AC_SUBST(QDEFS)
 AC_SUBST(DDEFS)
 AC_SUBST(LIBS)
 AC_SUBST(CFLAGS)
+AC_SUBST(APR_CONFIG)
+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