cvs commit: apache-2.0/src/modules/standard config.m4

[manoj]

manoj   99/12/05 21:01:33

  Modified:src/modules/standard config.m4
  Log:
  Add strucutre to autoconf-config system to allow modules to specify
  config tests to run if they are enabled.
  
  Revision  ChangesPath
  1.9   +8 -6  apache-2.0/src/modules/standard/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -d -u -r1.8 -r1.9
  --- config.m4 1999/12/06 04:44:07 1.8
  +++ config.m4 1999/12/06 05:01:32 1.9
  @@ -6,18 +6,19 @@
 STANDARD_LIBS="$STANDARD_LIBS libapachemod_$1.la"
   ])
   
  -dnl AC_DEFUN(modulename, modulestructname, defaultonoroff)
  +dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
   dnl XXX - Need to add help text to --enable-module flags
  -dnl XXX - Need to add support for per-module config
  +dnl XXX - Need to allow --enable-module to fail if optional config fails
   AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
   AC_MSG_CHECKING([whether to enable mod_$1])
   AC_ARG_ENABLE(patsubst([$1], _, -), [  --enable-]patsubst([$1], _, -), 
[],
   [enable_$1=]ifelse([$3], , no, [$3]))
  +AC_MSG_RESULT([$enable_$1])
   if test "$enable_[$1]" != "no" ; then
  +ifelse([$4], , :, [$4])
   MODLIST="$MODLIST ifelse([$2], , [$1], [$2])"
   STANDARD_MODULE([$1])
   fi
  -AC_MSG_RESULT([$enable_$1])
   ])
   
   APACHE_CHECK_STANDARD_MODULE(mmap_static, , no)
  @@ -49,9 +50,10 @@
   APACHE_CHECK_STANDARD_MODULE(expires, , no)
   APACHE_CHECK_STANDARD_MODULE(headers, , no)
   
  -AC_CHECK_HEADERS(sys/times.h)
  -AC_CHECK_FUNCS(times)
  -APACHE_CHECK_STANDARD_MODULE(usertrack, , no)
  +APACHE_CHECK_STANDARD_MODULE(usertrack, , no, [
  +  AC_CHECK_HEADERS(sys/times.h)
  +  AC_CHECK_FUNCS(times)
  +])
   
   APACHE_CHECK_STANDARD_MODULE(unique_id, , no)
   APACHE_CHECK_STANDARD_MODULE(so, , no)
  
  
  

cvs commit: apache-2.0/src/modules/standard config.m4

[manoj]

manoj   99/12/05 19:39:38

  Modified:src/modules/standard config.m4
  Log:
  Oops, changed the default status of mod_env for testing and committed
  it.
  
  Revision  ChangesPath
  1.7   +1 -1  apache-2.0/src/modules/standard/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -d -u -r1.6 -r1.7
  --- config.m4 1999/12/06 03:34:35 1.6
  +++ config.m4 1999/12/06 03:39:36 1.7
  @@ -20,7 +20,7 @@
   AC_MSG_RESULT([$enable_$1])
   ])
   
  -APACHE_CHECK_STANDARD_MODULE(env, , no)
  +APACHE_CHECK_STANDARD_MODULE(env, , yes)
   APACHE_CHECK_STANDARD_MODULE(log_config, config_log, yes)
   
   dnl ## mod_usertrack.c
  
  
  

cvs commit: apache-2.0/src/modules/standard config.m4

[manoj]

manoj   99/12/05 19:34:36

  Modified:src/modules/standard config.m4
  Log:
  Move the default status of module inclusion/exclusion into the
  STANDARD_MODULE macro, to make it a little more maintainable.
  
  Revision  ChangesPath
  1.6   +4 -5  apache-2.0/src/modules/standard/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -d -u -r1.5 -r1.6
  --- config.m4 1999/12/06 02:36:02 1.5
  +++ config.m4 1999/12/06 03:34:35 1.6
  @@ -1,6 +1,4 @@
   dnl modules enabled in this directory by default
  -default_env=yes
  -default_log_config=yes
   
   STANDARD_LIBS=""
   AC_DEFUN(STANDARD_MODULE,[
  @@ -8,12 +6,13 @@
 STANDARD_LIBS="$STANDARD_LIBS libapachemod_$1.la"
   ])
   
  +dnl AC_DEFUN(modulename, modulestructname, defaultonoroff)
   dnl XXX - Need to add help text to --enable-module flags
   dnl XXX - Need to add support for per-module config
   AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
   AC_MSG_CHECKING([whether to enable mod_$1])
   AC_ARG_ENABLE(patsubst([$1], _, -), [  --enable-]patsubst([$1], _, -), 
[],
  -[enable_$1=$default_$1])
  +[enable_$1=]ifelse([$3], , no, [$3]))
   if test "$enable_[$1]" != "no" ; then
   MODLIST="$MODLIST ifelse([$2], , [$1], [$2])"
   STANDARD_MODULE([$1])
  @@ -21,8 +20,8 @@
   AC_MSG_RESULT([$enable_$1])
   ])
   
  -APACHE_CHECK_STANDARD_MODULE(env)
  -APACHE_CHECK_STANDARD_MODULE(log_config, config_log)
  +APACHE_CHECK_STANDARD_MODULE(env, , no)
  +APACHE_CHECK_STANDARD_MODULE(log_config, config_log, yes)
   
   dnl ## mod_usertrack.c
   AC_CHECK_HEADERS(sys/times.h)
  
  
  

cvs commit: apache-2.0/src/modules/standard config.m4

[manoj]

manoj   99/12/05 18:36:03

  Modified:src/modules/standard config.m4
  Log:
  Make the call to configure a module a little simpler if the module
  struct's name is the same as the module's.
  
  Revision  ChangesPath
  1.5   +2 -2  apache-2.0/src/modules/standard/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -d -u -r1.4 -r1.5
  --- config.m4 1999/12/05 10:33:41 1.4
  +++ config.m4 1999/12/06 02:36:02 1.5
  @@ -15,13 +15,13 @@
   AC_ARG_ENABLE(patsubst([$1], _, -), [  --enable-]patsubst([$1], _, -), 
[],
   [enable_$1=$default_$1])
   if test "$enable_[$1]" != "no" ; then
  -MODLIST="$MODLIST $2"
  +MODLIST="$MODLIST ifelse([$2], , [$1], [$2])"
   STANDARD_MODULE([$1])
   fi
   AC_MSG_RESULT([$enable_$1])
   ])
   
  -APACHE_CHECK_STANDARD_MODULE(env, env)
  +APACHE_CHECK_STANDARD_MODULE(env)
   APACHE_CHECK_STANDARD_MODULE(log_config, config_log)
   
   dnl ## mod_usertrack.c
  
  
  

cvs commit: apache-2.0/src/modules/standard config.m4

[manoj]

manoj   99/12/05 00:54:40

  Modified:src  configure.in
   src/modules/mpm config.m4
   src/modules/standard config.m4
  Added:   src/helpers build-modules-c.awk
  Removed: src  modules.c
   src/modules config.m4
  Log:
  autoconf: Generate modules.c based on configuration. This is the first
  step to supporting selection of modules, and it seems to make --with-mpm
  actually work now.
  
  Revision  ChangesPath
  1.8   +5 -2  apache-2.0/src/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -d -u -r1.7 -r1.8
  --- configure.in  1999/12/01 04:57:07 1.7
  +++ configure.in  1999/12/05 08:54:37 1.8
  @@ -23,7 +23,7 @@
   
   dnl ## Check for programs
   
  -dnl AC_PROG_AWK
  +AC_PROG_AWK
   AC_PROG_CC
   AC_PROG_CPP
   AC_PROG_INSTALL
  @@ -120,5 +120,8 @@
   AC_SUBST(OS)
   AC_SUBST(OS_DIR)
   
  -AC_OUTPUT([Makefile ap/Makefile main/Makefile os/Makefile
  +dnl ## Build modules.c
  +rm -f $srcdir/modules.c
  +echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > 
$srcdir/modules.c
  +AC_OUTPUT([Makefile ap/Makefile main/Makefile modules/Makefile os/Makefile
 $APACHE_OUTPUT_FILES])
  
  
  
  1.1  apache-2.0/src/helpers/build-modules-c.awk
  
  Index: build-modules-c.awk
  ===
  BEGIN {
  RS = " "
  modules[n++] = "core"
  pmodules[pn++] = "core"
  } 
  { modules[n++] = $1 ; pmodules[pn++] = $1 } 
  END {
  print "/*"
  print " * modules.c --- automatically generated by Apache"
  print " * configuration script.  DO NOT HAND EDIT!"
  print " */"
  print ""
  print "#include \"httpd.h\""
  print "#include \"http_config.h\""
  print ""
  for (i = 0; i < pn; ++i) {
  printf ("extern module %s_module;\n", pmodules[i])
  }
  print ""
  print "/*"
  print " *  Modules which implicitly form the"
  print " *  list of activated modules on startup,"
  print " *  i.e. these are the modules which are"
  print " *  initially linked into the Apache processing"
  print " *  [extendable under run-time via AddModule]"
  print " */"
  print "module *ap_prelinked_modules[] = {"
  for (i = 0; i < n; ++i) {
  printf "  &%s_module,\n", modules[i]
  }
  print "  NULL"
  print "};"
  print ""
  print "/*"
  print " *  Modules which initially form the"
  print " *  list of available modules on startup,"
  print " *  i.e. these are the modules which are"
  print " *  initially loaded into the Apache process"
  print " *  [extendable under run-time via LoadModule]"
  print " */"
  print "module *ap_preloaded_modules[] = {"
  for (i = 0; i < pn; ++i) {
  printf "  &%s_module,\n", pmodules[i]
  }
  print "  NULL"
  print "};"
  print ""
  }
  
  
  
  1.2   +1 -0  apache-2.0/src/modules/mpm/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -u -r1.1 -r1.2
  --- config.m4 1999/11/29 23:46:28 1.1
  +++ config.m4 1999/12/05 08:54:39 1.2
  @@ -18,6 +18,7 @@
   MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
   
   AC_SUBST(MPM_NAME)
  +MODLIST="$MODLIST mpm_${MPM_NAME}"
   
   dnl All the unix MPMs use shared memory; save a little duplication
   AC_DEFUN(APACHE_MPM_CHECK_SHMEM, [
  
  
  
  1.3   +1 -0  apache-2.0/src/modules/standard/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -d -u -r1.2 -r1.3
  --- config.m4 1999/11/30 03:52:54 1.2
  +++ config.m4 1999/12/05 08:54:39 1.3
  @@ -3,4 +3,5 @@
   AC_CHECK_HEADERS(sys/times.h)
   AC_CHECK_FUNCS(times)
   
  +MODLIST="$MODLIST env config_log mime negotiation includes autoindex dir cgi 
asis imap action userdir alias access auth setenvif echo"
   APACHE_MODULE(standard)