Make configure automatically find and generate the sub-makefiles in

  auth_modules/*
  src/fs/*
  src/repl/*

diff --git a/configure b/configure
index bf09b8292deba8173957c9ce082efebb62114a2f..be495a14ceb614326f4154fcc97e40ecb4c38708 100755 (executable)
--- a/configure
+++ b/configure
@@ -5399,6 +5399,26 @@ fi
 
 rm -f core 
 
+FS_MAKEFILES=""
+for fs in $STORE_MODULES none; do
+       if test $fs != none; then
+           FS_MAKEFILES="$FS_MAKEFILES ./src/fs/$fs/Makefile"
+       fi
+done
+REPL_MAKEFILES=""
+for repl in $REPL_POLICIES none; do
+       if test $repl != none; then
+           REPL_MAKEFILES="$REPL_MAKEFILES ./src/repl/$repl/Makefile"
+       fi
+done
+
+AUTH_MAKEFILES=""
+for module in $srcdir/auth_modules/*; do
+       if test -f $module/Makefile.in; then
+           AUTH_MAKEFILES="$AUTH_MAKEFILES ./auth_modules/`basename $module`/Makefile"
+       fi
+done
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -5509,24 +5529,15 @@ trap 'rm -fr `echo "\
        ./scripts/RunAccel \
        ./src/Makefile \
        ./src/fs/Makefile \
-       ./src/fs/ufs/Makefile \
-       ./src/fs/aufs/Makefile \
-       ./src/fs/coss/Makefile \
+       $FS_MAKEFILES \
        ./src/repl/Makefile \
-       ./src/repl/lru/Makefile \
-       ./src/repl/heap/Makefile \
-       ./src/fs/diskd/Makefile \
+       $REPL_MAKEFILES \
        ./contrib/Makefile \
        $SNMP_MAKEFILE \
        ./icons/Makefile \
        ./errors/Makefile \
        ./auth_modules/Makefile \
-       ./auth_modules/NCSA/Makefile \
-       ./auth_modules/PAM/Makefile \
-       ./auth_modules/SMB/Makefile \
-       ./auth_modules/MSNT/Makefile \
-       ./auth_modules/getpwnam/Makefile \
-       ./auth_modules/LDAP/Makefile \
+       $AUTH_MAKEFILES \
  include/autoconf.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -5664,24 +5675,15 @@ CONFIG_FILES=\${CONFIG_FILES-"\
        ./scripts/RunAccel \
        ./src/Makefile \
        ./src/fs/Makefile \
-       ./src/fs/ufs/Makefile \
-       ./src/fs/aufs/Makefile \
-       ./src/fs/coss/Makefile \
+       $FS_MAKEFILES \
        ./src/repl/Makefile \
-       ./src/repl/lru/Makefile \
-       ./src/repl/heap/Makefile \
-       ./src/fs/diskd/Makefile \
+       $REPL_MAKEFILES \
        ./contrib/Makefile \
        $SNMP_MAKEFILE \
        ./icons/Makefile \
        ./errors/Makefile \
        ./auth_modules/Makefile \
-       ./auth_modules/NCSA/Makefile \
-       ./auth_modules/PAM/Makefile \
-       ./auth_modules/SMB/Makefile \
-       ./auth_modules/MSNT/Makefile \
-       ./auth_modules/getpwnam/Makefile \
-       ./auth_modules/LDAP/Makefile \
+       $AUTH_MAKEFILES \
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF

diff --git a/configure.in b/configure.in
index 4f8ac68cc20cb29417c41d7333231bb05d8d8821..3154beeb5a3621d845e0214c440216a74628782e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.198 2000/07/18 06:16:19 wessels Exp $
+dnl  $Id: configure.in,v 1.199 2000/07/31 21:44:19 hno Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.198 $)dnl
+AC_REVISION($Revision: 1.199 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -1658,6 +1658,26 @@ AC_SUBST(XTRA_LIBS)
 dnl Clean up after OSF/1 core dump bug
 rm -f core 
 
+FS_MAKEFILES=""
+for fs in $STORE_MODULES none; do
+       if test $fs != none; then
+           FS_MAKEFILES="$FS_MAKEFILES ./src/fs/$fs/Makefile"
+       fi
+done
+REPL_MAKEFILES=""
+for repl in $REPL_POLICIES none; do
+       if test $repl != none; then
+           REPL_MAKEFILES="$REPL_MAKEFILES ./src/repl/$repl/Makefile"
+       fi
+done
+
+AUTH_MAKEFILES=""
+for module in $srcdir/auth_modules/*; do
+       if test -f $module/Makefile.in; then
+           AUTH_MAKEFILES="$AUTH_MAKEFILES ./auth_modules/`basename $module`/Makefile"
+       fi
+done
+
 AC_OUTPUT(\
        ./makefile \
        ./lib/Makefile \
@@ -1667,22 +1687,13 @@ AC_OUTPUT(\
        ./scripts/RunAccel \
        ./src/Makefile \
        ./src/fs/Makefile \
-       ./src/fs/ufs/Makefile \
-       ./src/fs/aufs/Makefile \
-       ./src/fs/coss/Makefile \
+       $FS_MAKEFILES \
        ./src/repl/Makefile \
-       ./src/repl/lru/Makefile \
-       ./src/repl/heap/Makefile \
-       ./src/fs/diskd/Makefile \
+       $REPL_MAKEFILES \
        ./contrib/Makefile \
        $SNMP_MAKEFILE \
        ./icons/Makefile \
        ./errors/Makefile \
        ./auth_modules/Makefile \
-       ./auth_modules/NCSA/Makefile \
-       ./auth_modules/PAM/Makefile \
-       ./auth_modules/SMB/Makefile \
-       ./auth_modules/MSNT/Makefile \
-       ./auth_modules/getpwnam/Makefile \
-       ./auth_modules/LDAP/Makefile \
+       $AUTH_MAKEFILES \
 )