httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r956221 - in /httpd/httpd/trunk: CHANGES acinclude.m4 modules/cache/config.m4 modules/proxy/config.m4
Date Sat, 19 Jun 2010 12:36:57 GMT
Author: sf
Date: Sat Jun 19 12:36:57 2010
New Revision: 956221

URL: http://svn.apache.org/viewvc?rev=956221&view=rev
Log:
- Add reallyall option to configure to build everything that can be built with
  the available libs.
- Remove redundant --with-distcache option. Simply enable distcache if
  mod_socache_dc is selected.
- Enable serf support by default if serf is available in /usr.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/acinclude.m4
    httpd/httpd/trunk/modules/cache/config.m4
    httpd/httpd/trunk/modules/proxy/config.m4

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=956221&r1=956220&r2=956221&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Jun 19 12:36:57 2010
@@ -46,6 +46,8 @@ Changes with Apache 2.3.6
      Cache-Control header, and arbitrarily denied if both headers were missing.
      [Graham Leggett]
 
+  *) configure: Add reallyall option for --enable-mods-shared. [Stefan Fritsch]
+
   *) core: Add microsecond timestamp fractions, process id and thread id
      to the error log. [Rainer Jung]
 

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=956221&r1=956220&r2=956221&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Sat Jun 19 12:36:57 2010
@@ -274,7 +274,8 @@ dnl   ""     -- disabled under default, 
 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)
@@ -282,9 +283,14 @@ 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"
@@ -294,19 +300,25 @@ AC_DEFUN(APACHE_MODULE,[
   elif test "$enable_$1" = "yes"; then
     enable_$1=$module_default
   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
     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
@@ -363,13 +375,14 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[
 
 
   AC_ARG_ENABLE(modules,
-  APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Space-separated list of modules to enable
| "all" | "most" | "few" | "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" -o "$i" = "few"; 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'`
@@ -380,9 +393,10 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[
   ])
   
   AC_ARG_ENABLE(mods-shared,
-  APACHE_HELP_STRING(--enable-mods-shared=MODULE-LIST,Space-separated list of shared modules
to enable | "all" | "most" | "few"),[
+  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" -o "$i" = "few"; then
+      if test "$i" = "all" -o "$i" = "most" -o "$i" = "few" -o "$i" = "reallyall"
+      then
         module_selection=$i
         module_default=shared
       else
@@ -586,7 +600,7 @@ dnl
 AC_DEFUN([APACHE_CHECK_SERF], [
   AC_CACHE_CHECK([for libserf], [ac_cv_serf], [
     ac_cv_serf=no
-    serf_prefix=no
+    serf_prefix=/usr
     SERF_LIBS=""
     AC_ARG_WITH(serf, APACHE_HELP_STRING([--with-serf=PREFIX],
                                     [Serf client library]),

Modified: httpd/httpd/trunk/modules/cache/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/config.m4?rev=956221&r1=956220&r2=956221&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/config.m4 (original)
+++ httpd/httpd/trunk/modules/cache/config.m4 Sat Jun 19 12:36:57 2010
@@ -16,43 +16,11 @@ APACHE_MODULE(cache, dynamic file cachin
 APACHE_MODULE(disk_cache, disk caching module, , , most)
 
 AC_DEFUN([CHECK_DISTCACHE], [
-  AC_MSG_CHECKING(whether Distcache is required)
-  ap_ssltk_dc="no"
-  tmp_nomessage=""
-  tmp_forced="no"
-  AC_ARG_ENABLE(distcache,
-    APACHE_HELP_STRING(--enable-distcache,Enable distcache support),
-    ap_ssltk_dc="$enableval"
-    tmp_nomessage=""
-    tmp_forced="yes"
-    if test "x$ap_ssltk_dc" = "x"; then
-      ap_ssltk_dc="yes"
-      dnl our "error"s become "tests revealed that..."
-      tmp_forced="no"
-    fi
-    if test "$ap_ssltk_dc" != "yes" -a "$ap_ssltk_dc" != "no"; then
-      tmp_nomessage="--enable-distcache had illegal syntax - disabling"
-      ap_ssltk_dc="no"
-    fi)
-  if test "$tmp_forced" = "no"; then
-    AC_MSG_RESULT($ap_ssltk_dc (default))
-  else
-    AC_MSG_RESULT($ap_ssltk_dc (specified))
-  fi
-  if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno" -a "x$tmp_nomessage" != "x"; then
-    AC_MSG_ERROR(distcache support failed: $tmp_nomessage)
-  fi
-  if test "$ap_ssltk_dc" = "yes"; then
-    AC_CHECK_HEADER(
-      [distcache/dc_client.h],
-      [],
-      [tmp_nomessage="can't include distcache headers"
-      ap_ssltk_dc="no"])
-    if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
-      AC_MSG_ERROR(distcache support failed: $tmp_nomessage)
-    fi
-  fi
-  if test "$ap_ssltk_dc" = "yes"; then
+  AC_CHECK_HEADER(
+    [distcache/dc_client.h],
+    [have_distcache=yes],
+    [have_distcache=no])
+  if test "$have_distcache" = "yes"; then
     AC_MSG_CHECKING(for Distcache version)
     AC_TRY_COMPILE(
 [#include <distcache/dc_client.h>],
@@ -60,14 +28,10 @@ AC_DEFUN([CHECK_DISTCACHE], [
 #error "distcache API version is unrecognised"
 #endif],
 [],
-[tmp_nomessage="distcache has an unsupported API version"
-ap_ssltk_dc="no"])
-    AC_MSG_RESULT($ap_ssltk_dc)
-    if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
-      AC_MSG_ERROR(distcache support failed: $tmp_nomessage)
-    fi
+[have_distcache=no])
+    AC_MSG_RESULT($have_distcache)
   fi
-  if test "$ap_ssltk_dc" = "yes"; then
+  if test "$have_distcache" = "yes"; then
     AC_MSG_CHECKING(for Distcache libraries)
     save_libs=$LIBS
     LIBS="$LIBS -ldistcache -lnal"
@@ -75,16 +39,15 @@ ap_ssltk_dc="no"])
       [#include <distcache/dc_client.h>],
       [DC_CTX *foo = DC_CTX_new((const char *)0,0);],
       [],
-      [tmp_no_message="failed to link with distcache libraries"
-      ap_ssltk_dc="no"])
+      [have_distcache=no])
     LIBS=$save_libs
-    AC_MSG_RESULT($ap_ssltk_dc)
-    if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
-      AC_MSG_ERROR(distcache support failed: $tmp_nomessage)
-    else
-      APR_ADDTO(MOD_SOCACHE_LDADD, [-ldistcache -lnal])
-      AC_DEFINE(HAVE_DISTCACHE, 1, [Define if distcache support is enabled])
-    fi
+    AC_MSG_RESULT($have_distcache)
+  fi
+  if test "$have_distcache" = "yes"; then
+    APR_ADDTO(MOD_SOCACHE_LDADD, [-ldistcache -lnal])
+    AC_DEFINE(HAVE_DISTCACHE, 1, [Define if distcache support is enabled])
+  else
+    enable_socache_dc=no
   fi
 ])
 

Modified: httpd/httpd/trunk/modules/proxy/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/config.m4?rev=956221&r1=956220&r2=956221&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/config.m4 (original)
+++ httpd/httpd/trunk/modules/proxy/config.m4 Sat Jun 19 12:36:57 2010
@@ -64,7 +64,7 @@ APACHE_MODULE(serf, [Reverse proxy modul
     if test "$ac_cv_serf" = "yes" ; then
       APR_SETVAR(MOD_SERF_LDADD, [\$(SERF_LIBS)])
     else
-      AC_MSG_ERROR("libserf not found")
+      enable_serf=no
     fi
 ])
 



Mime
View raw message