Commit 6123a823 authored by Greg Stein's avatar Greg Stein
Browse files

*) remove STANDARD_LIBS line; it is unused/unneeded 

*) simplify by removing the extra AC_DEFUN() in each file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87247 13f79535-47bb-0310-9956-ffa450edef68
parent 3c606285

modules/aaa/config.m4

+8 −14
Original line number Diff line number Diff line 
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_AAA_MODULE, [

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

])

dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])



APACHE_MODPATH_INIT(aaa)



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_MODULE(access, host-based access control, , , yes)

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

APACHE_MODULE(auth_anon, anonymous user access, , , no)

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



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

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

  AC_CHECK_HEADERS(db.h)

  AC_CHECK_LIB(db,main)

]) 

APACHE_CHECK_AAA_MODULE(auth_digest, digests, , no)



APACHE_MODULE(auth_digest, digests, , , no)



LTFLAGS="$LTFLAGS -export-dynamic"



APACHE_MODPATH_FINISH
 
    

APACHE_SUBST(STANDARD_LIBS)

modules/cache/config.m4

+3 −9
Original line number Diff line number Diff line 
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_CACHE_MODULE, [

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

])

dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])



APACHE_MODPATH_INIT(cache)



APACHE_CHECK_CACHE_MODULE(file_cache, File cache, , no)

APACHE_MODULE(file_cache, File cache, , , no)



LTFLAGS="$LTFLAGS -export-dynamic"

APACHE_MODPATH_FINISH



APACHE_SUBST(STANDARD_LIBS)
 
APACHE_MODPATH_FINISH

modules/echo/config.m4

+1 −4
Original line number Diff line number Diff line 
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]]]])



APACHE_MODPATH_INIT(echo)
@@ -10,5 +9,3 @@ APACHE_MODULE(echo, ECHO server, , , no) 
LTFLAGS="$LTFLAGS -export-dynamic"



APACHE_MODPATH_FINISH
 
    

APACHE_SUBST(STANDARD_LIBS)

modules/filters/config.m4

+1 −4
Original line number Diff line number Diff line 
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]]]])



APACHE_MODPATH_INIT(filters)
@@ -10,5 +9,3 @@ APACHE_MODULE(include, Server Side Includes, , includes, yes) 
LTFLAGS="$LTFLAGS -export-dynamic"



APACHE_MODPATH_FINISH
 
    

APACHE_SUBST(STANDARD_LIBS)

modules/generators/config.m4

+12 −18
Original line number Diff line number Diff line 
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_GENERATOR_MODULE, [

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

])

dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])



APACHE_MODPATH_INIT(generators)



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)

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

APACHE_MODULE(autoindex, directory listing, , , yes)

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

APACHE_MODULE(info, server information, , , no)

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



LTFLAGS="$LTFLAGS -export-dynamic"



if test "$apache_cv_mpm" = "mpmt_pthread" -o "$apache_cv_mpm" = "dexter"; then

# if we are using a threaded MPM, we will get better performance with

# mod_cgid, so make it the default.

    APACHE_CHECK_GENERATOR_MODULE(cgid, CGI scripts, , yes)

    APACHE_CHECK_GENERATOR_MODULE(cgi, CGI scripts, , no)

    APACHE_MODULE(cgid, CGI scripts, , , yes)

    APACHE_MODULE(cgi, CGI scripts, , , no)

else

# if we are using a non-threaded MPM, it makes little sense to use

# mod_cgid, and it just opens up holes we don't need.  Make mod_cgi the         # default

    APACHE_CHECK_GENERATOR_MODULE(cgi, CGI scripts, , yes)

    APACHE_CHECK_GENERATOR_MODULE(cgid, CGI scripts, , no)

# mod_cgid, and it just opens up holes we don't need.  Make mod_cgi the

# default

    APACHE_MODULE(cgi, CGI scripts, , , yes)

    APACHE_MODULE(cgid, CGI scripts, , , no)

fi



APACHE_MODPATH_FINISH
 
    

APACHE_SUBST(STANDARD_LIBS)