Fix the configuration process. If no modules are specified in a given

directory, then that directory is no longer added to the build process.
Also, I have added a .cvsignore to the file_cache directory and removed
a generated file from this directory.  Finally, I have removed
some unnecessary checks from the config.m4 files.

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

diff --git a/acinclude.m4 b/acinclude.m4
index a695c0863ac8db3591c755285c013da091c1d542..6aa789792eb2a03e2bc936e12162dc17f86219d5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -241,17 +241,20 @@ int main(void) {
 
 dnl APACHE_MODPATH_INIT(modpath)
 AC_DEFUN(APACHE_MODPATH_INIT,[
+  current_dir=$1
   modpath_current=modules/$1
   modpath_static=
   modpath_shared=
   test -d $1 || $srcdir/helpers/mkdir.sh $modpath_current
   > $modpath_current/modules.mk
-  MODULE_DIRS="$MODULE_DIRS $1"
 ])dnl
 dnl
 AC_DEFUN(APACHE_MODPATH_FINISH,[
   echo "static = $modpath_static" >> $modpath_current/modules.mk
   echo "shared = $modpath_shared" >> $modpath_current/modules.mk
+  if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+    MODULE_DIRS="$MODULE_DIRS $current_dir"
+  fi
   APACHE_FAST_OUTPUT($modpath_current/Makefile)
 ])dnl
 dnl

diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4
index ca175774bd0a0d27727ce80589857c75ab966ba1..5b5dc45733b7529fc9753cc7ab5154fba173f99a 100644 (file)
--- a/modules/proxy/config.m4
+++ b/modules/proxy/config.m4
@@ -12,21 +12,6 @@ APACHE_MODPATH_INIT(proxy)
 
 APACHE_CHECK_PROXY_MODULE(proxy, , no)
 
-dnl APACHE_CHECK_STANDARD_MODULE(auth_db, , no, [
-dnl   AC_CHECK_HEADERS(db.h)
-dnl   AC_CHECK_LIB(db,main)
-dnl ]) 
-
-dnl APACHE_CHECK_STANDARD_MODULE(usertrack, , no, [
-dnl   AC_CHECK_HEADERS(sys/times.h)
-dnl   AC_CHECK_FUNCS(times)
-dnl ])
-
 APACHE_MODPATH_FINISH
 
-if test "$sharedobjs" = "yes"; then
-    LIBS="$LIBS -ldl"
-    LTFLAGS="$LTFLAGS -export-dynamic"
-fi
-    
 APACHE_SUBST(STANDARD_LIBS)