cvs commit: apache-2.0/src/modules/extra Makefile.in config.m4

[rb...@locus.apache.org]

rbb         00/03/13 10:45:35

  Modified:    src      CHANGES
  Added:       src/modules/extra Makefile.in config.m4
  Log:
  Add the ability to add external modules to the build process.  It is only
  good for static modules at this point, but that can be changed later.
  
  Revision  Changes    Path
  1.23      +8 -1      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- CHANGES	2000/03/13 03:16:49	1.22
  +++ CHANGES	2000/03/13 18:45:35	1.23
  @@ -1,4 +1,11 @@
  -Changes with Apache 2.0-dev
  +Changes with Apache 2.0a2-dev
  +
  +  *) Add ability to add external modules to the build process.  This is
  +     done with --with-module=/path/to/module.  Modules can only be added
  +     as static modules at this point.
  +     [Ryan Bloom]
  +
  +Changes with Apache 2.0a1-dev
   
     *) Fix FreeBSD 3.3 core dump.
        Basically, ap_initialize() needs to get called before 
  
  
  
  1.1                  apache-2.0/src/modules/extra/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  
  DEPTH     = ../..
  topsrcdir = @topsrcdir@
  srcdir    = @srcdir@
  VPATH     = @srcdir@
  
  include $(topsrcdir)/build/special.mk
  
  
  
  
  1.1                  apache-2.0/src/modules/extra/config.m4
  
  Index: config.m4
  ===================================================================
  dnl modules enabled in this directory by default
  
  APACHE_MODPATH_INIT(extra)
  
  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.],
    [
    if test ! -f $withval; then
      AC_MSG_RESULT(error in command)
    fi
    modfilec=`echo $withval | sed -e 's;^.*/;;'`
    modfileo=`echo $withval | sed -e 's;^.*/;;' -e 's;\.c$;.o;'`
    if test "x$withval" != "xmodules/extra/$modfilec"; then
        cp $withval modules/extra/$modfilec
    fi
    module=`echo $withval | sed -e 's;.*/mod_\(.*\).c;\1;'`
    objects="mod_$module.lo"
    libname="libapachemod_$module.la"
    BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
    modpath_static="$modpath_static $libname"
    cat >>$modpath_current/modules.mk<<EOF
  $libname: $objects
  	\$(LINK) $objects
  EOF
  
    AC_MSG_RESULT(added $withval)
    ],
    [ AC_MSG_RESULT(no extra modules) 
    ])
  
  APACHE_MODPATH_FINISH
  
  if test "$sharedobjs" = "yes"; then
      LIBS="$LIBS -ldl"
      LTFLAGS="$LTFLAGS -export-dynamic"
  fi
      
  APACHE_SUBST(STANDARD_LIBS)