X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=acinclude.m4;h=852f5333e789c5b0491327b70a967f1453a59963;hb=7ae5a61329fd7bd6a50c8979ca5ce830557f3835;hp=f4a165a298e4b629b3b265715a8acf62e0e0d41b;hpb=6f768ff39bcafe5e42f404e34d3025630d8abfe6;p=apache

diff --git a/acinclude.m4 b/acinclude.m4
index f4a165a298..852f5333e7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,8 +79,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(MODULE_DIRS)
   APACHE_SUBST(MODULE_CLEANDIRS)
   APACHE_SUBST(PORT)
-  APACHE_SUBST(nonssl_listen_stmt_1)
-  APACHE_SUBST(nonssl_listen_stmt_2)
+  APACHE_SUBST(SSLPORT)
   APACHE_SUBST(CORE_IMPLIB_FILE)
   APACHE_SUBST(CORE_IMPLIB)
   APACHE_SUBST(SH_LIBS)
@@ -183,6 +182,9 @@ AC_DEFUN(APACHE_MODPATH_ADD,[
 $libname: $objects
 	\$(MOD_LINK) $objects $5
 EOF
+      if test ! -z "$5"; then
+        APR_ADDTO(AP_LIBS, [$5])
+      fi
     else
       apache_need_shared=yes
       libname="mod_$1.la"
@@ -196,6 +198,68 @@ EOF
   fi
 ])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<<EOF
+$libname: $objects
+	\$(MOD_LINK) $objects
+DISTCLEAN_TARGETS = modules.mk
+static = $libname
+shared =
+EOF
+        else
+            apache_need_shared=yes
+            libname="mod_mpm_$1.la"
+            shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+            cat >$mpmpath/modules.mk<<EOF
+$libname: $shobjects
+	\$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects $6
+DISTCLEAN_TARGETS = modules.mk
+static =
+shared = $libname
+EOF
+            # add default MPM to LoadModule list
+            if test $1 = $default_mpm; then
+                DSO_MODULES="$DSO_MODULES mpm_$1"
+            fi
+        fi
+        $4
+    fi
+])dnl
+
 dnl
 dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 dnl
@@ -208,7 +272,8 @@ dnl   ""     -- disabled under default, most. enabled explicitly or with all.
 dnl
 dnl basically: yes/no is a hard setting. "most" means follow the "most"
 dnl            setting. otherwise, fall under the "all" setting.
-dnl            explicit yes/no always overrides.
+dnl            explicit yes/no always overrides, except if the user selects
+dnl            "reallyall".
 dnl
 AC_DEFUN(APACHE_MODULE,[
   AC_MSG_CHECKING(whether to enable mod_$1)
@@ -216,32 +281,42 @@ AC_DEFUN(APACHE_MODULE,[
   AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5))
   undefine([optname])dnl
   _apmod_extra_msg=""
-  dnl When --enable-modules=most is set and the module was not explicitly
-  dnl requested, allow a module to disable itself if its pre-reqs fail.
-  if test "$module_selection" = "most" -a "$enable_$1" = "most"; then
+  dnl When --enable-modules=most or --enable-modules=reallyall is set and the
+  dnl module was not explicitly requested, allow a module to disable itself if
+  dnl its pre-reqs fail.
+  dnl XXX: Todo: Allow to disable specific modules even with "reallyall".
+  if test "$module_selection" = "most" -a "$enable_$1" = "most" ||
+     test "$module_selection" = "reallyall" -a "$enable_$1" != "yes" -a \
+          "$enable_$1" != "static"
+  then
     _apmod_error_fatal="no"
   else
     _apmod_error_fatal="yes"
   fi
   if test "$enable_$1" = "static"; then
-    enable_$1=yes
+    enable_$1=static
   elif test "$enable_$1" = "yes"; then
     enable_$1=$module_default
-    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_$1" = "most"; then
-    if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+    if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+            "$module_selection" = "reallyall"
+    then
       enable_$1=$module_default
-      _apmod_extra_msg=" ($module_selection)"
-    elif test "$enable_$1" != "yes"; then
+    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
       enable_$1=no
     fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_$1" = "maybe-all"; then
-    if test "$module_selection" = "all"; then
+    if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
       enable_$1=$module_default
-      _apmod_extra_msg=" (all)"
+      _apmod_extra_msg=" ($module_selection)"
     else
       enable_$1=no
     fi
+  elif test "$enable_$1" = "no" -a "$module_selection" = "reallyall"; then
+      enable_$1=$module_default
+      _apmod_extra_msg=" ($module_selection)"
   fi
   if test "$enable_$1" != "no"; then
     dnl If we plan to enable it, allow the module to run some autoconf magic
@@ -260,18 +335,18 @@ AC_DEFUN(APACHE_MODULE,[
   AC_MSG_RESULT($enable_$1$_apmod_extra_msg)
   if test "$enable_$1" != "no"; then
     case "$enable_$1" in
-    shared*)
-      enable_$1=`echo $enable_$1|sed 's/shared,*//'`
-      sharedobjs=yes
-      shared=yes
-      DSO_MODULES="$DSO_MODULES $1"
-      ;;
-    *)
+    static*)
       MODLIST="$MODLIST ifelse($4,,$1,$4)"
       if test "$1" = "so"; then
           sharedobjs=yes
       fi
       shared="";;
+    *)
+      enable_$1=`echo $enable_$1|sed 's/shared,*//'`
+      sharedobjs=yes
+      shared=yes
+      DSO_MODULES="$DSO_MODULES $1"
+      ;;
     esac
     define([modprefix], [MOD_]translit($1, [a-z-], [A-Z_]))
     APACHE_MODPATH_ADD($1, $shared, $3,, [\$(]modprefix[_LDADD)])
@@ -284,30 +359,42 @@ dnl
 dnl APACHE_ENABLE_MODULES
 dnl
 AC_DEFUN(APACHE_ENABLE_MODULES,[
-  module_selection=default
-  module_default=yes
+  module_selection=most
+  module_default=shared
+
+  dnl Check whether we have DSO support.
+  dnl If "yes", we build shared modules by default.
+  APR_CHECK_APR_DEFINE(APR_HAS_DSO)
+
+  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
+
 
   AC_ARG_ENABLE(modules,
-  APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Space-separated list of modules to enable | "all" | "most" | "none"),[
+  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"; then
+        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=yes"
+          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"),[
+  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
@@ -316,6 +403,19 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[
       fi
     done
   ])
+  
+  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" -o "$i" = "few"; then
+        module_selection=$i
+        module_default=static
+      else
+        i=`echo $i | sed 's/-/_/g'`
+    	eval "enable_$i=static"
+      fi
+    done
+  ])
 ])
 
 AC_DEFUN(APACHE_REQUIRE_CXX,[
@@ -335,13 +435,13 @@ dnl
 AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[
 if test "x$ap_ssltk_configured" = "x"; then
   dnl initialise the variables we use
+  ap_ssltk_found=""
   ap_ssltk_base=""
-  ap_ssltk_inc=""
-  ap_ssltk_lib=""
+  ap_ssltk_libs=""
   ap_ssltk_type=""
 
   dnl Determine the SSL/TLS toolkit's base directory, if any
-  AC_MSG_CHECKING(for SSL/TLS toolkit base)
+  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
@@ -364,21 +464,49 @@ if test "x$ap_ssltk_configured" = "x"; then
   fi
 
   dnl Run header and version checks
-  saved_CPPFLAGS=$CPPFLAGS
-  if test "x$ap_ssltk_base" != "x"; then
-    ap_ssltk_inc="-I$ap_ssltk_base/include"
-    CPPFLAGS="$CPPFLAGS $ap_ssltk_inc"
-    # Ensure that the given path is used by pkg-config too, otherwise
-    # 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
+  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
+  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
   fi
   if test "x$ap_ssltk_type" = "x"; then
-    AC_MSG_CHECKING(for OpenSSL version)
     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 <openssl/opensslv.h>],[
 #if !defined(OPENSSL_VERSION_NUMBER)
 #error "Missing openssl version"
@@ -390,28 +518,19 @@ if test "x$ap_ssltk_configured" = "x"; then
       [AC_MSG_RESULT(OK)],
       [dnl Replace this with OPENSSL_VERSION_TEXT from opensslv.h?
        AC_MSG_RESULT([not encouraging])
-       echo "WARNING: OpenSSL version may contain security vulnerabilities!"
-       echo "         Ensure the latest security patches have been applied!"
+       AC_MSG_WARN([OpenSSL version may contain security vulnerabilities!]
+                   [ Ensure the latest security patches have been applied!])
       ])
-      dnl Look for additional, possibly missing headers
-      AC_CHECK_HEADERS(openssl/engine.h)
-      if test -n "$PKGCONFIG"; then
-        $PKGCONFIG openssl
-        if test $? -eq 0; then
-          ap_ssltk_inc="$ap_ssltk_inc `$PKGCONFIG --cflags-only-I openssl`"
-          CPPFLAGS="$CPPFLAGS $ap_ssltk_inc"
-        fi
-      fi
     else
       AC_MSG_RESULT([no OpenSSL headers found])
     fi
   fi
   if test "$ap_ssltk_type" != "openssl"; then
     dnl Might be SSL-C - report, then test anything relevant
-    AC_MSG_CHECKING(for SSL-C version)
     AC_CHECK_HEADERS([sslc.h], [ap_ssltk_type="sslc"], [ap_ssltk_type=""])
     if test "$ap_ssltk_type" = "sslc"; then
-      AC_MSG_CHECKING(for SSL-C version)
+      ap_ssltk_libs="-lsslc"
+      AC_MSG_CHECKING([for SSL-C version])
       AC_TRY_COMPILE([#include <sslc.h>],[
 #if !defined(SSLC_VERSION_NUMBER)
 #error "Missing SSL-C version"
@@ -430,40 +549,32 @@ if test "x$ap_ssltk_configured" = "x"; then
       AC_MSG_RESULT([no SSL-C headers found])
     fi
   fi
-  dnl restore
-  CPPFLAGS=$saved_CPPFLAGS
   if test "x$ap_ssltk_type" = "x"; then
     AC_MSG_ERROR([...No recognized SSL/TLS toolkit detected])
   fi
 
-  dnl Run library and function checks
-  saved_LDFLAGS=$LDFLAGS
-  saved_LIBS=$LIBS
-  if test "x$ap_ssltk_base" != "x"; then
-    if test -d "$ap_ssltk_base/lib"; then
-      ap_ssltk_lib="$ap_ssltk_base/lib"
-    else
-      ap_ssltk_lib="$ap_ssltk_base"
-    fi
-    LDFLAGS="$LDFLAGS -L$ap_ssltk_lib"
+  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
-  dnl make sure "other" flags are available so libcrypto and libssl can link
-  LIBS="$LIBS `$apr_config --libs`"
+  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_LIB(crypto, SSLeay_version, [], [liberrors="yes"])
-    AC_CHECK_LIB(ssl, SSL_CTX_new, [], [liberrors="yes"])
-    AC_CHECK_FUNCS(ENGINE_init)
-    AC_CHECK_FUNCS(ENGINE_load_builtin_engines)
+    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_LIB(sslc, SSLC_library_version, [], [liberrors="yes"])
-    AC_CHECK_LIB(sslc, SSL_CTX_new, [], [liberrors="yes"])
+    AC_CHECK_FUNCS([SSLC_library_version SSL_CTX_new], [], [liberrors="yes"])
     AC_CHECK_FUNCS(SSL_set_state)
   fi
-  AC_CHECK_FUNCS(SSL_set_cert_store)
   dnl restore
-  LDFLAGS=$saved_LDFLAGS
-  LIBS=$saved_LIBS
+  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
@@ -475,34 +586,51 @@ if test "x$ap_ssltk_configured" = "x"; then
   else
     AC_DEFINE(HAVE_SSLC, 1, [Define if SSL is supported using SSL-C])
   fi
-  dnl (b) hook up include paths
-  if test "x$ap_ssltk_inc" != "x"; then
-    APR_ADDTO(INCLUDES, [$ap_ssltk_inc])
-  fi
-  dnl (c) hook up linker paths
-  if test "x$ap_ssltk_lib" != "x"; then
-    APR_ADDTO(LDFLAGS, ["-L$ap_ssltk_lib"])
-    if test "x$ap_platform_runtime_link_flag" != "x"; then
-      APR_ADDTO(LDFLAGS, ["$ap_platform_runtime_link_flag$ap_ssltk_lib"])
-    fi
-  fi
-  # Put SSL libraries in SSL_LIBS.
-  if test "$ap_ssltk_type" = "openssl"; then
-    APR_SETVAR(SSL_LIBS, [-lssl -lcrypto])
-    if test -n "$PKGCONFIG"; then
-      $PKGCONFIG openssl
-      if test $? -eq 0; then
-        ap_ssltk_libdep=`$PKGCONFIG --libs openssl`
-        APR_ADDTO(SSL_LIBS, $ap_ssltk_libdep)
-      fi
+fi
+])
+
+dnl
+dnl APACHE_CHECK_SERF
+dnl
+dnl Configure for the detected libserf, giving preference to
+dnl "--with-serf=<path>" 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
+    ])
+
+    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
-  else
-    APR_SETVAR(SSL_LIBS, [-lsslc])
+  ])
+
+  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
-  APACHE_SUBST(SSL_LIBS)
-fi
 ])
 
+
 dnl
 dnl APACHE_EXPORT_ARGUMENTS
 dnl Export (via APACHE_SUBST) the various path-related variables that
@@ -588,15 +716,15 @@ dnl integer type.
 dnl
 AC_DEFUN([APACHE_CHECK_VOID_PTR_LEN], [
 
-AC_CACHE_CHECK([for void pointer length], [ap_void_ptr_lt_long],
+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_void_ptr_lt_long=no], [ap_void_ptr_lt_long=yes], 
-    [ap_void_ptr_lt_long=yes])])
+}], [ap_cv_void_ptr_lt_long=no], [ap_cv_void_ptr_lt_long=yes], 
+    [ap_cv_void_ptr_lt_long=yes])])
 
-if test "$ap_void_ptr_lt_long" = "yes"; then
+if test "$ap_cv_void_ptr_lt_long" = "yes"; then
     AC_MSG_ERROR([Size of "void *" is less than size of "long"])
 fi
 ])