Distribute the config.test files for all helpers

./configure depends on them to build the helpers correctly on auto-detect.

This should resolve some issues we have had testing the helpers and users
have found with missing logdaemon etc on package builds.

diff --git a/helpers/basic_auth/DB/Makefile.am b/helpers/basic_auth/DB/Makefile.am
index 5970ecd57d8aa813f86139d8c0b3e0345d35fdad..e178ba9047e5cfbc98127c8550ee6428caac3570 100644 (file)
--- a/helpers/basic_auth/DB/Makefile.am
+++ b/helpers/basic_auth/DB/Makefile.am
@@ -6,7 +6,8 @@ do_subst = sed -e 's,[@]PERL[@],$(PERL),g'
 man_MANS = basic_db_auth.8
 EXTRA_DIST= \
        passwd.sql \
-       basic_db_auth.in
+       basic_db_auth.in \
+       config.test
 
 ## So that the man(8) file is ready for snapshot manuals bundling.
 dist-hook: basic_db_auth.8

diff --git a/helpers/basic_auth/LDAP/Makefile.am b/helpers/basic_auth/LDAP/Makefile.am
index 8a25f6b87d323c59e374a974cf1ded2d8e78d007..56153c16961ee11f8d483fad3eba9d52112bc8d0 100644 (file)
--- a/helpers/basic_auth/LDAP/Makefile.am
+++ b/helpers/basic_auth/LDAP/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/src/Common.am
 
 libexec_PROGRAMS       = basic_ldap_auth
 man_MANS               = basic_ldap_auth.8
-EXTRA_DIST             = basic_ldap_auth.8
+EXTRA_DIST             = basic_ldap_auth.8 config.test
 basic_ldap_auth_SOURCES        = basic_ldap_auth.cc
 
 LDADD = \

diff --git a/helpers/basic_auth/MSNT-multi-domain/Makefile.am b/helpers/basic_auth/MSNT-multi-domain/Makefile.am
index 2d5aa7d97962b3f419c76523d89035d84fd52e16..568bc7c899d9419865dac3e6e04cb23d152a6c41 100644 (file)
--- a/helpers/basic_auth/MSNT-multi-domain/Makefile.am
+++ b/helpers/basic_auth/MSNT-multi-domain/Makefile.am
@@ -1,3 +1,3 @@
 
 libexec_SCRIPTS        = basic_msnt_multi_domain_auth.pl
-EXTRA_DIST = basic_msnt_multi_domain_auth.pl README.txt
+EXTRA_DIST = basic_msnt_multi_domain_auth.pl README.txt config.test

diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/MSNT/Makefile.am
index b4bfe2b57d9ad4176f068983994edf168d9347bb..0559a7047edb1a82ab80668a7f949fe6b8ff1f8d 100644 (file)
--- a/helpers/basic_auth/MSNT/Makefile.am
+++ b/helpers/basic_auth/MSNT/Makefile.am
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 MSNTAUTH_CONF = $(sysconfdir)/msntauth.conf
@@ -25,7 +17,8 @@ EXTRA_DIST = \
        COPYING-2.0 \
        msntauth.conf.default \
        msntauth-v2.0.lsm \
-       README.html
+       README.html \
+       config.test
 
 sysconf_DATA = \
        msntauth.conf.default

diff --git a/helpers/basic_auth/NCSA/Makefile.am b/helpers/basic_auth/NCSA/Makefile.am
index 89c83855e1f32a1eee5a86ad207072d1facc9819..1e0226a2804553df83462c634e700ea10d77a6cc 100644 (file)
--- a/helpers/basic_auth/NCSA/Makefile.am
+++ b/helpers/basic_auth/NCSA/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/src/Common.am
 libexec_PROGRAMS       = basic_ncsa_auth
 basic_ncsa_auth_SOURCES        = basic_ncsa_auth.cc crypt_md5.cc crypt_md5.h
 man_MANS               = basic_ncsa_auth.8
-EXTRA_DIST             = basic_ncsa_auth.8
+EXTRA_DIST             = basic_ncsa_auth.8 config.test
 LDADD = \
        $(COMPAT_LIB) \
        $(CRYPTLIB) \

diff --git a/helpers/basic_auth/NIS/Makefile.am b/helpers/basic_auth/NIS/Makefile.am
index 98fd46c5156e9a8f40c13e7b5c24d7c872cbea26..79791ee52dc302c4561c160e3184f9e4cf40bf28 100644 (file)
--- a/helpers/basic_auth/NIS/Makefile.am
+++ b/helpers/basic_auth/NIS/Makefile.am
@@ -14,3 +14,5 @@ basic_nis_auth_LDADD = \
        $(COMPAT_LIB) \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
+
+EXTRA_DIST = config.test

diff --git a/helpers/basic_auth/PAM/Makefile.am b/helpers/basic_auth/PAM/Makefile.am
index dc2b9f219360dd457a6f3c0dcccd2c1ad63372ed..b7a294a53aa081358715eaf6a35a8d91b9628f6b 100644 (file)
--- a/helpers/basic_auth/PAM/Makefile.am
+++ b/helpers/basic_auth/PAM/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.am
 
 man_MANS               = basic_pam_auth.8
-EXTRA_DIST             = basic_pam_auth.8
+EXTRA_DIST             = basic_pam_auth.8 config.test
 libexec_PROGRAMS       = basic_pam_auth
 basic_pam_auth_SOURCES = basic_pam_auth.cc
 

diff --git a/helpers/basic_auth/POP3/Makefile.am b/helpers/basic_auth/POP3/Makefile.am
index 36ab1df47a52209d2bb3cf183ab2ef0f5dfe79fd..2f3ac28a75a5c385b005b213991f7c02045daeb0 100644 (file)
--- a/helpers/basic_auth/POP3/Makefile.am
+++ b/helpers/basic_auth/POP3/Makefile.am
@@ -1,2 +1,2 @@
 libexec_SCRIPTS        = basic_pop3_auth.pl
-EXTRA_DIST = basic_pop3_auth.pl
+EXTRA_DIST = basic_pop3_auth.pl config.test

diff --git a/helpers/basic_auth/RADIUS/Makefile.am b/helpers/basic_auth/RADIUS/Makefile.am
index bfd160f937623030927e642c77b03ce8ed4606a1..85745704c816fcf1f0c4869c86deac660ad851bd 100644 (file)
--- a/helpers/basic_auth/RADIUS/Makefile.am
+++ b/helpers/basic_auth/RADIUS/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES += -I$(srcdir)
 
 libexec_PROGRAMS       = basic_radius_auth
 man_MANS               = basic_radius_auth.8
-EXTRA_DIST             = basic_radius_auth.8
+EXTRA_DIST             = basic_radius_auth.8 config.test
 basic_radius_auth_SOURCES = \
                        basic_radius_auth.cc \
                        radius.h \

diff --git a/helpers/basic_auth/SASL/Makefile.am b/helpers/basic_auth/SASL/Makefile.am
index 1fca0b49cc4819c27deccb83e19b08e1fce5c849..fdab6cf6cdb885da403cf0985fc965c774897c48 100644 (file)
--- a/helpers/basic_auth/SASL/Makefile.am
+++ b/helpers/basic_auth/SASL/Makefile.am
@@ -7,4 +7,4 @@ basic_sasl_auth_LDADD = \
        $(LIBSASL) \
        $(XTRA_LIBS)
 
-EXTRA_DIST = basic_sasl_auth.pam basic_sasl_auth.conf
+EXTRA_DIST = basic_sasl_auth.pam basic_sasl_auth.conf config.test

diff --git a/helpers/basic_auth/SMB/Makefile.am b/helpers/basic_auth/SMB/Makefile.am
index 62d8c37262b6e755f5b5b21ac5465948c7786f0c..51602b6eecf73b2230870e643ecdca801bbbf35d 100644 (file)
--- a/helpers/basic_auth/SMB/Makefile.am
+++ b/helpers/basic_auth/SMB/Makefile.am
@@ -18,4 +18,4 @@ basic_smb_auth_SOURCES= basic_smb_auth.cc
 basic_smb_auth_CXXFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"
 basic_smb_auth_LDADD = $(COMPAT_LIB) $(XTRA_LIBS)
 
-EXTRA_DIST = basic_smb_auth.sh COPYING-2.0
+EXTRA_DIST = basic_smb_auth.sh COPYING-2.0 config.test

diff --git a/helpers/basic_auth/SSPI/Makefile.am b/helpers/basic_auth/SSPI/Makefile.am
index f7cec10f2649df1d3a32fb759f9c21a420969583..54f0818420e520dd748c2375f6b3f9000044dafe 100644 (file)
--- a/helpers/basic_auth/SSPI/Makefile.am
+++ b/helpers/basic_auth/SSPI/Makefile.am
@@ -11,4 +11,4 @@ basic_sspi_auth_LDADD = \
        -lnetapi32 -ladvapi32 -lsspwin32 \
        $(XTRA_LIBS)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test

diff --git a/helpers/basic_auth/getpwnam/Makefile.am b/helpers/basic_auth/getpwnam/Makefile.am
index 4f713106d8061d4fcc87436a5e836554efd9713b..5b9a9285d71414e034262184cf7493e81ca8974f 100644 (file)
--- a/helpers/basic_auth/getpwnam/Makefile.am
+++ b/helpers/basic_auth/getpwnam/Makefile.am
@@ -8,3 +8,5 @@ basic_getpwnam_auth_LDADD = \
        $(CRYPTLIB)
 
 man_MANS = basic_getpwnam_auth.8
+
+EXTRA_DIST = config.test

diff --git a/helpers/digest_auth/eDirectory/Makefile.am b/helpers/digest_auth/eDirectory/Makefile.am
index 2230d50466f73e6028e5e4875cfdc482c6efc593..0a32097fb6d0ebdcb29a7a9f5d64b1a49f42fd61 100644 (file)
--- a/helpers/digest_auth/eDirectory/Makefile.am
+++ b/helpers/digest_auth/eDirectory/Makefile.am
@@ -28,3 +28,5 @@ LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \
        $(SSLLIB)
+
+EXTRA_DIST = config.test

diff --git a/helpers/digest_auth/ldap/Makefile.am b/helpers/digest_auth/ldap/Makefile.am
index 8c2751bc31eb3ada34493c864c925252f56a3342..a16d39fa475ef73d80735e20d76603f459f2c4e0 100644 (file)
--- a/helpers/digest_auth/ldap/Makefile.am
+++ b/helpers/digest_auth/ldap/Makefile.am
@@ -26,3 +26,5 @@ LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \
        $(SSLLIB)
+
+EXTRA_DIST = config.test

diff --git a/helpers/digest_auth/password/Makefile.am b/helpers/digest_auth/password/Makefile.am
index a2312086a0c3297f5fa96f1808cf76b28f39bc20..681f0d677be8bbc805863d0520315cd39b130d01 100644 (file)
--- a/helpers/digest_auth/password/Makefile.am
+++ b/helpers/digest_auth/password/Makefile.am
@@ -24,3 +24,5 @@ LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \
        $(SSLLIB)
+
+EXTRA_DIST = config.test

diff --git a/helpers/external_acl/ip_user/Makefile.am b/helpers/external_acl/ip_user/Makefile.am
index 035056874a376fa09449afb06e206855c8ee3057..5e53d10893442d22f0706a7a94cc1abf5daefd4f 100644 (file)
--- a/helpers/external_acl/ip_user/Makefile.am
+++ b/helpers/external_acl/ip_user/Makefile.am
@@ -1,11 +1,3 @@
-#
-#  Makefile for the ip_user external_acl helper by Rodrigo Campos
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
@@ -24,7 +16,8 @@ EXTRA_DIST = \
        example.conf \
        example-deny_all_but.conf \
        license \
-       README
+       README \
+       config.test
 
 LDADD = \
        $(top_builddir)/compat/libcompat.la \

diff --git a/helpers/external_acl/ldap_group/Makefile.am b/helpers/external_acl/ldap_group/Makefile.am
index 3eeedc12184d492211fc4754a56ab9c3652ca3b0..fb0febb372ec69d1990500b8803f1e81d3d899ed 100644 (file)
--- a/helpers/external_acl/ldap_group/Makefile.am
+++ b/helpers/external_acl/ldap_group/Makefile.am
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid LDAP authentication helper
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
@@ -14,7 +6,7 @@ INCLUDES += -I$(srcdir)
 
 libexec_PROGRAMS               = squid_ldap_group
 man_MANS                       = squid_ldap_group.8
-EXTRA_DIST                     = squid_ldap_group.8
+EXTRA_DIST                     = squid_ldap_group.8 config.test
 squid_ldap_group_SOURCES       = squid_ldap_group.c
 
 LDADD = \

diff --git a/helpers/external_acl/mswin_ad_group/Makefile.am b/helpers/external_acl/mswin_ad_group/Makefile.am
index 5d8e9ba27c8ec9cc5a16c46171f9b1aebf3ec60f..748aaab84c8b16029745271db73c56f5bcfc6d38 100644 (file)
--- a/helpers/external_acl/mswin_ad_group/Makefile.am
+++ b/helpers/external_acl/mswin_ad_group/Makefile.am
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 libexec_PROGRAMS = mswin_check_ad_group
 
 mswin_check_ad_group_SOURCES = mswin_check_ad_group.c mswin_check_ad_group.h
@@ -32,4 +24,4 @@ LDADD = \
        -ladsiid \
        $(XTRA_LIBS)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test

diff --git a/helpers/external_acl/mswin_lm_group/Makefile.am b/helpers/external_acl/mswin_lm_group/Makefile.am
index 414fc5833ce1a0f9280def95fdb444946b43b5db..478b6fa407cc8fa65d7e7189177765ad096803a5 100644 (file)
--- a/helpers/external_acl/mswin_lm_group/Makefile.am
+++ b/helpers/external_acl/mswin_lm_group/Makefile.am
@@ -24,4 +24,4 @@ LDADD = \
        -lntdll \
        $(XTRA_LIBS)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test

diff --git a/helpers/external_acl/session/Makefile.am b/helpers/external_acl/session/Makefile.am
index e725cff2e7dbc0aea00da28abb9f12ec21b74a65..36cc2872d49eb5174bef082dcb8f6a637d6eb501 100644 (file)
--- a/helpers/external_acl/session/Makefile.am
+++ b/helpers/external_acl/session/Makefile.am
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid LDAP authentication helper
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
@@ -14,7 +6,7 @@ INCLUDES += -I$(srcdir)
 
 libexec_PROGRAMS               = squid_session
 man_MANS                       = squid_session.8
-EXTRA_DIST                     = squid_session.8
+EXTRA_DIST                     = squid_session.8 config.test
 squid_session_SOURCES          = squid_session.c
 
 LDADD = \

diff --git a/helpers/external_acl/unix_group/Makefile.am b/helpers/external_acl/unix_group/Makefile.am
index dbb612bb4f3d1adcd6a307460309c6c74d6c51c9..916a4ca9423a5419d00eef0aadea604e8aaac3f9 100644 (file)
--- a/helpers/external_acl/unix_group/Makefile.am
+++ b/helpers/external_acl/unix_group/Makefile.am
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid LDAP authentication helper
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
@@ -14,7 +6,7 @@ INCLUDES += -I$(srcdir)
 
 libexec_PROGRAMS               = squid_unix_group
 man_MANS                       = squid_unix_group.8
-EXTRA_DIST                     = squid_unix_group.8
+EXTRA_DIST                     = squid_unix_group.8 config.test
 squid_unix_group_SOURCES       = check_group.c
 
 LDADD = \

diff --git a/helpers/external_acl/wbinfo_group/Makefile.am b/helpers/external_acl/wbinfo_group/Makefile.am
index 6de527bb953bbee765bf5276f17d4198447a7a83..3bcc752b6f8dc81795a64e41f1ee201e83355f97 100644 (file)
--- a/helpers/external_acl/wbinfo_group/Makefile.am
+++ b/helpers/external_acl/wbinfo_group/Makefile.am
@@ -1,12 +1,4 @@
-#
-#  Makefile for the Squid LDAP authentication helper
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 libexec_SCRIPTS        = wbinfo_group.pl
 #man_MANS              = squid_wbinfo_group.8
 #EXTRA_DIST            = squid_wbinfo_group.8
-EXTRA_DIST             = wbinfo_group.pl
+EXTRA_DIST             = wbinfo_group.pl config.test

diff --git a/helpers/log_daemon/file/Makefile.am b/helpers/log_daemon/file/Makefile.am
index ff893d877159bde51b9e8ca1238935c304be0c05..9b2a72ed0a63c488e41babd004df959266a8b94d 100644 (file)
--- a/helpers/log_daemon/file/Makefile.am
+++ b/helpers/log_daemon/file/Makefile.am
@@ -2,3 +2,4 @@ include $(top_srcdir)/src/Common.am
 
 libexec_PROGRAMS = log_file_daemon
 log_file_daemon_SOURCES = log_file_daemon.cc
+EXTRA_DIST = config.test

diff --git a/helpers/negotiate_auth/mswin_sspi/Makefile.am b/helpers/negotiate_auth/mswin_sspi/Makefile.am
index e0025761c4c54926b1456acbfc9a24b8374e548d..0599adaddfbbf293e718253a48ee8559108bfd9f 100644 (file)
--- a/helpers/negotiate_auth/mswin_sspi/Makefile.am
+++ b/helpers/negotiate_auth/mswin_sspi/Makefile.am
@@ -16,4 +16,4 @@ mswin_negotiate_auth_SOURCES = libnegotiatessp.c negotiate_auth.c negotiate.h
 
 LDADD          = -L$(top_builddir)/lib -lsspwin32 -ladvapi32 -lmiscutil $(XTRA_LIBS)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test

diff --git a/helpers/ntlm_auth/fakeauth/Makefile.am b/helpers/ntlm_auth/fakeauth/Makefile.am
index 8e8f102949c021e8d56c107009e45a643d929321..d9c85c7f5b59269ade130253e24a7c2125b8d78c 100644 (file)
--- a/helpers/ntlm_auth/fakeauth/Makefile.am
+++ b/helpers/ntlm_auth/fakeauth/Makefile.am
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 libexec_PROGRAMS = fakeauth_auth
@@ -19,3 +11,5 @@ LDADD = \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
+
+EXTRA_DIST = config.test

diff --git a/helpers/ntlm_auth/mswin_sspi/Makefile.am b/helpers/ntlm_auth/mswin_sspi/Makefile.am
index 0e5b9e60133544626835b5244e8dd94009294eb6..86c0adfe15402e1be30f218fa0c9369028a7d247 100644 (file)
--- a/helpers/ntlm_auth/mswin_sspi/Makefile.am
+++ b/helpers/ntlm_auth/mswin_sspi/Makefile.am
@@ -1,9 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
-
 include $(top_srcdir)/src/Common.am
 
 libexec_PROGRAMS = mswin_ntlm_auth
@@ -21,4 +15,4 @@ LDADD = \
        -ladvapi32 \
        $(XTRA_LIBS)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test

diff --git a/helpers/ntlm_auth/no_check/Makefile.am b/helpers/ntlm_auth/no_check/Makefile.am
index fdfc3147412abcda1c1c7bb5d396caad35556e2e..305888add33f7cffed56c1e73a1d05010986b4f7 100644 (file)
--- a/helpers/ntlm_auth/no_check/Makefile.am
+++ b/helpers/ntlm_auth/no_check/Makefile.am
@@ -10,5 +10,5 @@ libexec_SCRIPTS       = no_check.pl
 
 EXTRA_DIST = \
        no_check.pl \
-       README.no_check_ntlm_auth
-
+       README.no_check_ntlm_auth \
+       config.test

diff --git a/helpers/ntlm_auth/smb_lm/Makefile.am b/helpers/ntlm_auth/smb_lm/Makefile.am
index afeb4932c7d2180f8703dc4ced743c4a74fadfa6..1222348955a88515881dc6ef91046de00c4ea299 100644 (file)
--- a/helpers/ntlm_auth/smb_lm/Makefile.am
+++ b/helpers/ntlm_auth/smb_lm/Makefile.am
@@ -1,7 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-
 include $(top_srcdir)/src/Common.am
 
 SUBDIRS = smbval
@@ -20,3 +16,5 @@ LDADD = \
        smbval/libsmbvalid.a \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
+
+EXTRA_DIST = config.test

diff --git a/helpers/url_rewrite/fake/Makefile.am b/helpers/url_rewrite/fake/Makefile.am
index eb1040ec4556150cbeaf77d5a061a4d5cf5439e2..988cc4b0dcccf907330c5776afc730f7a59880fd 100644 (file)
--- a/helpers/url_rewrite/fake/Makefile.am
+++ b/helpers/url_rewrite/fake/Makefile.am
@@ -7,4 +7,4 @@ url_fake_rewrite_LDADD = $(COMPAT_LIB)
 
 libexec_SCRIPTS = url_fake_rewrite.sh
 
-EXTRA_DIST = url_fake_rewrite.sh
+EXTRA_DIST = url_fake_rewrite.sh config.test