X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=acinclude.m4;h=852f5333e789c5b0491327b70a967f1453a59963;hb=7ae5a61329fd7bd6a50c8979ca5ce830557f3835;hp=5828c035c9cf8baeb9d4d5977213b4aa2efc7d2d;hpb=11e7e50aaf067bf02fc40d0aec5e1f7a928da20f;p=apache diff --git a/acinclude.m4 b/acinclude.m4 index 5828c035c9..852f5333e7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -20,23 +20,6 @@ AC_DEFUN(APACHE_FAST_OUTPUT,[ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1" ]) -dnl APACHE_MKDIR_P_CHECK -dnl checks whether mkdir -p works -AC_DEFUN(APACHE_MKDIR_P_CHECK,[ - AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[ - test -d conftestdir && rm -rf conftestdir - mkdir -p conftestdir/somedir >/dev/null 2>&1 - if test -d conftestdir/somedir; then - ac_cv_mkdir_p=yes - mkdir_p="mkdir -p" - else - ac_cv_mkdir_p=no - mkdir_p="$top_srcdir/build/mkdir.sh" - fi - rm -rf conftestdir - ]) -]) - dnl APACHE_GEN_CONFIG_VARS dnl Creates config_vars.mk AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ @@ -92,16 +75,27 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ APACHE_SUBST(EXTRA_INCLUDES) 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(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) abs_srcdir="`(cd $srcdir && pwd)`" @@ -180,13 +174,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<$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"),[ for i in $enableval; do - if test "$i" = "all" -o "$i" = "most"; then + if test "$i" = "all" -o "$i" = "most" -o "$i" = "few"; 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 ]) @@ -413,232 +429,207 @@ AC_DEFUN(APACHE_REQUIRE_CXX,[ dnl dnl APACHE_CHECK_SSL_TOOLKIT 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 the detected openssl/ssl-c toolkit installation, giving +dnl preference to "--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) +if test "x$ap_ssltk_configured" = "x"; then + dnl initialise the variables we use + ap_ssltk_found="" ap_ssltk_base="" - AC_ARG_WITH(ssl, APACHE_HELP_STRING(--with-ssl=DIR,SSL/TLS toolkit (OpenSSL)), [ + ap_ssltk_libs="" + ap_ssltk_type="" + + dnl Determine the SSL/TLS toolkit's base directory, if any + AC_MSG_CHECKING([for user-provided SSL/TLS toolkit base]) + AC_ARG_WITH(sslc, APACHE_HELP_STRING(--with-sslc=DIR,RSA SSL-C SSL/TLS toolkit), [ + dnl If --with-sslc specifies a directory, we use that directory or fail + if test "x$withval" != "xyes" -a "x$withval" != "x"; then + dnl This ensures $withval is actually a directory and that it is absolute + ap_ssltk_base="`cd $withval ; pwd`" + fi + ap_ssltk_type="sslc" + ]) + AC_ARG_WITH(ssl, APACHE_HELP_STRING(--with-ssl=DIR,OpenSSL SSL/TLS toolkit), [ + dnl If --with-ssl specifies a directory, we use that directory or fail if test "x$withval" != "xyes" -a "x$withval" != "x"; then - ap_ssltk_base="$withval" + dnl This ensures $withval is actually a directory and that it is absolute + ap_ssltk_base="`cd $withval ; pwd`" fi ]) if test "x$ap_ssltk_base" = "x"; then - AC_CACHE_VAL(ap_cv_ssltk,[ - # - # shotgun approach: find all occurrences of the openssl program - # - ap_ssltk_try="" - # 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_try="$ap_ssltk_try $p" - fi - done - if test "x$ap_ssltk_try" = "x"; then - AC_MSG_ERROR(['openssl' not found in path]) - fi - for p in $ap_ssltk_try; do - ap_ssltk_version="`$p/openssl version`" - case "$ap_ssltk_version" in - "OpenSSL "[[1-9]]* | \ - "OpenSSL "0.9.[[6-9]]* | \ - "OpenSSL "0.[[1-9]][[0-9]]* ) - ap_cv_ssltk="`(cd $p/.. && pwd)`" - break - ;; - *) - # skip because it is too old or a bad result - ;; - esac - done - if test "x$ap_cv_ssltk" = "x"; then - AC_MSG_ERROR([requires OpenSSL 0.9.6 or higher]) - fi - ]) - ap_ssltk_base="$ap_cv_ssltk" + AC_MSG_RESULT(none) + else + AC_MSG_RESULT($ap_ssltk_base) fi - if test ! -d $ap_ssltk_base; then - AC_MSG_ERROR([invalid SSL/TLS toolkit base directory $ap_ssltk_base]) + + dnl Run header and version checks + saved_CPPFLAGS="$CPPFLAGS" + saved_LIBS="$LIBS" + saved_LDFLAGS="$LDFLAGS" + SSL_LIBS="" + + dnl Before doing anything else, load in pkg-config variables (if not sslc). + if test "x$ap_ssltk_type" = "x" -a -n "$PKGCONFIG"; then + saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" + if test "x$ap_ssltk_base" != "x" -a \ + -f "${ap_ssltk_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_ssltk_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH + fi + ap_ssltk_libs="`$PKGCONFIG --libs-only-l openssl 2>&1`" + if test $? -eq 0; then + ap_ssltk_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(LDFLAGS, [$pkglookup]) + APR_ADDTO(SSL_LIBS, [$pkglookup]) + fi + PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH" fi - AC_MSG_RESULT($ap_ssltk_base) - - AC_MSG_CHECKING(for SSL/TLS toolkit version) - AC_MSG_RESULT($ap_ssltk_version) - - 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 + if test "x$ap_ssltk_base" != "x" -a "x$ap_ssltk_found" = "x"; then + APR_ADDTO(CPPFLAGS, [-I$ap_ssltk_base/include]) + APR_ADDTO(INCLUDES, [-I$ap_ssltk_base/include]) + APR_ADDTO(LDFLAGS, [-L$ap_ssltk_base/lib]) + APR_ADDTO(SSL_LIBS, [-L$ap_ssltk_base/lib]) + if test "x$ap_platform_runtime_link_flag" != "x"; then + APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_ssltk_base/lib]) + APR_ADDTO(SSL_LIBS, [$ap_platform_runtime_link_flag$ap_ssltk_base/lib]) 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; do - if test -f "$p/libssl.a" -o -f "$p/libssl.so"; then - ap_ssltk_libdir="$p" - break + if test "x$ap_ssltk_type" = "x"; then + dnl First check for manditory headers + AC_CHECK_HEADERS([openssl/opensslv.h openssl/ssl.h], [ap_ssltk_type="openssl"], []) + if test "$ap_ssltk_type" = "openssl"; then + dnl so it's OpenSSL - test for a good version + AC_MSG_CHECKING([for OpenSSL version]) + 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 +#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!]) + ]) + else + AC_MSG_RESULT([no OpenSSL headers found]) fi - done - if test ".$ap_ssltk_libdir" = .; then - AC_MSG_ERROR([OpenSSL libraries not found]) fi - AC_MSG_RESULT($ap_ssltk_libdir) + if test "$ap_ssltk_type" != "openssl"; then + dnl Might be SSL-C - report, then test anything relevant + AC_CHECK_HEADERS([sslc.h], [ap_ssltk_type="sslc"], [ap_ssltk_type=""]) + if test "$ap_ssltk_type" = "sslc"; then + ap_ssltk_libs="-lsslc" + AC_MSG_CHECKING([for SSL-C version]) + AC_TRY_COMPILE([#include ],[ +#if !defined(SSLC_VERSION_NUMBER) +#error "Missing SSL-C version" +#endif +#if SSLC_VERSION_NUMBER < 0x2310 +#define stringize_ver(x) #x +#error "Insecure SSL-C version " stringize_ver(SSLC_VERSION_NUMBER) +#endif], + [AC_MSG_RESULT(OK)], + [dnl Replace this with SSLC_VERSION_NUMBER? + AC_MSG_RESULT([not encouraging]) + echo "WARNING: SSL-C version may contain security vulnerabilities!" + echo " Ensure the latest security patches have been applied!" + ]) + else + AC_MSG_RESULT([no SSL-C headers found]) + fi + fi + if test "x$ap_ssltk_type" = "x"; then + AC_MSG_ERROR([...No recognized SSL/TLS toolkit detected]) + fi - 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]) + if test "$ap_ssltk_type" = "openssl" -a "x$ap_ssltk_found" = "x"; then + ap_ssltk_found="yes" + ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`" 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]) - fi + APR_ADDTO(SSL_LIBS, [$ap_ssltk_libs]) + APR_ADDTO(LIBS, [$ap_ssltk_libs]) + APACHE_SUBST(SSL_LIBS) + + dnl Run library and function checks + liberrors="" + if test "$ap_ssltk_type" = "openssl"; then + 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]) + else + AC_CHECK_FUNCS([SSLC_library_version SSL_CTX_new], [], [liberrors="yes"]) + AC_CHECK_FUNCS(SSL_set_state) + fi + dnl restore + CPPFLAGS="$saved_CPPFLAGS" + LIBS="$saved_LIBS" + LDFLAGS="$saved_LDFLAGS" + if test "x$liberrors" != "x"; then + AC_MSG_ERROR([... Error, SSL/TLS libraries were missing or unusable]) + fi + + dnl Adjust apache's configuration based on what we found above. + dnl (a) define preprocessor symbols + if test "$ap_ssltk_type" = "openssl"; then + AC_DEFINE(HAVE_OPENSSL, 1, [Define if SSL is supported using OpenSSL]) + else + AC_DEFINE(HAVE_SSLC, 1, [Define if SSL is supported using SSL-C]) fi - APR_ADDTO(LIBS, [-lssl -lcrypto]) - ap_cv_ssltk="$ap_ssltk_base" fi ]) dnl -dnl APACHE_PARSE_ARGUMENTS -dnl a reimplementation of autoconf's argument parser, -dnl used here to allow us to co-exist layouts and argument based -dnl set ups. -AC_DEFUN(APACHE_PARSE_ARGUMENTS,[ -ac_prev= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi +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=PREFIX], + [Serf client library]), + [ + if test "$withval" = "yes" ; then + serf_prefix=/usr + else + serf_prefix=$withval + fi + ]) - ac_optarg=`expr "x$ac_option" : 'x[[^=]]*=\(.*\)'` - - case $ac_option in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - esac -done - -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [[\\/$]]* | ?:[[\\/]]* | NONE | '' ) ;; - *) AC_MSG_ERROR([expected an absolute path for --$ac_var: $ac_val]);; - esac -done + 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(INCLUDES, [-I$serf_prefix/include/serf-0]) + fi +]) -])dnl dnl dnl APACHE_EXPORT_ARGUMENTS @@ -675,3 +666,65 @@ 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=yes])]) + +if test "$ap_cv_void_ptr_lt_long" = "yes"; then + AC_MSG_ERROR([Size of "void *" is less than size of "long"]) +fi +])