You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2005/02/04 18:14:18 UTC
svn commit: r151372 - in httpd/httpd/branches/2.0.x: CHANGES
docs/manual/programs/configure.xml modules/config5.m4
Author: jerenkrantz
Date: Fri Feb 4 09:14:12 2005
New Revision: 151372
URL: http://svn.apache.org/viewcvs?view=rev&rev=151372
Log:
--with-module can now take more than one module to be statically
linked: --with-module=<modtype>:<modfile>,<modtype>:<modfile>,...
If the <modtype>-subdirectory doesn't exist it will be created and
populated with a standard Makefile.in.
MFC: 124600
Reviewed by: erikabele, jerenkrantz, fielding
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml
httpd/httpd/branches/2.0.x/modules/config5.m4
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?view=diff&r1=151371&r2=151372
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES (original)
+++ httpd/httpd/branches/2.0.x/CHANGES Fri Feb 4 09:14:12 2005
@@ -1,5 +1,10 @@
Changes with Apache 2.0.53
+ *) --with-module can now take more than one module to be statically
+ linked: --with-module=<modtype>:<modfile>,<modtype>:<modfile>,...
+ If the <modtype>-subdirectory doesn't exist it will be created and
+ populated with a standard Makefile.in. [Erik Abele]
+
*) Fix the RPM spec file so that an RPM build now works. An RPM
build now requires system installations of APR and APR-util.
Remove some arbitrary moving around of binaries - the RPM now
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml?view=diff&r1=151371&r2=151372
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml Fri Feb 4 09:14:12 2005
@@ -614,16 +614,17 @@
modules use the following options:</p>
<dl>
- <dt><code>--with-module=<var>module-type</var>:<var>module-file</var>
- </code></dt>
- <dd><p>Add a third-party module to the list of statically linked
+ <dt><code>--with-module=<var>module-type</var>:<var>module-file</var>[,
+ <var>module-type</var>:<var>module-file</var>]</code></dt>
+ <dd><p>Add one or more third-party modules to the list of statically linked
modules. The module source file <code><var>module-file</var></code>
will be searched in the <code>modules/<var>module-type</var></code>
- subdirectory of your Apache HTTP server source tree so it has to be
- placed there before. If it is not found here
- <code>configure</code> is considering <var>module-file</var> to be
+ subdirectory of your Apache HTTP server source tree. If it is not found
+ there <code>configure</code> is considering <var>module-file</var> to be
an absolute file path and tries to copy the source file into the
- <var>module-type</var> subdirectory.</p>
+ <var>module-type</var> subdirectory. If the subdirectory doesn't
+ exist it will be created and populated with a standard
+ <code>Makefile.in</code>.</p>
<p>This option is useful to add small external modules consisting of
one source file. For more complex modules you should read the
vendor's documentation.</p>
Modified: httpd/httpd/branches/2.0.x/modules/config5.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/config5.m4?view=diff&r1=151371&r2=151372
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/config5.m4 (original)
+++ httpd/httpd/branches/2.0.x/modules/config5.m4 Fri Feb 4 09:14:12 2005
@@ -3,18 +3,24 @@
APACHE_HELP_STRING(--with-module=module-type:module-file,
Enable module-file in the modules/<module-type> directory.),
[
- modtype=`echo $withval | sed -e's/\(.*\):.*/\1/'`
- pkg=`echo $withval | sed -e's/.*:\(.*\)/\1/'`
+ as_save_IFS="$IFS"; IFS=","
+ for mod in $withval
+ do
+ modtype=`echo $mod | sed -e's/\(.*\):.*/\1/'`
+ pkg=`echo $mod | sed -e's/.*:\(.*\)/\1/'`
modfilec=`echo $pkg | sed -e 's;^.*/;;'`
modfileo=`echo $pkg | sed -e 's;^.*/;;' -e 's;\.c$;.o;'`
-
- if test "x$withval" != "xmodules/$modtype/$modfilec"; then
- cp $pkg modules/$modtype/$modfilec
+ modpath_current="modules/$modtype"
+ if test "x$mod" != "x$modpath_current/$modfilec"; then
+ if test ! -d "$modpath_current"; then
+ mkdir $modpath_current
+ echo 'include $(top_srcdir)/build/special.mk' > $modpath_current/Makefile.in
+ fi
+ cp $pkg $modpath_current/$modfilec
fi
- module=`echo $pkg | sed -e 's;.*/mod_\(.*\).c;\1;'`
+ module=`echo $pkg | sed -e 's;\(.*/\)*mod_\(.*\).c;\2;'`
objects="mod_$module.lo"
libname="mod_$module.la"
- modpath_current="modules/$modtype"
BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
if test ! -s "$modpath_current/modules.mk"; then
cat >>$modpath_current/modules.mk<<EOF
@@ -37,9 +43,14 @@
mv $modpath_current/modules.mk.tmp $modpath_current/modules.mk
fi
MODLIST="$MODLIST $module"
+ EXTRA_MODLIST="$EXTRA_MODLIST $modtype:$modfilec"
MODULE_DIRS="$MODULE_DIRS $modtype"
APACHE_FAST_OUTPUT($modpath_current/Makefile)
- AC_MSG_RESULT(added $withval)
+ done
+ if test ! -z "$EXTRA_MODLIST"; then
+ AC_MSG_RESULT(added:$EXTRA_MODLIST)
+ fi
+ IFS="$as_save_IFS"
],
- [ AC_MSG_RESULT(no extra modules)
+ [ AC_MSG_RESULT(none)
])