X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=acinclude.m4;h=d57e7f7bb9dd427b5ad39922a4f332e80bfb8f70;hb=402ea113bbd93eef00e66ba0caaef75df15cd0e8;hp=b12fa502f5b8366d73969f8eb2553e09775f3416;hpb=1eb818742fa1fb6d107f14cf7ef8e69e60772df0;p=apache diff --git a/acinclude.m4 b/acinclude.m4 index b12fa502f5..d57e7f7bb9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4,25 +4,27 @@ dnl Autoconf 2.50 can not handle substr correctly. It does have dnl AC_HELP_STRING, so let's try to call it if we can. dnl Note: this define must be on one line so that it can be properly returned dnl as the help string. -AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl +AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl dnl APACHE_SUBST(VARIABLE) dnl Makes VARIABLE available in generated files dnl (do not use @variable@ in Makefiles, but $(variable)) -AC_DEFUN(APACHE_SUBST,[ +AC_DEFUN([APACHE_SUBST],[ APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1" AC_SUBST($1) ]) dnl APACHE_FAST_OUTPUT(FILENAME) dnl Perform substitutions on FILENAME (Makefiles only) -AC_DEFUN(APACHE_FAST_OUTPUT,[ +AC_DEFUN([APACHE_FAST_OUTPUT],[ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1" ]) dnl APACHE_GEN_CONFIG_VARS dnl Creates config_vars.mk -AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ +AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ + APACHE_SUBST(HTTPD_VERSION) + APACHE_SUBST(HTTPD_MMN) APACHE_SUBST(abs_srcdir) APACHE_SUBST(bindir) APACHE_SUBST(sbindir) @@ -43,6 +45,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ APACHE_SUBST(installbuilddir) APACHE_SUBST(runtimedir) APACHE_SUBST(proxycachedir) + APACHE_SUBST(statedir) APACHE_SUBST(other_targets) APACHE_SUBST(progname) APACHE_SUBST(prefix) @@ -53,6 +56,8 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ APACHE_SUBST(CPPFLAGS) APACHE_SUBST(CFLAGS) APACHE_SUBST(CXXFLAGS) + APACHE_SUBST(CC_FOR_BUILD) + APACHE_SUBST(CFLAGS_FOR_BUILD) APACHE_SUBST(LTFLAGS) APACHE_SUBST(LDFLAGS) APACHE_SUBST(LT_LDFLAGS) @@ -88,7 +93,11 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ APACHE_SUBST(MK_IMPLIB) APACHE_SUBST(MKDEP) APACHE_SUBST(INSTALL_PROG_FLAGS) + APACHE_SUBST(MPM_MODULES) + APACHE_SUBST(ENABLED_MPM_MODULE) APACHE_SUBST(DSO_MODULES) + APACHE_SUBST(ENABLED_DSO_MODULES) + APACHE_SUBST(LOAD_ALL_MODULES) APACHE_SUBST(APR_BINDIR) APACHE_SUBST(APR_INCLUDEDIR) APACHE_SUBST(APR_VERSION) @@ -97,10 +106,12 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ APACHE_SUBST(APU_INCLUDEDIR) APACHE_SUBST(APU_VERSION) APACHE_SUBST(APU_CONFIG) + APACHE_SUBST(APREQ_MAJOR_VERSION) + APACHE_SUBST(APREQ_LIBTOOL_VERSION) abs_srcdir="`(cd $srcdir && pwd)`" - echo creating config_vars.mk + AC_MSG_NOTICE([creating config_vars.mk]) test -d build || $mkdir_p build > build/config_vars.mk for i in $APACHE_VAR_SUBST; do @@ -108,25 +119,12 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ done ]) -dnl APACHE_GEN_MAKEFILES -dnl Creates Makefiles -AC_DEFUN(APACHE_GEN_MAKEFILES,[ - $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES -]) - -dnl ## APACHE_OUTPUT(file) -dnl ## adds "file" to the list of files generated by AC_OUTPUT -dnl ## This macro can be used several times. -AC_DEFUN(APACHE_OUTPUT, [ - APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" -]) - dnl dnl APACHE_TYPE_RLIM_T dnl dnl If rlim_t is not defined, define it to int dnl -AC_DEFUN(APACHE_TYPE_RLIM_T, [ +AC_DEFUN([APACHE_TYPE_RLIM_T], [ AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ AC_TRY_COMPILE([ #include @@ -143,20 +141,33 @@ AC_DEFUN(APACHE_TYPE_RLIM_T, [ fi ]) +dnl the list of build variables which are available for customization on a +dnl per module subdir basis (to be inserted into modules.mk with a "MOD_" +dnl prefix, i.e. MOD_CFLAGS etc.). Used in APACHE_MODPATH_{INIT,FINISH}. +define(mod_buildvars, [CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES]) +dnl dnl APACHE_MODPATH_INIT(modpath) -AC_DEFUN(APACHE_MODPATH_INIT,[ +AC_DEFUN([APACHE_MODPATH_INIT],[ current_dir=$1 modpath_current=modules/$1 modpath_static= modpath_shared= + for var in mod_buildvars; do + eval MOD_$var= + done test -d $1 || $srcdir/build/mkdir.sh $modpath_current > $modpath_current/modules.mk ])dnl dnl -AC_DEFUN(APACHE_MODPATH_FINISH,[ +AC_DEFUN([APACHE_MODPATH_FINISH],[ echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk echo "static = $modpath_static" >> $modpath_current/modules.mk echo "shared = $modpath_shared" >> $modpath_current/modules.mk + for var in mod_buildvars; do + if eval val=\"\$MOD_$var\"; test -n "$val"; then + echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + done if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then MODULE_DIRS="$MODULE_DIRS $current_dir" else @@ -166,7 +177,7 @@ AC_DEFUN(APACHE_MODPATH_FINISH,[ ])dnl dnl dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]]) -AC_DEFUN(APACHE_MODPATH_ADD,[ +AC_DEFUN([APACHE_MODPATH_ADD],[ if test -z "$3"; then objects="mod_$1.lo" else @@ -198,6 +209,27 @@ EOF fi fi ])dnl +dnl Same as APACHE_MODPATH_INIT/FINISH but for MPMs +dnl APACHE_MPMPATH_INIT(mpmpath) +AC_DEFUN([APACHE_MPMPATH_INIT],[ + current_dir=$1 + modpath_current=server/mpm/$1 + modpath_static= + modpath_shared= + for var in mod_buildvars; do + eval MOD_$var= + done + test -d $1 || $srcdir/build/mkdir.sh $modpath_current + > $modpath_current/modules.mk +])dnl +dnl +AC_DEFUN([APACHE_MPMPATH_FINISH],[ + for var in mod_buildvars; do + if eval val=\"\$MOD_$var\"; test -n "$val"; then + echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + done +])dnl dnl dnl APACHE_MPM_MODULE(name[, shared[, objects[, config[, path[, libs]]]]]) @@ -212,7 +244,7 @@ dnl config -- configuration logic to run if the MPM is enabled dnl path -- relative path to MPM (default: server/mpm/mpmname) dnl libs -- libs needed by this MPM dnl -AC_DEFUN(APACHE_MPM_MODULE,[ +AC_DEFUN([APACHE_MPM_MODULE],[ if ap_mpm_is_enabled $1; then if test -z "$3"; then objects="$1.lo" @@ -234,7 +266,7 @@ AC_DEFUN(APACHE_MPM_MODULE,[ if test -z "$2"; then APR_ADDTO(AP_LIBS, [$6]) libname="lib$1.la" - cat >$mpmpath/modules.mk<>$mpmpath/modules.mk<$mpmpath/modules.mk<>$mpmpath/modules.mk<" if it was specified. dnl -AC_DEFUN(APACHE_CHECK_OPENSSL,[ +AC_DEFUN([APACHE_CHECK_OPENSSL],[ AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [ dnl initialise the variables we use - ac_cv_openssl=yes + ac_cv_openssl=no ap_openssl_found="" ap_openssl_base="" ap_openssl_libs="" + ap_openssl_mod_cflags="" + ap_openssl_mod_ldflags="" dnl Determine the OpenSSL base directory, if any AC_MSG_CHECKING([for user-provided OpenSSL base directory]) - AC_ARG_WITH(ssl, APACHE_HELP_STRING(--with-ssl=DIR,OpenSSL base directory), [ + AC_ARG_WITH(ssl, APACHE_HELP_STRING(--with-ssl=PATH,OpenSSL installation directory), [ dnl If --with-ssl specifies a directory, we use that directory if test "x$withval" != "xyes" -a "x$withval" != "x"; then dnl This ensures $withval is actually a directory and that it is absolute @@ -469,27 +532,41 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[ saved_CPPFLAGS="$CPPFLAGS" saved_LIBS="$LIBS" saved_LDFLAGS="$LDFLAGS" - SSL_LIBS="" dnl Before doing anything else, load in pkg-config variables if test -n "$PKGCONFIG"; then saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" - if test "x$ap_openssl_base" != "x" -a \ - -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then - dnl Ensure that the given path is used by pkg-config too, otherwise - dnl the system openssl.pc might be picked up instead. - PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" - export PKG_CONFIG_PATH + if test "x$ap_openssl_base" != "x"; then + if test -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then + dnl Ensure that the given path is used by pkg-config too, otherwise + dnl the system openssl.pc might be picked up instead. + PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH + elif test -f "${ap_openssl_base}/lib64/pkgconfig/openssl.pc"; then + dnl Ensure that the given path is used by pkg-config too, otherwise + dnl the system openssl.pc might be picked up instead. + PKG_CONFIG_PATH="${ap_openssl_base}/lib64/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH + fi fi - ap_openssl_libs="`$PKGCONFIG --libs-only-l openssl 2>&1`" + AC_ARG_ENABLE(ssl-staticlib-deps,APACHE_HELP_STRING(--enable-ssl-staticlib-deps,[link mod_ssl with dependencies of OpenSSL's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-ssl.]), [ + if test "$enableval" = "yes"; then + PKGCONFIG_LIBOPTS="--static" + fi + ]) + ap_openssl_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors openssl`" if test $? -eq 0; then ap_openssl_found="yes" pkglookup="`$PKGCONFIG --cflags-only-I openssl`" APR_ADDTO(CPPFLAGS, [$pkglookup]) - APR_ADDTO(INCLUDES, [$pkglookup]) - pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`" + APR_ADDTO(MOD_CFLAGS, [$pkglookup]) + APR_ADDTO(ab_CFLAGS, [$pkglookup]) + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L openssl`" APR_ADDTO(LDFLAGS, [$pkglookup]) - APR_ADDTO(SSL_LIBS, [$pkglookup]) + APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other openssl`" + APR_ADDTO(LDFLAGS, [$pkglookup]) + APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) fi PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH" fi @@ -497,55 +574,202 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[ dnl fall back to the user-supplied directory if not found via pkg-config if test "x$ap_openssl_base" != "x" -a "x$ap_openssl_found" = "x"; then APR_ADDTO(CPPFLAGS, [-I$ap_openssl_base/include]) - APR_ADDTO(INCLUDES, [-I$ap_openssl_base/include]) + APR_ADDTO(MOD_CFLAGS, [-I$ap_openssl_base/include]) + APR_ADDTO(ab_CFLAGS, [-I$ap_openssl_base/include]) APR_ADDTO(LDFLAGS, [-L$ap_openssl_base/lib]) - APR_ADDTO(SSL_LIBS, [-L$ap_openssl_base/lib]) + APR_ADDTO(MOD_LDFLAGS, [-L$ap_openssl_base/lib]) if test "x$ap_platform_runtime_link_flag" != "x"; then APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_openssl_base/lib]) - APR_ADDTO(SSL_LIBS, [$ap_platform_runtime_link_flag$ap_openssl_base/lib]) + APR_ADDTO(MOD_LDFLAGS, [$ap_platform_runtime_link_flag$ap_openssl_base/lib]) fi fi - AC_MSG_CHECKING([for OpenSSL version]) + AC_MSG_CHECKING([for OpenSSL version >= 0.9.8a]) AC_TRY_COMPILE([#include ],[ #if !defined(OPENSSL_VERSION_NUMBER) #error "Missing OpenSSL version" #endif -#if (OPENSSL_VERSION_NUMBER < 0x009060af) \ - || ((OPENSSL_VERSION_NUMBER > 0x00907000) && (OPENSSL_VERSION_NUMBER < 0x0090702f)) -#error "Insecure openssl version " OPENSSL_VERSION_TEXT +#if OPENSSL_VERSION_NUMBER < 0x0090801f +#error "Unsupported OpenSSL version " OPENSSL_VERSION_TEXT #endif], - [AC_MSG_RESULT(OK)], - [dnl Replace this with OPENSSL_VERSION_TEXT from opensslv.h? - AC_MSG_RESULT([not encouraging]) - AC_MSG_WARN([OpenSSL version may contain security vulnerabilities!] - [ Ensure the latest security patches have been applied!]) - ]) + [AC_MSG_RESULT(OK) + ac_cv_openssl=yes], + [AC_MSG_RESULT(FAILED)]) if test "x$ac_cv_openssl" = "xyes"; then - ap_openssl_libs="-lssl -lcrypto `$apr_config --libs`" - APR_ADDTO(SSL_LIBS, [$ap_openssl_libs]) + ap_openssl_libs="${ap_openssl_libs:--lssl -lcrypto} `$apr_config --libs`" + APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_libs]) APR_ADDTO(LIBS, [$ap_openssl_libs]) - APACHE_SUBST(SSL_LIBS) + APR_SETVAR(ab_LIBS, [$MOD_LDFLAGS]) + APACHE_SUBST(ab_CFLAGS) + APACHE_SUBST(ab_LIBS) dnl Run library and function checks liberrors="" AC_CHECK_HEADERS([openssl/engine.h]) - AC_CHECK_FUNCS([SSLeay_version SSL_CTX_new], [], [liberrors="yes"]) - AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines]) + AC_CHECK_FUNCS([SSL_CTX_new], [], [liberrors="yes"]) + AC_CHECK_FUNCS([OPENSSL_init_ssl]) + AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines RAND_egd \ + CRYPTO_set_id_callback]) if test "x$liberrors" != "x"; then - ac_cv_openssl=no AC_MSG_WARN([OpenSSL libraries are unusable]) fi + else + AC_MSG_WARN([OpenSSL version is too old]) fi dnl restore CPPFLAGS="$saved_CPPFLAGS" LIBS="$saved_LIBS" LDFLAGS="$saved_LDFLAGS" + + dnl cache MOD_LDFLAGS, MOD_CFLAGS + ap_openssl_mod_cflags=$MOD_CFLAGS + ap_openssl_mod_ldflags=$MOD_LDFLAGS ]) if test "x$ac_cv_openssl" = "xyes"; then AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL is available]) + APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_mod_ldflags]) + APR_ADDTO(MOD_CFLAGS, [$ap_openssl_mod_cflags]) + fi + + dnl On most platforms, the default multithreading logic in OpenSSL 1.0.x uses + dnl a threadid that is based on the address of errno. We need to double-check + dnl that &errno is, in fact, different for each thread before using that + dnl default. + AC_CACHE_CHECK([if OpenSSL can use &errno as a THREADID], + [ac_cv_openssl_use_errno_threadid], [ + ac_cv_openssl_use_errno_threadid=no + + save_CFLAGS=$CFLAGS + save_LIBS=$LIBS + + CFLAGS=`$apr_config --cflags --cppflags --includes` + LIBS=`$apr_config --link-ld` + + AC_RUN_IFELSE([ + AC_LANG_PROGRAM([[ + #include + + #include "apr_pools.h" + #include "apr_thread_cond.h" + #include "apr_thread_proc.h" + + #define NUM_THREADS 10 + + struct thread_data { + apr_thread_mutex_t *mutex; + apr_thread_cond_t *cv; + int *init_count; + void *errno_addr; + }; + + /** + * Thread entry point. Waits for all the threads to be started, then + * records the address of errno into the thread_data. + */ + void * APR_THREAD_FUNC tmain(apr_thread_t *thread, void *data) + { + struct thread_data *tdata = data; + + /* The only point of this barrier is to make sure that all threads + * are started before we record &errno, hopefully preventing any + * false negatives in case a platform "recycles" threads. */ + apr_thread_mutex_lock(tdata->mutex); + ++(*tdata->init_count); + + if (*tdata->init_count == NUM_THREADS) { + apr_thread_cond_broadcast(tdata->cv); + } else { + while (*tdata->init_count != NUM_THREADS) { + apr_thread_cond_wait(tdata->cv, tdata->mutex); + } + } + apr_thread_mutex_unlock(tdata->mutex); + + tdata->errno_addr = &errno; + return NULL; + } + ]], [[ + int ret = 0; + apr_status_t status; + int i; + int j; + + apr_pool_t *pool; + apr_thread_mutex_t *mutex; + apr_thread_cond_t *cv; + int init_count = 0; + + struct thread_data tdata[NUM_THREADS] = { 0 }; + apr_thread_t *threads[NUM_THREADS] = { 0 }; + + if (apr_initialize() != APR_SUCCESS) { + exit(1); + } + + /* Set up the shared APR primitives. */ + if ((apr_pool_create(&pool, NULL) != APR_SUCCESS) + || (apr_thread_mutex_create(&mutex, 0, pool) != APR_SUCCESS) + || (apr_thread_cond_create(&cv, pool) != APR_SUCCESS)) { + ret = 2; + goto out; + } + + /* Start every thread. */ + for (i = 0; i < NUM_THREADS; ++i) { + tdata[i].mutex = mutex; + tdata[i].cv = cv; + tdata[i].init_count = &init_count; + + status = apr_thread_create(&threads[i], NULL, tmain, &tdata[i], + pool); + if (status != APR_SUCCESS) { + ret = 3; + goto out; + } + } + + /* Wait for them to finish (they'll record and exit after every one + * has been started). */ + for (i = 0; i < NUM_THREADS; ++i) { + apr_thread_join(&status, threads[i]); + if (status != APR_SUCCESS) { + ret = 4; + goto out; + } + } + + /* Check that no addresses were duplicated. */ + for (i = 0; i < NUM_THREADS - 1; ++i) { + for (j = i + 1; j < NUM_THREADS; ++j) { + if (tdata[i].errno_addr == tdata[j].errno_addr) { + ret = 5; + goto out; + } + } + } + + out: + apr_terminate(); + exit(ret); + ]]) + ], [ + ac_cv_openssl_use_errno_threadid=yes + ], [ + ac_cv_openssl_use_errno_threadid=no + ], [ + dnl Assume the worst when cross-compiling; users can override via either + dnl cachevars or the config header if necessary. + ac_cv_openssl_use_errno_threadid=no + ]) + + CFLAGS=$save_CFLAGS + LIBS=$save_LIBS + ]) + if test "x$ac_cv_openssl_use_errno_threadid" = "xyes"; then + AC_DEFINE(AP_OPENSSL_USE_ERRNO_THREADID, 1, + [Define if OpenSSL can use an errno-based threadid callback on this platform]) fi ]) @@ -560,7 +784,7 @@ AC_DEFUN([APACHE_CHECK_SERF], [ ac_cv_serf=no serf_prefix=/usr SERF_LIBS="" - AC_ARG_WITH(serf, APACHE_HELP_STRING([--with-serf=PREFIX], + AC_ARG_WITH(serf, APACHE_HELP_STRING([--with-serf=PATH], [Serf client library]), [ if test "$withval" = "yes" ; then @@ -586,10 +810,33 @@ AC_DEFUN([APACHE_CHECK_SERF], [ if test "$ac_cv_serf" = "yes"; then AC_DEFINE(HAVE_SERF, 1, [Define if libserf is available]) APR_SETVAR(SERF_LIBS, [-L$serf_prefix/lib -lserf-0]) - APR_ADDTO(INCLUDES, [-I$serf_prefix/include/serf-0]) + APR_ADDTO(MOD_INCLUDES, [-I$serf_prefix/include/serf-0]) fi ]) +AC_DEFUN([APACHE_CHECK_SYSTEMD], [ +dnl Check for systemd support for listen.c's socket activation. +case $host in +*-linux-*) + if test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd; then + SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd` + elif test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd-daemon; then + SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd-daemon` + else + AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") + fi + if test -n "$SYSTEMD_LIBS"; then + AC_CHECK_HEADERS(systemd/sd-daemon.h) + if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then + AC_MSG_WARN([Your system does not support systemd.]) + else + APR_ADDTO(HTTPD_LIBS, [$SYSTEMD_LIBS]) + AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported]) + fi + fi + ;; +esac +]) dnl dnl APACHE_EXPORT_ARGUMENTS @@ -597,14 +844,14 @@ dnl Export (via APACHE_SUBST) the various path-related variables that dnl apache will use while generating scripts like autoconf and apxs and dnl the default config file. -AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[ +AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[ APR_EXPAND_VAR(exp_$1, [$]$1) APACHE_SUBST(exp_$1) APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix}) APACHE_SUBST(rel_$1) ]) -AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[ +AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[ APACHE_SUBST_EXPANDED_ARG(exec_prefix) APACHE_SUBST_EXPANDED_ARG(bindir) APACHE_SUBST_EXPANDED_ARG(sbindir) @@ -624,6 +871,7 @@ AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[ APACHE_SUBST_EXPANDED_ARG(runtimedir) APACHE_SUBST_EXPANDED_ARG(logfiledir) APACHE_SUBST_EXPANDED_ARG(proxycachedir) + APACHE_SUBST_EXPANDED_ARG(statedir) ]) dnl @@ -682,7 +930,7 @@ int main(void) { return sizeof(void *) < sizeof(long); }], [ap_cv_void_ptr_lt_long=no], [ap_cv_void_ptr_lt_long=yes], - [ap_cv_void_ptr_lt_long=yes])]) + [ap_cv_void_ptr_lt_long="cross compile - not checked"])]) if test "$ap_cv_void_ptr_lt_long" = "yes"; then AC_MSG_ERROR([Size of "void *" is less than size of "long"]) @@ -709,3 +957,137 @@ YES_IS_DEFINED CPPFLAGS="$apache_old_cppflags" ]) ]) + +dnl +dnl APACHE_ADD_GCC_CFLAG +dnl +dnl Check if compiler is gcc and supports flag. If yes, add to NOTEST_CFLAGS. +dnl NOTEST_CFLAGS is merged lately, thus it won't accumulate in CFLAGS here. +dnl Also, AC_LANG_PROGRAM() itself is known to trigger [-Wstrict-prototypes] +dnl with some autoconf versions, so we force -Wno-strict-prototypes for the +dnl check to avoid spurious failures when adding flags like -Werror. +dnl +AC_DEFUN([APACHE_ADD_GCC_CFLAG], [ + define([ap_gcc_ckvar], [ac_cv_gcc_]translit($1, [-:.=], [____])) + if test "$GCC" = "yes"; then + AC_CACHE_CHECK([whether gcc accepts $1], ap_gcc_ckvar, [ + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1 -Wno-strict-prototypes" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + [ap_gcc_ckvar=yes], [ap_gcc_ckvar=no]) + CFLAGS="$save_CFLAGS" + ]) + if test "$]ap_gcc_ckvar[" = "yes" ; then + APR_ADDTO(NOTEST_CFLAGS,[$1]) + fi + fi + undefine([ap_gcc_ckvar]) +]) + + +dnl +dnl APACHE_CHECK_JANSSON +dnl +dnl Configure for libjansson, giving preference to +dnl "--with-jansson=" if it was specified. +dnl +AC_DEFUN([APACHE_CHECK_JANSSON],[ + AC_CACHE_CHECK([for jansson], [ac_cv_jansson], [ + dnl initialise the variables we use + ac_cv_jansson=no + ap_jansson_found="" + ap_jansson_base="" + ap_jansson_libs="" + + dnl Determine the jansson base directory, if any + AC_MSG_CHECKING([for user-provided jansson base directory]) + AC_ARG_WITH(jansson, APACHE_HELP_STRING(--with-jansson=PATH, jansson installation directory), [ + dnl If --with-jansson specifies a directory, we use that directory + if test "x$withval" != "xyes" -a "x$withval" != "x"; then + dnl This ensures $withval is actually a directory and that it is absolute + ap_jansson_base="`cd $withval ; pwd`" + fi + ]) + if test "x$ap_jansson_base" = "x"; then + AC_MSG_RESULT(none) + else + AC_MSG_RESULT($ap_jansson_base) + fi + + dnl Run header and version checks + saved_CPPFLAGS="$CPPFLAGS" + saved_LIBS="$LIBS" + saved_LDFLAGS="$LDFLAGS" + + dnl Before doing anything else, load in pkg-config variables + if test -n "$PKGCONFIG"; then + saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" + AC_MSG_CHECKING([for pkg-config along $PKG_CONFIG_PATH]) + if test "x$ap_jansson_base" != "x" ; then + if test -f "${ap_jansson_base}/lib/pkgconfig/libjansson.pc"; then + dnl Ensure that the given path is used by pkg-config too, otherwise + dnl the system libjansson.pc might be picked up instead. + PKG_CONFIG_PATH="${ap_jansson_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH + elif test -f "${ap_jansson_base}/lib64/pkgconfig/libjansson.pc"; then + dnl Ensure that the given path is used by pkg-config too, otherwise + dnl the system libjansson.pc might be picked up instead. + PKG_CONFIG_PATH="${ap_jansson_base}/lib64/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH + fi + fi + AC_ARG_ENABLE(jansson-staticlib-deps,APACHE_HELP_STRING(--enable-jansson-staticlib-deps,[link mod_md with dependencies of libjansson's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-md.]), [ + if test "$enableval" = "yes"; then + PKGCONFIG_LIBOPTS="--static" + fi + ]) + ap_jansson_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libjansson`" + if test $? -eq 0; then + ap_jansson_found="yes" + pkglookup="`$PKGCONFIG --cflags-only-I libjansson`" + APR_ADDTO(CPPFLAGS, [$pkglookup]) + APR_ADDTO(MOD_CFLAGS, [$pkglookup]) + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libjansson`" + APR_ADDTO(LDFLAGS, [$pkglookup]) + APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other libjansson`" + APR_ADDTO(LDFLAGS, [$pkglookup]) + APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) + fi + PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH" + fi + + dnl fall back to the user-supplied directory if not found via pkg-config + if test "x$ap_jansson_base" != "x" -a "x$ap_jansson_found" = "x"; then + APR_ADDTO(CPPFLAGS, [-I$ap_jansson_base/include]) + APR_ADDTO(MOD_CFLAGS, [-I$ap_jansson_base/include]) + APR_ADDTO(LDFLAGS, [-L$ap_jansson_base/lib]) + APR_ADDTO(MOD_LDFLAGS, [-L$ap_jansson_base/lib]) + if test "x$ap_platform_runtime_link_flag" != "x"; then + APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_jansson_base/lib]) + APR_ADDTO(MOD_LDFLAGS, [$ap_platform_runtime_link_flag$ap_jansson_base/lib]) + fi + fi + + # attempts to include jansson.h fail me. So lets make sure we can at least + # include its other header file + AC_TRY_COMPILE([#include ],[], + [AC_MSG_RESULT(OK) + ac_cv_jansson=yes], + [AC_MSG_RESULT(FAILED)]) + + if test "x$ac_cv_jansson" = "xyes"; then + ap_jansson_libs="${ap_jansson_libs:--ljansson} `$apr_config --libs`" + APR_ADDTO(MOD_LDFLAGS, [$ap_jansson_libs]) + APR_ADDTO(LIBS, [$ap_jansson_libs]) + fi + + dnl restore + CPPFLAGS="$saved_CPPFLAGS" + LIBS="$saved_LIBS" + LDFLAGS="$saved_LDFLAGS" + ]) + if test "x$ac_cv_jansson" = "xyes"; then + AC_DEFINE(HAVE_JANSSON, 1, [Define if jansson is available]) + fi +])