X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=acinclude.m4;h=056bbd5e8bed94dd81bd49ce03cba4c0772684ea;hb=e3171b7fa682a283331fdbc5099f1c29d1bf679b;hp=ed3964886fc2959f50a950c93b39644f464c0c7e;hpb=4aae1d59959494cc89cdaf0f0ee0b6e23f47d874;p=apache diff --git a/acinclude.m4 b/acinclude.m4 index ed3964886f..056bbd5e8b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -53,6 +53,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) @@ -73,22 +75,38 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ APACHE_SUBST(EXTRA_LDFLAGS) APACHE_SUBST(EXTRA_LIBS) APACHE_SUBST(EXTRA_INCLUDES) + APACHE_SUBST(INTERNAL_CPPFLAGS) APACHE_SUBST(LIBTOOL) APACHE_SUBST(SHELL) + APACHE_SUBST(RSYNC) APACHE_SUBST(MODULE_DIRS) APACHE_SUBST(MODULE_CLEANDIRS) APACHE_SUBST(PORT) + APACHE_SUBST(SSLPORT) APACHE_SUBST(CORE_IMPLIB_FILE) APACHE_SUBST(CORE_IMPLIB) APACHE_SUBST(SH_LIBS) APACHE_SUBST(SH_LIBTOOL) APACHE_SUBST(MK_IMPLIB) + APACHE_SUBST(MKDEP) APACHE_SUBST(INSTALL_PROG_FLAGS) 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) + APACHE_SUBST(APR_CONFIG) + APACHE_SUBST(APU_BINDIR) + 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 @@ -131,12 +149,20 @@ 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,[ 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 @@ -145,6 +171,11 @@ 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 @@ -163,13 +194,17 @@ AC_DEFUN(APACHE_MODPATH_ADD,[ if test -z "$module_standalone"; then if test -z "$2"; then - libname="mod_$1.la" + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_$1.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk< $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]]]]]) +dnl +dnl Provide information for building the MPM. (Enablement is handled using +dnl --with-mpm/--enable-mpms-shared.) +dnl +dnl name -- name of MPM, same as MPM directory name +dnl shared -- "shared" to indicate shared module build, empty string otherwise +dnl objects -- one or more .lo files to link into the MPM module (default: mpmname.lo) +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,[ + if ap_mpm_is_enabled $1; then + if test -z "$3"; then + objects="$1.lo" + else + objects="$3" + fi + + if test -z "$5"; then + mpmpath="server/mpm/$1" + else + mpmpath=$5 + fi + + dnl VPATH support + test -d $mpmpath || $srcdir/build/mkdir.sh $mpmpath + + APACHE_FAST_OUTPUT($mpmpath/Makefile) + + if test -z "$2"; then + APR_ADDTO(AP_LIBS, [$6]) + libname="lib$1.la" + cat >>$mpmpath/modules.mk<>$mpmpath/modules.mk<[ ]*/d" \ - -e '/[ ]*<\/Layout>[ ]*/,$d' \ - -e "s/^[ ]*//g" \ - -e "s/:[ ]*/=\'/g" \ - -e "s/[ ]*$/'/g" \ - $1 > $pldconf - layout_name=$2 - . $pldconf - rm $pldconf - for var in prefix exec_prefix bindir sbindir libexecdir mandir \ - sysconfdir datadir errordir iconsdir htdocsdir cgidir \ - includedir localstatedir runtimedir logfiledir libdir \ - manualdir proxycachedir installbuilddir; do - eval "val=\"\$$var\"" - case $val in - *+) - val=`echo $val | sed -e 's;\+$;;'` - eval "$var=\"\$val\"" - autosuffix=yes - ;; - *) - autosuffix=no - ;; - esac - val=`echo $val | sed -e 's:\(.\)/*$:\1:'` - val=`echo $val | sed -e 's:[\$]\([a-z_]*\):${\1}:g'` - if test "$autosuffix" = "yes"; then - if echo $val | grep apache >/dev/null; then - addtarget=no - else - addtarget=yes - fi - if test "$addtarget" = "yes"; then - val="$val/apache2" - fi - fi - eval "$var='$val'" - done - changequote([,]) -])dnl - -dnl -dnl APACHE_ENABLE_LAYOUT +dnl APACHE_ENABLE_MODULES dnl -AC_DEFUN(APACHE_ENABLE_LAYOUT,[ -AC_ARG_ENABLE(layout, -[ --enable-layout=LAYOUT],[ - LAYOUT=$enableval -]) +AC_DEFUN(APACHE_ENABLE_MODULES,[ + module_selection=most + module_default=shared -if test -z "$LAYOUT"; then - LAYOUT="Apache" -fi -APACHE_LAYOUT($srcdir/config.layout, $LAYOUT) + dnl Check whether we have DSO support. + dnl If "yes", we build shared modules by default. + APR_CHECK_APR_DEFINE(APR_HAS_DSO) -AC_MSG_CHECKING(for chosen layout) -AC_MSG_RESULT($layout_name) -]) + if test $ac_cv_define_APR_HAS_DSO = "no"; then + AC_MSG_WARN([Missing DSO support - building static modules by default.]) + module_default=static + fi -dnl -dnl APACHE_ENABLE_MODULES -dnl -AC_DEFUN(APACHE_ENABLE_MODULES,[ - module_selection=default - module_default=yes AC_ARG_ENABLE(modules, - APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Modules to enable),[ + APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Space-separated list of modules to enable | "all" | "most" | "few" | "none" | "reallyall"),[ + if test "$enableval" = "none"; then + module_default=no + module_selection=none + else + for i in $enableval; do + if test "$i" = "all" -o "$i" = "most" -o "$i" = "few" -o "$i" = "reallyall" + then + module_selection=$i + else + i=`echo $i | sed 's/-/_/g'` + eval "enable_$i=shared" + fi + done + fi + ]) + + AC_ARG_ENABLE(mods-shared, + APACHE_HELP_STRING(--enable-mods-shared=MODULE-LIST,Space-separated list of shared modules to enable | "all" | "most" | "few" | "reallyall"),[ for i in $enableval; do - if test "$i" = "all" -o "$i" = "most"; then + if test "$i" = "all" -o "$i" = "most" -o "$i" = "few" -o "$i" = "reallyall" + then module_selection=$i + module_default=shared else - eval "enable_$i=yes" + i=`echo $i | sed 's/-/_/g'` + eval "enable_$i=shared" fi done ]) - AC_ARG_ENABLE(mods-shared, - APACHE_HELP_STRING(--enable-mods-shared=MODULE-LIST,Shared modules to enable),[ + AC_ARG_ENABLE(mods-static, + APACHE_HELP_STRING(--enable-mods-static=MODULE-LIST,Space-separated list of static modules to enable | "all" | "most" | "few" | "reallyall"),[ for i in $enableval; do - if test "$i" = "all" -o "$i" = "most"; then + if test "$i" = "all" -o "$i" = "most" -o "$i" = "few" -o "$i" = "reallyall"; then module_selection=$i - module_default=shared + module_default=static else i=`echo $i | sed 's/-/_/g'` - eval "enable_$i=shared" + eval "enable_$i=static" fi done ]) @@ -375,118 +492,168 @@ AC_DEFUN(APACHE_REQUIRE_CXX,[ ]) dnl -dnl APACHE_CHECK_SSL_TOOLKIT +dnl APACHE_CHECK_OPENSSL dnl -dnl Find the openssl toolkit installation and check it for the right -dnl version, then add its flags to INCLUDES and LIBS. This should -dnl really be using a custom AC_TRY_COMPILE function to test the includes -dnl and then AC_TRY_LINK to test the libraries directly for the version, -dnl but that will require someone who knows how to program openssl. +dnl Configure for OpenSSL, giving preference to +dnl "--with-ssl=" if it was specified. dnl -AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[ -if test "x$ap_ssltk_base" = "x"; then - AC_MSG_CHECKING(for SSL/TLS toolkit base) - ap_ssltk_base="" - AC_ARG_WITH(ssl, APACHE_HELP_STRING(--with-ssl=DIR,SSL/TLS toolkit (OpenSSL)), [ - if test "x$withval" != "xyes" -a "x$withval" != "x"; then - ap_ssltk_base="$withval" - if test -f "$ap_ssltk_base/bin/openssl"; then - ap_ssltk_version="`$ap_ssltk_base/bin/openssl version`" - else - ap_ssltk_version="unknown" +AC_DEFUN(APACHE_CHECK_OPENSSL,[ + AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [ + dnl initialise the variables we use + ac_cv_openssl=no + ap_openssl_found="" + ap_openssl_base="" + ap_openssl_libs="" + + 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=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 + ap_openssl_base="`cd $withval ; pwd`" fi + ]) + if test "x$ap_openssl_base" = "x"; then + AC_MSG_RESULT(none) + else + AC_MSG_RESULT($ap_openssl_base) fi - ]) - if test "x$ap_ssltk_base" = "x"; then - AC_CACHE_VAL(ap_cv_ssltk,[ - # - # shotgun approach: find all occurrences of the openssl program - # - # The IFS=... trick eliminates the colons from $PATH, without using an external program - for p in `IFS=":$IFS"; echo $PATH` /usr/local/openssl/bin /usr/local/ssl/bin; do - if test -f "$p/openssl"; then - ap_ssltk_version="`$p/openssl version`" - if test "x$ap_ssltk_version" != "x"; then - ap_cv_ssltk="`(cd $p/.. && pwd)`" - break - 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" + 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 + fi + 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 - done - if test "x$ap_cv_ssltk" = "x"; then - AC_MSG_ERROR([requires OpenSSL 0.9.6e or higher]) + ]) + 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(MOD_CFLAGS, [$pkglookup]) + APR_ADDTO(ab_CFLAGS, [$pkglookup]) + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L openssl`" + APR_ADDTO(LDFLAGS, [$pkglookup]) + APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other openssl`" + APR_ADDTO(LDFLAGS, [$pkglookup]) + APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) fi - ]) - ap_ssltk_base="$ap_cv_ssltk" - fi - if test ! -d $ap_ssltk_base; then - AC_MSG_ERROR([invalid SSL/TLS toolkit base directory $ap_ssltk_base]) - fi - AC_MSG_RESULT($ap_ssltk_base) - - AC_MSG_CHECKING(for SSL/TLS toolkit version) - AC_MSG_RESULT($ap_ssltk_version) - case "$ap_ssltk_version" in - "OpenSSL "[[1-9]]* | \ - "OpenSSL "0.9.6[[e-z]]* | \ - "OpenSSL "0.9.[[7-9]]* | \ - "OpenSSL "0.[[1-9]][[0-9]]* ) - # okay versions that do not have known security holes - ;; - "OpenSSL"*) - AC_MSG_WARN([OpenSSL versions prior to 0.9.6e have known security holes]) - ;; - *) - # unknown version -- assume the user knows what they are doing - ;; - esac - - AC_MSG_CHECKING(for SSL/TLS toolkit includes) - ap_ssltk_incdir="" - for p in $ap_ssltk_base/include /usr/local/openssl/include \ - /usr/local/ssl/include /usr/local/include /usr/include; do - if test -f "$p/openssl/ssl.h"; then - ap_ssltk_incdir="$p" - break - elif test -f "$p/ssl.h"; then - ap_ssltk_incdir="$p" - break + PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH" fi - done - if test "x$ap_ssltk_incdir" = "x"; then - AC_MSG_ERROR([OpenSSL headers not found]) - fi - AC_MSG_RESULT($ap_ssltk_incdir) - - AC_MSG_CHECKING(for SSL/TLS toolkit libraries) - ap_ssltk_libdir="" - for p in $ap_ssltk_base/lib /usr/local/openssl/lib \ - /usr/local/ssl/lib /usr/local/lib /usr/lib /lib /usr/lib64; do - if test -f "$p/libssl.a" -o -f "$p/libssl.so" -o -f "$p/libssl.dylib"; then - ap_ssltk_libdir="$p" - break + + 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(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(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(MOD_LDFLAGS, [$ap_platform_runtime_link_flag$ap_openssl_base/lib]) + fi fi - done - if test ".$ap_ssltk_libdir" = .; then - AC_MSG_ERROR([OpenSSL libraries not found]) - fi - AC_MSG_RESULT($ap_ssltk_libdir) - dnl # annotate the Apache build environment with determined information - APR_ADDTO(INCLUDES, [-I$ap_ssltk_incdir/openssl]) - if test "x$ap_ssltk_incdir" != "x/usr/include"; then - APR_ADDTO(INCLUDES, [-I$ap_ssltk_incdir]) + 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 < 0x0090801f +#error "Unsupported OpenSSL version " OPENSSL_VERSION_TEXT +#endif], + [AC_MSG_RESULT(OK) + ac_cv_openssl=yes], + [AC_MSG_RESULT(FAILED)]) + + if test "x$ac_cv_openssl" = "xyes"; then + ap_openssl_libs="${ap_openssl_libs:--lssl -lcrypto} `$apr_config --libs`" + APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_libs]) + APR_ADDTO(LIBS, [$ap_openssl_libs]) + APR_SETVAR(ab_LDFLAGS, [$MOD_LDFLAGS]) + APACHE_SUBST(ab_CFLAGS) + APACHE_SUBST(ab_LDFLAGS) + + 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]) + if test "x$liberrors" != "x"; then + 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" + ]) + if test "x$ac_cv_openssl" = "xyes"; then + AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL is available]) fi - if test "x$ap_ssltk_libdir" != "x/usr/lib"; then - APR_ADDTO(LDFLAGS, [-L$ap_ssltk_libdir]) - if test "x$ap_platform_runtime_link_flag" != "x"; then - APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_ssltk_libdir]) +]) + +dnl +dnl APACHE_CHECK_SERF +dnl +dnl Configure for the detected libserf, giving preference to +dnl "--with-serf=" if it was specified. +dnl +AC_DEFUN([APACHE_CHECK_SERF], [ + AC_CACHE_CHECK([for libserf], [ac_cv_serf], [ + ac_cv_serf=no + serf_prefix=/usr + SERF_LIBS="" + AC_ARG_WITH(serf, APACHE_HELP_STRING([--with-serf=PATH], + [Serf client library]), + [ + if test "$withval" = "yes" ; then + serf_prefix=/usr + else + serf_prefix=$withval + fi + ]) + + if test "$serf_prefix" != "no" ; then + save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES -I$serf_prefix/include/serf-0" + AC_CHECK_HEADERS(serf.h,[ + save_ldflags="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$serf_prefix/lib" + AC_CHECK_LIB(serf-0, serf_context_create,[ac_cv_serf="yes"]) + LDFLAGS="$save_ldflags"]) + CPPFLAGS="$save_cppflags" fi + ]) + + APACHE_SUBST(SERF_LIBS) + 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(MOD_INCLUDES, [-I$serf_prefix/include/serf-0]) fi - APR_ADDTO(LIBS, [-lssl -lcrypto]) - ap_cv_ssltk="$ap_ssltk_base" -fi ]) + dnl dnl APACHE_EXPORT_ARGUMENTS dnl Export (via APACHE_SUBST) the various path-related variables that @@ -522,3 +689,108 @@ AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[ APACHE_SUBST_EXPANDED_ARG(proxycachedir) ]) +dnl +dnl APACHE_CHECK_APxVER({apr|apu}, major, minor, +dnl [actions-if-ok], [actions-if-not-ok]) +dnl +dnl Checks for APR or APR-util of given major/minor version or later; +dnl if so, runs actions-if-ok; otherwise runs actions-if-not-ok if given. +dnl If the version is not satisfactory and actions-if-not-ok is not +dnl given, then an error is printed and the configure script is aborted. +dnl +dnl The first argument must be [apr] or [apu]. +dnl +AC_DEFUN([APACHE_CHECK_APxVER], [ +define(ap_ckver_major, translit($1, [apru], [APRU])[_MAJOR_VERSION]) +define(ap_ckver_minor, translit($1, [apru], [APRU])[_MINOR_VERSION]) +define(ap_ckver_cvar, [ap_cv_$1ver$2$3]) +define(ap_ckver_name, ifelse([$1],[apr],[APR],[APR-util])) + +ap_ckver_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS `$[$1]_config --includes`" + +AC_CACHE_CHECK([for ap_ckver_name version $2.$3.0 or later], ap_ckver_cvar, [ +AC_EGREP_CPP([good], [ +#include <$1_version.h> +#if ]ap_ckver_major[ > $2 || (]ap_ckver_major[ == $2 && ]ap_ckver_minor[ >= $3) +good +#endif +], [ap_ckver_cvar=yes], [ap_ckver_cvar=no])]) + +if test "$ap_ckver_cvar" = "yes"; then + ifelse([$4],[],[:],[$4]) +else + ifelse([$5],[],[AC_MSG_ERROR([ap_ckver_name version $2.$3.0 or later is required])], [$5]) +fi + +CPPFLAGS="$ap_ckver_CPPFLAGS" + +undefine([ap_ckver_major]) +undefine([ap_ckver_minor]) +undefine([ap_ckver_cvar]) +undefine([ap_ckver_name]) +]) + +dnl +dnl APACHE_CHECK_VOID_PTR_LEN +dnl +dnl Checks if the size of a void pointer is at least as big as a "long" +dnl integer type. +dnl +AC_DEFUN([APACHE_CHECK_VOID_PTR_LEN], [ + +AC_CACHE_CHECK([for void pointer length], [ap_cv_void_ptr_lt_long], +[AC_TRY_RUN([ +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="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"]) +fi +]) + +dnl +dnl APACHE_CHECK_APR_HAS_LDAP +dnl +dnl Check if APR_HAS_LDAP is 1 +dnl Unfortunately, we can't use APR_CHECK_APR_DEFINE (because it only includes apr.h) +dnl or APR_CHECK_DEFINE (because it only checks for defined'ness and not for 0/1). +dnl +AC_DEFUN([APACHE_CHECK_APR_HAS_LDAP], [ + AC_CACHE_CHECK([for ldap support in apr/apr-util],ac_cv_APR_HAS_LDAP,[ + apache_old_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCLUDES" + AC_EGREP_CPP(YES_IS_DEFINED, [ +#include +#if APR_HAS_LDAP +YES_IS_DEFINED +#endif + ], ac_cv_APR_HAS_LDAP=yes, ac_cv_APR_HAS_LDAP=no) + CPPFLAGS="$apache_old_cppflags" + ]) +]) + +dnl +dnl APACHE_ADD_GCC_CFLAGS +dnl +dnl Check if compiler is gcc and supports flag. If yes, add to CFLAGS. +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" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int foo() { return 0; }])], + [ap_gcc_ckvar=yes], [ap_gcc_ckvar=no]) + CFLAGS="$save_CFLAGS" + ]) + if test "$]ap_gcc_ckvar[" = "yes" ; then + APR_ADDTO(CFLAGS,[$1]) + fi + fi + undefine([ap_gcc_ckvar]) +])