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

[ma...@hyperreal.org]

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  Changes    Path
  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)