Commit e15aeb44 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Get the modules configuration stuff working correctly. This just deals 

with STANDARD modules and Protocol, not MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87186 13f79535-47bb-0310-9956-ffa450edef68
parent 8185f79c

modules/aaa/config.m4

+7 −7
Original line number Diff line number Diff line
@@ -3,22 +3,22 @@ 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



AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [

AC_DEFUN(APACHE_CHECK_AAA_MODULE, [

  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])

])



APACHE_MODPATH_INIT(aaa)



APACHE_CHECK_STANDARD_MODULE(access, host-based access control, , yes)

APACHE_CHECK_STANDARD_MODULE(auth, user-based access control, , yes)

APACHE_CHECK_STANDARD_MODULE(auth_anon, anonymous user access, , no)

APACHE_CHECK_STANDARD_MODULE(auth_dbm, DBM-based access databases, , no)

APACHE_CHECK_AAA_MODULE(access, host-based access control, , yes)

APACHE_CHECK_AAA_MODULE(auth, user-based access control, , yes)

APACHE_CHECK_AAA_MODULE(auth_anon, anonymous user access, , no)

APACHE_CHECK_AAA_MODULE(auth_dbm, DBM-based access databases, , no)



APACHE_CHECK_STANDARD_MODULE(auth_db, DB-based access databases, , no, [

APACHE_CHECK_AAA_MODULE(auth_db, DB-based access databases, , no, [

  AC_CHECK_HEADERS(db.h)

  AC_CHECK_LIB(db,main)

]) 

APACHE_CHECK_STANDARD_MODULE(auth_digest, digests, , no)

APACHE_CHECK_AAA_MODULE(auth_digest, digests, , no)



LTFLAGS="$LTFLAGS -export-dynamic"

modules/cache/config.m4

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 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



AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [

AC_DEFUN(APACHE_CHECK_CACHE_MODULE, [

  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])

])



APACHE_MODPATH_INIT(cache)



APACHE_CHECK_STANDARD_MODULE(file_cache, File cache, , no)

APACHE_CHECK_CACHE_MODULE(file_cache, File cache, , no)



LTFLAGS="$LTFLAGS -export-dynamic"

APACHE_MODPATH_FINISH

modules/echo/config.m4

+1 −5
Original line number Diff line number Diff line
@@ -3,13 +3,9 @@ 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



AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [

  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])

])



APACHE_MODPATH_INIT(echo)



APACHE_CHECK_STANDARD_MODULE(echo, ECHO server, , no)

APACHE_MODULE(echo, ECHO server, , , no)



LTFLAGS="$LTFLAGS -export-dynamic"

modules/filters/config.m4

+1 −5
Original line number Diff line number Diff line
@@ -3,13 +3,9 @@ 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



AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [

  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])

])



APACHE_MODPATH_INIT(filters)



APACHE_CHECK_STANDARD_MODULE(include, Server Side Includes, includes, yes)

APACHE_MODULE(include, Server Side Includes, , includes, yes)



LTFLAGS="$LTFLAGS -export-dynamic"

modules/generators/config.m4

+6 −6
Original line number Diff line number Diff line
@@ -3,17 +3,17 @@ 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



AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [

AC_DEFUN(APACHE_CHECK_GENERATOR_MODULE, [

  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])

])



APACHE_MODPATH_INIT(generators)



APACHE_CHECK_STANDARD_MODULE(status, process/thread monitoring, , no)

APACHE_CHECK_STANDARD_MODULE(autoindex, directory listing, , yes)

APACHE_CHECK_STANDARD_MODULE(asis, as-is filetypes, , yes)

APACHE_CHECK_STANDARD_MODULE(info, server information, , no)

APACHE_CHECK_STANDARD_MODULE(suexec, set uid and gid for spawned processes, , no)

APACHE_CHECK_GENERATOR_MODULE(status, process/thread monitoring, , no)

APACHE_CHECK_GENERATOR_MODULE(autoindex, directory listing, , yes)

APACHE_CHECK_GENERATOR_MODULE(asis, as-is filetypes, , yes)

APACHE_CHECK_GENERATOR_MODULE(info, server information, , no)

APACHE_CHECK_GENERATOR_MODULE(suexec, set uid and gid for spawned processes, , no)



LTFLAGS="$LTFLAGS -export-dynamic"