From: Amos Jeffries Date: Wed, 14 Apr 2010 11:13:32 +0000 (+1200) Subject: Distribute the config.test files for all helpers X-Git-Tag: SQUID_3_2_0_1~299 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f3470fb8969b072d95dcabf4444b74da1eb6926;p=thirdparty%2Fsquid.git 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 5970ecd57d..e178ba9047 100644 --- 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 8a25f6b87d..56153c1696 100644 --- 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 2d5aa7d979..568bc7c899 100644 --- 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 b4bfe2b57d..0559a7047e 100644 --- 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 89c83855e1..1e0226a280 100644 --- 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 98fd46c515..79791ee52d 100644 --- 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 dc2b9f2193..b7a294a53a 100644 --- 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 36ab1df47a..2f3ac28a75 100644 --- 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 bfd160f937..85745704c8 100644 --- 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 1fca0b49cc..fdab6cf6cd 100644 --- 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 62d8c37262..51602b6eec 100644 --- 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 f7cec10f26..54f0818420 100644 --- 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 4f713106d8..5b9a9285d7 100644 --- 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 2230d50466..0a32097fb6 100644 --- 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 8c2751bc31..a16d39fa47 100644 --- 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 a2312086a0..681f0d677b 100644 --- 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 035056874a..5e53d10893 100644 --- 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 3eeedc1218..fb0febb372 100644 --- 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 5d8e9ba27c..748aaab84c 100644 --- 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 414fc5833c..478b6fa407 100644 --- 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 e725cff2e7..36cc2872d4 100644 --- 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 dbb612bb4f..916a4ca942 100644 --- 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 6de527bb95..3bcc752b6f 100644 --- 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 ff893d8771..9b2a72ed0a 100644 --- 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 e0025761c4..0599adaddf 100644 --- 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 8e8f102949..d9c85c7f5b 100644 --- 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 0e5b9e6013..86c0adfe15 100644 --- 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 fdfc314741..305888add3 100644 --- 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 afeb4932c7..1222348955 100644 --- 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 eb1040ec45..988cc4b0dc 100644 --- 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