From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 29 Sep 2009 12:04:10 +0000 (+1300)
Subject: Helpers: Update the basic auth DB helper to new scheme
X-Git-Tag: SQUID_3_2_0_1~685
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7262a3df3cfd8c0284e4925f4a663245d9db3a4d;p=thirdparty%2Fsquid.git

Helpers: Update the basic auth DB helper to new scheme

 - convert to basic_db_auth
 - add config.test to build when possible (depends on perl)
 - adjust dist generation so snapshot can publish the .8 page
---

diff --git a/helpers/basic_auth/DB/Makefile.am b/helpers/basic_auth/DB/Makefile.am
index 0ac34f27d7..5970ecd57d 100644
--- a/helpers/basic_auth/DB/Makefile.am
+++ b/helpers/basic_auth/DB/Makefile.am
@@ -1,20 +1,18 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
+include $(top_srcdir)/src/Common.am
 
-libexec_SCRIPTS	= squid_db_auth
-CLEANFILES = squid_db_auth squid_db_auth.8
+libexec_SCRIPTS	= basic_db_auth
+CLEANFILES += basic_db_auth basic_db_auth.8
 do_subst = sed -e 's,[@]PERL[@],$(PERL),g'
-man_MANS 	= squid_db_auth.8
-EXTRA_DIST	= passwd.sql \
-		  squid_db_auth.in
+man_MANS = basic_db_auth.8
+EXTRA_DIST= \
+	passwd.sql \
+	basic_db_auth.in
 
-squid_db_auth.8: squid_db_auth
-	pod2man squid_db_auth squid_db_auth.8
+## So that the man(8) file is ready for snapshot manuals bundling.
+dist-hook: basic_db_auth.8
 
-squid_db_auth: squid_db_auth.in
-	$(do_subst) < $(srcdir)/squid_db_auth.in  >squid_db_auth
+basic_db_auth.8: basic_db_auth
+	pod2man basic_db_auth basic_db_auth.8
+
+basic_db_auth: basic_db_auth.in
+	$(do_subst) < $(srcdir)/basic_db_auth.in  >basic_db_auth
diff --git a/helpers/basic_auth/DB/squid_db_auth.in b/helpers/basic_auth/DB/basic_db_auth.in
similarity index 100%
rename from helpers/basic_auth/DB/squid_db_auth.in
rename to helpers/basic_auth/DB/basic_db_auth.in