You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@locus.apache.org on 2000/12/07 11:31:28 UTC
cvs commit: httpd-2.0/modules/mappers config.m4
gstein 00/12/07 02:31:26
Modified: modules/mappers config.m4
Log:
*) add check for mod_so
*) juse use APACHE_MODULE (the custom defun only saved a single arg)
*) toss AC_SUBST(STANDARD_LIBS) line; it isn't used/needed
Revision Changes Path
1.2 +23 -17 httpd-2.0/modules/mappers/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- config.m4 2000/12/04 21:38:46 1.1
+++ config.m4 2000/12/07 10:31:16 1.2
@@ -1,27 +1,33 @@
dnl modules enabled in this directory by default
-dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
-dnl XXX - Need to allow --enable-module to fail if optional config fails
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
-AC_DEFUN(APACHE_CHECK_MAPPERS_MODULE, [
- APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
-])
-
APACHE_MODPATH_INIT(mappers)
-APACHE_CHECK_MAPPERS_MODULE(vhost_alias, mass hosting module, , no)
-APACHE_CHECK_MAPPERS_MODULE(negotiation, content negoatiation, , yes)
-APACHE_CHECK_MAPPERS_MODULE(dir, directory request handling, , yes)
-APACHE_CHECK_MAPPERS_MODULE(imap, internal imagemaps, , yes)
-APACHE_CHECK_MAPPERS_MODULE(actions, Action triggering on requests, action, yes)
-APACHE_CHECK_MAPPERS_MODULE(speling, correct common URL misspellings, , no)
-APACHE_CHECK_MAPPERS_MODULE(userdir, mapping of user requests, , yes)
-APACHE_CHECK_MAPPERS_MODULE(alias, translation of requests, , yes)
+APACHE_MODULE(vhost_alias, mass hosting module, , , no)
+APACHE_MODULE(negotiation, content negoatiation, , , yes)
+APACHE_MODULE(dir, directory request handling, , , yes)
+APACHE_MODULE(imap, internal imagemaps, , , yes)
+APACHE_MODULE(actions, Action triggering on requests, , action, yes)
+APACHE_MODULE(speling, correct common URL misspellings, , , no)
+APACHE_MODULE(userdir, mapping of user requests, , , yes)
+APACHE_MODULE(alias, translation of requests, , , yes)
-APACHE_CHECK_MAPPERS_MODULE(rewrite, regex URL translation, , no, [
+APACHE_MODULE(rewrite, regex URL translation, , , no, [
EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_DBM_REWRITEMAP"
])
+dnl ### this isn't going to work quite right because of ordering issues
+dnl ### among the config.m4 files. it is possible that a *later* module
+dnl ### is marked as shared (thus setting sharedobjs), so we won't see
+dnl ### it here. we need to shift *this* config.m4 to be "last" or we
+dnl ### need to find a different way to set up this default and module spec.
+if test "$sharedobjs" = "yes"; then
+ APACHE_MODULE(so, DSO capability, , , yes)
+else
+ APACHE_MODULE(so, DSO capability, , , no)
+fi
+dnl ### why save the cache?
+AC_CACHE_SAVE
+
APACHE_MODPATH_FINISH
-
-APACHE_SUBST(STANDARD_LIBS)