Extend the automatic helper selection with a small config.test program in

each helper directory determining if this helper is suitable to be built

diff --git a/configure.in b/configure.in
index 4a8009346965e60fd6a92f8b05d861acc68748d3..7e66abac0af17a1cadd381d29c58eb42a689ff1c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ 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.392 2005/11/21 23:17:21 wessels Exp $
+dnl  $Id: configure.in,v 1.393 2005/12/29 02:15:21 hno Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.392 $)dnl
+AC_REVISION($Revision: 1.393 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1300,7 +1300,7 @@ AC_ARG_ENABLE(basic-auth-helpers,
   yes) 
        for dir in $srcdir/helpers/basic_auth/*; do
            helper="`basename $dir`"
-           if test -d "$dir" && test "$helper" != CVS; then
+           if test -f $dir/config.test && sh $dir/config.test "$@"; then
                BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS $helper"
            fi
        done
@@ -1341,7 +1341,7 @@ AC_ARG_ENABLE(ntlm-auth-helpers,
   yes) 
        for dir in $srcdir/helpers/ntlm_auth/*; do
            helper="`basename $dir`"
-           if test -d "$dir" && test "$helper" != CVS; then
+           if test -f $dir/config.test && sh $dir/config.test "$@"; then
                NTLM_AUTH_HELPERS="$NTLM_AUTH_HELPERS $helper"
            fi
        done
@@ -1378,7 +1378,7 @@ AC_ARG_ENABLE(negotiate-auth-helpers,
   yes) 
        for dir in $srcdir/helpers/negotiate_auth/*; do
            helper="`basename $dir`"
-           if test -d "$dir" && test "$helper" != CVS; then
+           if test -f $dir/config.test && sh $dir/config.test "$@";  then
                NEGOTIATE_AUTH_HELPERS="$NEGOTIATE_AUTH_HELPERS $helper"
            fi
        done
@@ -1415,7 +1415,7 @@ AC_ARG_ENABLE(digest-auth-helpers,
   yes)
        for dir in $srcdir/helpers/digest_auth/*; do
            helper="`basename $dir`"
-           if test -d "$dir" && test "$helper" != CVS; then
+           if test -f $dir/config.test && sh $dir/config.test "$@"; then
                DIGEST_AUTH_HELPERS="$DIGEST_AUTH_HELPERS $helper"
            fi
        done
@@ -1462,7 +1462,7 @@ AC_ARG_ENABLE(external-acl-helpers,
   yes)
        for dir in $srcdir/helpers/external_acl/*; do
            helper="`basename $dir`"
-           if test -d "$dir" && test "$helper" != CVS; then
+           if test -f $dir/config.test && sh $dir/config.test "$@"; then
                EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS $helper"
            fi
        done

diff --git a/helpers/basic_auth/LDAP/config.test b/helpers/basic_auth/LDAP/config.test
new file mode 100755 (executable)
index 0000000..ee1be30
--- /dev/null
+++ b/helpers/basic_auth/LDAP/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -f /usr/include/ldap.h ]; then
+       exit 0
+fi
+exit 1

diff --git a/helpers/basic_auth/MSNT/config.test b/helpers/basic_auth/MSNT/config.test
new file mode 100755 (executable)
index 0000000..039e4d0
--- /dev/null
+++ b/helpers/basic_auth/MSNT/config.test
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0

diff --git a/helpers/basic_auth/NCSA/config.test b/helpers/basic_auth/NCSA/config.test
new file mode 100755 (executable)
index 0000000..039e4d0
--- /dev/null
+++ b/helpers/basic_auth/NCSA/config.test
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0

diff --git a/helpers/basic_auth/PAM/config.test b/helpers/basic_auth/PAM/config.test
new file mode 100755 (executable)
index 0000000..be2cb29
--- /dev/null
+++ b/helpers/basic_auth/PAM/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -f /usr/include/security/pam_appl.h ]; then
+       exit 0
+fi
+exit 1

diff --git a/helpers/basic_auth/SASL/config.test b/helpers/basic_auth/SASL/config.test
new file mode 100755 (executable)
index 0000000..993ded8
--- /dev/null
+++ b/helpers/basic_auth/SASL/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -f /usr/include/sasl.h -o -f /usr/include/sasl/sasl.h ]; then
+       exit 0
+fi
+exit 1

diff --git a/helpers/basic_auth/SMB/config.test b/helpers/basic_auth/SMB/config.test
new file mode 100755 (executable)
index 0000000..5b11788
--- /dev/null
+++ b/helpers/basic_auth/SMB/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -x ${SAMBAPREFIX:-/usr/local/samba}/bin/smbclient ]; then
+       exit 0
+fi
+exit 1

diff --git a/helpers/basic_auth/YP/config.test b/helpers/basic_auth/YP/config.test
new file mode 100755 (executable)
index 0000000..3036e73
--- /dev/null
+++ b/helpers/basic_auth/YP/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -f /usr/include/rpcsvc/yp_prot.h ]; then
+       exit 0
+fi
+exit 1

diff --git a/helpers/basic_auth/getpwnam/config.test b/helpers/basic_auth/getpwnam/config.test
new file mode 100755 (executable)
index 0000000..8511220
--- /dev/null
+++ b/helpers/basic_auth/getpwnam/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -f /usr/include/pwd.h ]; then
+       exit 0
+fi
+exit 1

diff --git a/helpers/basic_auth/multi-domain-NTLM/config.test b/helpers/basic_auth/multi-domain-NTLM/config.test
new file mode 100755 (executable)
index 0000000..039e4d0
--- /dev/null
+++ b/helpers/basic_auth/multi-domain-NTLM/config.test
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0

diff --git a/helpers/digest_auth/ldap/config.test b/helpers/digest_auth/ldap/config.test
new file mode 100755 (executable)
index 0000000..ee1be30
--- /dev/null
+++ b/helpers/digest_auth/ldap/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -f /usr/include/ldap.h ]; then
+       exit 0
+fi
+exit 1

diff --git a/helpers/digest_auth/password/config.test b/helpers/digest_auth/password/config.test
new file mode 100755 (executable)
index 0000000..039e4d0
--- /dev/null
+++ b/helpers/digest_auth/password/config.test
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0

diff --git a/helpers/external_acl/ip_user/config.test b/helpers/external_acl/ip_user/config.test
new file mode 100755 (executable)
index 0000000..039e4d0
--- /dev/null
+++ b/helpers/external_acl/ip_user/config.test
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0

diff --git a/helpers/external_acl/ldap_group/config.test b/helpers/external_acl/ldap_group/config.test
new file mode 100755 (executable)
index 0000000..ee1be30
--- /dev/null
+++ b/helpers/external_acl/ldap_group/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -f /usr/include/ldap.h ]; then
+       exit 0
+fi
+exit 1

diff --git a/helpers/external_acl/unix_group/config.test b/helpers/external_acl/unix_group/config.test
new file mode 100755 (executable)
index 0000000..8511220
--- /dev/null
+++ b/helpers/external_acl/unix_group/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -f /usr/include/pwd.h ]; then
+       exit 0
+fi
+exit 1

diff --git a/helpers/external_acl/wbinfo_group/config.test b/helpers/external_acl/wbinfo_group/config.test
new file mode 100755 (executable)
index 0000000..70f6c14
--- /dev/null
+++ b/helpers/external_acl/wbinfo_group/config.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -x ${SAMBAPREFIX:-/usr/local/samba}/bin/wbinfo -a -x /usr/bin/perl ]; then
+       exit 0
+fi
+exit 1