manoj 99/12/05 20:44:08
Modified: src/modules/standard Makefile.am config.m4
Log:
Make most other modules selectable by autoconf's ./configure.
Revision Changes Path
1.4 +60 -10 apache-2.0/src/modules/standard/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -u -r1.3 -r1.4
--- Makefile.am 1999/12/05 10:33:41 1.3
+++ Makefile.am 1999/12/06 04:44:06 1.4
@@ -1,18 +1,68 @@
-# TODO - Modules should be selectable. Right now, the plan is to do this
-# by placing each module into its own subdirectory and placing a
-# config.m4 to allow or disallow it in there.
-
noinst_LTLIBRARIES = @STANDARD_LIBS@
EXTRA_LTLIBRARIES = \
+libapachemod_mmap_static.la \
+libapachemod_vhost_alias.la \
libapachemod_env.la \
libapachemod_log_config.la \
-libapachemod_standard.la
+libapachemod_mime.la \
+libapachemod_negotiation.la \
+libapachemod_status.la \
+libapachemod_include.la \
+libapachemod_autoindex.la \
+libapachemod_dir.la \
+libapachemod_cgi.la \
+libapachemod_asis.la \
+libapachemod_imap.la \
+libapachemod_actions.la \
+libapachemod_speling.la \
+libapachemod_userdir.la \
+libapachemod_alias.la \
+libapachemod_rewrite.la \
+libapachemod_access.la \
+libapachemod_auth.la \
+libapachemod_auth_anon.la \
+libapachemod_auth_dbm.la \
+libapachemod_auth_db.la \
+libapachemod_auth_digest.la \
+libapachemod_cern_meta.la \
+libapachemod_expires.la \
+libapachemod_headers.la \
+libapachemod_usertrack.la \
+libapachemod_unique_id.la \
+libapachemod_so.la \
+libapachemod_setenvif.la \
+libapachemod_echo.la
+libapachemod_mmap_static_la_SOURCES = mod_mmap_static.c
+libapachemod_vhost_alias_la_SOURCES = mod_vhost_alias.c
libapachemod_env_la_SOURCES = mod_env.c
libapachemod_log_config_la_SOURCES = mod_log_config.c
-libapachemod_standard_la_SOURCES = \
- mod_mime.c mod_negotiation.c \
- mod_include.c mod_autoindex.c mod_dir.c mod_cgi.c mod_asis.c \
- mod_imap.c mod_actions.c mod_speling.c mod_userdir.c mod_alias.c \
- mod_access.c mod_auth.c mod_setenvif.c mod_echo.c
+libapachemod_mime_la_SOURCES = mod_mime.c
+libapachemod_negotiation_la_SOURCES = mod_negotiation.c
+libapachemod_status_la_SOURCES = mod_status.c
+libapachemod_include_la_SOURCES = mod_include.c
+libapachemod_autoindex_la_SOURCES = mod_autoindex.c
+libapachemod_dir_la_SOURCES = mod_dir.c
+libapachemod_cgi_la_SOURCES = mod_cgi.c
+libapachemod_asis_la_SOURCES = mod_asis.c
+libapachemod_imap_la_SOURCES = mod_imap.c
+libapachemod_actions_la_SOURCES = mod_actions.c
+libapachemod_speling_la_SOURCES = mod_speling.c
+libapachemod_userdir_la_SOURCES = mod_userdir.c
+libapachemod_alias_la_SOURCES = mod_alias.c
+libapachemod_rewrite_la_SOURCES = mod_rewrite.c
+libapachemod_access_la_SOURCES = mod_access.c
+libapachemod_auth_la_SOURCES = mod_auth.c
+libapachemod_auth_anon_la_SOURCES = mod_auth_anon.c
+libapachemod_auth_dbm_la_SOURCES = mod_auth_dbm.c
+libapachemod_auth_db_la_SOURCES = mod_auth_db.c
+libapachemod_auth_digest_la_SOURCES = mod_auth_digest.c
+libapachemod_cern_meta_la_SOURCES = mod_cern_meta.c
+libapachemod_expires_la_SOURCES = mod_expires.c
+libapachemod_headers_la_SOURCES = mod_headers.c
+libapachemod_usertrack_la_SOURCES = mod_usertrack.c
+libapachemod_unique_id_la_SOURCES = mod_unique_id.c
+libapachemod_so_la_SOURCES = mod_so.c
+libapachemod_setenvif_la_SOURCES = mod_setenvif.c
+libapachemod_echo_la_SOURCES = mod_echo.c
1.8 +31 -3 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.7
retrieving revision 1.8
diff -u -d -u -r1.7 -r1.8
--- config.m4 1999/12/06 03:39:36 1.7
+++ config.m4 1999/12/06 04:44:07 1.8
@@ -20,14 +20,42 @@
AC_MSG_RESULT([$enable_$1])
])
+APACHE_CHECK_STANDARD_MODULE(mmap_static, , no)
+APACHE_CHECK_STANDARD_MODULE(vhost_alias, , no)
APACHE_CHECK_STANDARD_MODULE(env, , yes)
APACHE_CHECK_STANDARD_MODULE(log_config, config_log, yes)
+APACHE_CHECK_STANDARD_MODULE(mime_magic, , no)
+APACHE_CHECK_STANDARD_MODULE(mime, , yes)
+APACHE_CHECK_STANDARD_MODULE(negotiation, , yes)
+APACHE_CHECK_STANDARD_MODULE(status, , no)
+APACHE_CHECK_STANDARD_MODULE(include, includes, yes)
+APACHE_CHECK_STANDARD_MODULE(autoindex, , yes)
+APACHE_CHECK_STANDARD_MODULE(dir, , yes)
+APACHE_CHECK_STANDARD_MODULE(cgi, , yes)
+APACHE_CHECK_STANDARD_MODULE(asis, , yes)
+APACHE_CHECK_STANDARD_MODULE(imap, , yes)
+APACHE_CHECK_STANDARD_MODULE(actions, action, yes)
+APACHE_CHECK_STANDARD_MODULE(speling, , no)
+APACHE_CHECK_STANDARD_MODULE(userdir, , yes)
+APACHE_CHECK_STANDARD_MODULE(alias, , yes)
+APACHE_CHECK_STANDARD_MODULE(rewrite, , no)
+APACHE_CHECK_STANDARD_MODULE(access, , yes)
+APACHE_CHECK_STANDARD_MODULE(auth, , yes)
+APACHE_CHECK_STANDARD_MODULE(auth_anon, , no)
+APACHE_CHECK_STANDARD_MODULE(auth_dbm, , no)
+APACHE_CHECK_STANDARD_MODULE(auth_db, , no)
+APACHE_CHECK_STANDARD_MODULE(auth_digest, , no)
+APACHE_CHECK_STANDARD_MODULE(cern_meta, , no)
+APACHE_CHECK_STANDARD_MODULE(expires, , no)
+APACHE_CHECK_STANDARD_MODULE(headers, , no)
-dnl ## mod_usertrack.c
AC_CHECK_HEADERS(sys/times.h)
AC_CHECK_FUNCS(times)
+APACHE_CHECK_STANDARD_MODULE(usertrack, , no)
-MODLIST="$MODLIST mime negotiation includes autoindex dir cgi asis imap
action userdir alias access auth setenvif echo"
-STANDARD_MODULE(standard)
+APACHE_CHECK_STANDARD_MODULE(unique_id, , no)
+APACHE_CHECK_STANDARD_MODULE(so, , no)
+APACHE_CHECK_STANDARD_MODULE(setenvif, , yes)
+APACHE_CHECK_STANDARD_MODULE(echo, , yes)
AC_SUBST(STANDARD_LIBS)
