httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/support config.m4
Date Sun, 30 Sep 2001 07:57:15 GMT
jerenkrantz    01/09/30 00:57:15

  Modified:    .        acinclude.m4 configure.in CHANGES
               modules  config5.m4
               server/mpm config.m4
               support  config.m4
  Log:
  Kill two autoconf-related birds with one commit.
  
  - substr used in APACHE_MODULE for the help string did not parse correctly
    with autoconf 2.50+ so we had to punt there anyway and use AC_HELP_STRING.
  - Add APACHE_HELP_STRING define that will call AC_HELP_STRING on 2.50+
    (actually not 2.13 - look at the regex call) or do our custom variation
    of it.  This function can't have any extra spaces or it will be returned
    in the help string.  So noted.  If anyone can figure out how to insert
    a line break like 2.50+ does when we go over the 26th column, I'd
    appreciate it.  I tried and I'm way too tired to figure it out now.
    Adding this would greatly simplify two or three HELP_STRING uses.
  - Switch all of those annoying WITH and ENABLE functions to use the
    APACHE_HELP_STRING.  This makes everything consistent now.  I've always
    had to go through and keep aligning everything every few months or so
    because I'm the only one who cares.  No more.  I refuse to do it any more!
    Use APACHE_HELP_STRING or be crucified.
  
  Looks decent with autoconf-2.13 and autoconf-2.52.
  
  Revision  Changes    Path
  1.101     +13 -6     httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- acinclude.m4	2001/09/06 18:22:46	1.100
  +++ acinclude.m4	2001/09/30 07:57:14	1.101
  @@ -1,4 +1,11 @@
   
  +dnl APACHE_HELP_STRING(LHS, RHS)
  +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
  +
   dnl APACHE_SUBST(VARIABLE)
   dnl Makes VARIABLE available in generated files
   dnl (do not use @variable@ in Makefiles, but $(variable))
  @@ -200,8 +207,8 @@
   dnl
   AC_DEFUN(APACHE_MODULE,[
     AC_MSG_CHECKING(whether to enable mod_$1)
  -  define([optname],[  --]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
  -  AC_ARG_ENABLE(translit($1,_,-),optname() substr([                         ],len(optname()))$2,,enable_$1=ifelse($5,,maybe-all,$5))
  +  define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
  +  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
  @@ -312,7 +319,7 @@
   dnl
   AC_DEFUN(APACHE_ENABLE_LAYOUT,[
   AC_ARG_ENABLE(layout,
  -[  --enable-layout=LAYOUT],[
  +APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[
     LAYOUT=$enableval
   ])
   
  @@ -333,7 +340,7 @@
     module_default=yes
   
     AC_ARG_ENABLE(modules,
  -  [  --enable-modules=MODULE-LIST],[
  +  APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Modules to enable),[
       for i in $enableval; do
         if test "$i" = "all" -o "$i" = "most"; then
           module_selection=$i
  @@ -344,7 +351,7 @@
     ])
     
     AC_ARG_ENABLE(mods-shared,
  -  [  --enable-mods-shared=MODULE-LIST],[
  +  APACHE_HELP_STRING(--enable-mod-shared=MODULE-LIST,Shared modules to enable),[
       for i in $enableval; do
         if test "$i" = "all" -o "$i" = "most"; then
           module_selection=$i
  @@ -378,7 +385,7 @@
   if test "x$ap_ssltk_base" = "x"; then
     AC_MSG_CHECKING(for SSL/TLS toolkit base)
     ap_ssltk_base=""
  -  AC_ARG_WITH(ssl, [  --with-ssl[=DIR]        SSL/TLS toolkit (OpenSSL)], [
  +  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"
       fi
  
  
  
  1.183     +11 -11    httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.182
  retrieving revision 1.183
  diff -u -r1.182 -r1.183
  --- configure.in	2001/09/25 15:58:52	1.182
  +++ configure.in	2001/09/30 07:57:14	1.183
  @@ -248,11 +248,11 @@
   bindprocessor \
   )
   
  -AC_ARG_WITH(port,[  --with-port=PORT        Port on which to listen (default is 80)],
  +AC_ARG_WITH(port,APACHE_HELP_STRING(--with-port=PORT,Port on which to listen (default is
80)),
           [if test "$withval" = "yes"; then AC_MSG_ERROR('option --with-port requires a value
(the TCP port number)'); else PORT="$withval"; fi],
   	[PORT=80])
   
  -AC_ARG_ENABLE(maintainer-mode,[  --enable-maintainer-mode  Turn on debugging and compile
time warnings],
  +AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn on debugging
and compile time warnings),
   [
     APR_ADDTO(CPPFLAGS, -DAP_DEBUG)
   ])dnl
  @@ -299,41 +299,41 @@
   APACHE_SUBST(shared_build)
   
   AC_ARG_WITH(program-name,
  -[  --with-program-name     alternate executable name],[
  +APACHE_HELP_STRING(--with-program-name,alternate executable name),[
     progname="$withval" ], [
     progname="httpd"] )
   
   # SuExec parameters
   AC_ARG_WITH(suexec-caller,
  -[  --with-suexec-caller    User allowed to call SuExec],[
  +APACHE_HELP_STRING(--with-suexec-caller,User allowed to call SuExec),[
     AC_DEFINE_UNQUOTED(AP_HTTPD_USER, "$withval", [User allowed to call SuExec] ) ] )
   
   AC_ARG_WITH(suexec-userdir,
  -[  --with-suexec-userdir   User subdirectory],[
  +APACHE_HELP_STRING(--with-suexec-userdir,User subdirectory),[
     AC_DEFINE_UNQUOTED(AP_USERDIR_SUFFIX, "$withval", [User subdirectory] ) ] )
   
   AC_ARG_WITH(suexec-docroot,
  -[  --with-suexec-docroot   SuExec root directory],[
  +APACHE_HELP_STRING(--with-suexec-docroot,SuExec root directory),[
     AC_DEFINE_UNQUOTED(AP_DOC_ROOT, "$withval", [SuExec root directory] ) ] )
   
   AC_ARG_WITH(suexec-uidmin,
  -[  --with-suexec-uidmin    Minimal allowed UID],[
  +APACHE_HELP_STRING(--with-suexec-uidmin,Minimal allowed UID),[
     AC_DEFINE_UNQUOTED(AP_UID_MIN, $withval, [Minimum allowed UID] ) ] )
   
   AC_ARG_WITH(suexec-gidmin,
  -[  --with-suexec-gidmin    Minimal allowed GID],[
  +APACHE_HELP_STRING(--with-suexec-gidmin,Minimal allowed GID),[
     AC_DEFINE_UNQUOTED(AP_GID_MIN, $withval, [Minimum allowed GID] ) ] )
   
   AC_ARG_WITH(suexec-logfile,
  -[  --with-suexec-logfile   Set the logfile],[
  +APACHE_HELP_STRING(--with-suexec-logfile,Set the logfile),[
     AC_DEFINE_UNQUOTED(AP_LOG_EXEC, "$withval", [SuExec log file] ) ] )
   
   AC_ARG_WITH(suexec-safepath,
  -[  --with-suexec-safepath  Set the safepath],[
  +APACHE_HELP_STRING(--with-suexec-safepath,Set the safepath),[
     AC_DEFINE_UNQUOTED(AP_SAFE_PATH, "$withval", [safe shell path for SuExec] ) ] )
   
   AC_ARG_WITH(suexec-umask,
  -[  --with-suexec-umask     umask for suexec'd process],[
  +APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[
     AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
   
   dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need
  
  
  
  1.375     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.374
  retrieving revision 1.375
  diff -u -r1.374 -r1.375
  --- CHANGES	2001/09/29 08:53:30	1.374
  +++ CHANGES	2001/09/30 07:57:14	1.375
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.26-dev
   
  +  *) Allow configure help strings to work with autoconf 2.50+ and 2.13.
  +     [Justin Erenkrantz]
  +
     *) Rewrite the input filtering mechanisms to consolidate and reorganize
        code.  In short, core_input_filter does something now and
        ap_http_filter is now only concerned with HTTP.  [Justin Erenkrantz]
  
  
  
  1.2       +2 -2      httpd-2.0/modules/config5.m4
  
  Index: config5.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/config5.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config5.m4	2001/04/09 05:18:40	1.1
  +++ config5.m4	2001/09/30 07:57:15	1.2
  @@ -1,7 +1,7 @@
   AC_MSG_CHECKING(for extra modules)
   AC_ARG_WITH(module,
  -  [  --with-module=location  Include the specified module.  location is the
  -                          path to the new module.],
  +  APACHE_HELP_STRING(--with-module=location,Include the specified module.  location is
the
  +                          path to the new module.),
     [
       modtype=`echo $withval | sed -e's/\(.*\):.*/\1/'`
       pkg=`echo $withval | sed -e's/.*:\(.*\)/\1/'`
  
  
  
  1.38      +2 -2      httpd-2.0/server/mpm/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/config.m4,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- config.m4	2001/08/07 20:13:58	1.37
  +++ config.m4	2001/09/30 07:57:15	1.38
  @@ -1,7 +1,7 @@
   AC_MSG_CHECKING(which MPM to use)
   AC_ARG_WITH(mpm,
  -[  --with-mpm=MPM          Choose the process model for Apache to use.
  -                          MPM={beos,worker,threaded,prefork,spmt_os2,perchild}],[
  +APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use.
  +                          MPM={beos|worker|threaded|prefork|spmt_os2|perchild}),[
     APACHE_MPM=$withval
   ],[
     if test "x$APACHE_MPM" = "x"; then
  
  
  
  1.2       +5 -5      httpd-2.0/support/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/config.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.m4	2001/09/28 04:19:39	1.1
  +++ config.m4	2001/09/30 07:57:15	1.2
  @@ -9,35 +9,35 @@
   dnl XXX Should we change the foo_LTFLAGS="-static" settings below
   dnl to something like APR_ADDTO? -aaron
   
  -AC_ARG_ENABLE(static-htpasswd,[  --enable-static-htpasswd  Build a statically linked version
of htpasswd],[
  +AC_ARG_ENABLE(static-htpasswd,APACHE_HELP_STRING(--enable-static-htpasswd,Build a statically
linked version of htpasswd),[
   if test "$enableval" = "yes" ; then
     htpasswd_LTFLAGS="-static"
   fi
   ])
   APACHE_SUBST(htpasswd_LTFLAGS)
   
  -AC_ARG_ENABLE(static-htdigest,[  --enable-static-htdigest  Build a statically linked version
of htdigest],[
  +AC_ARG_ENABLE(static-htdigest,APACHE_HELP_STRING(--enable-static-htdigest,Build a statically
linked version of htdigest),[
   if test "$enableval" = "yes" ; then
     htdigest_LTFLAGS="-static"
   fi
   ])
   APACHE_SUBST(htdigest_LTFLAGS)
   
  -AC_ARG_ENABLE(static-rotatelogs,[  --enable-static-rotatelogs  Build a statically linked
version of rotatelogs],[
  +AC_ARG_ENABLE(static-rotatelogs,APACHE_HELP_STRING(--enable-static-rotatelogs,Build a statically
linked version of rotatelogs),[
   if test "$enableval" = "yes" ; then
     rotatelogs_LTFLAGS="-static"
   fi
   ])
   APACHE_SUBST(rotatelogs_LTFLAGS)
   
  -AC_ARG_ENABLE(static-logresolve,[  --enable-static-logresolve  Build a statically linked
version of logresolve],[
  +AC_ARG_ENABLE(static-logresolve,APACHE_HELP_STRING(--enable-static-logresolve,Build a statically
linked version of logresolve),[
   if test "$enableval" = "yes" ; then
     logresolve_LTFLAGS="-static"
   fi
   ])
   APACHE_SUBST(logresolve_LTFLAGS)
   
  -AC_ARG_ENABLE(static-ab,[  --enable-static-ab      Build a statically linked version of
ab],[
  +AC_ARG_ENABLE(static-ab,APACHE_HELP_STRING(--enable-static-ab,Build a statically linked
version of ab),[
   if test "$enableval" = "yes" ; then
     ab_LTFLAGS="-static"
   fi
  
  
  

Mime
View raw message