Make pod2man an optional dependency

Documentation files can be built on a best-effort basis. This allows
Squid more helpers to be built without pod2man and sub-dependencies.

configure.ac already checks for pod2man existence and sets appropriate
automake conditionals.

diff --git a/helpers/basic_auth/DB/Makefile.am b/helpers/basic_auth/DB/Makefile.am
index 661003b4854ef9029a5aff9186db1f3f05c748c5..3c3e0a0e03a90885785e0a388685529a45e0ff62 100644 (file)
--- a/helpers/basic_auth/DB/Makefile.am
+++ b/helpers/basic_auth/DB/Makefile.am
@@ -7,17 +7,21 @@
 include $(top_srcdir)/src/Common.am
 
 libexec_SCRIPTS        = basic_db_auth
-man_MANS = basic_db_auth.8
+CLEANFILES += basic_db_auth
 EXTRA_DIST= \
-       basic_db_auth.8 \
        passwd.sql \
        basic_db_auth.pl.in \
        required.m4
 
-basic_db_auth.8: basic_db_auth
-       pod2man basic_db_auth basic_db_auth.8
-
 basic_db_auth: basic_db_auth.pl.in
        $(subst_perlshell)
 
-CLEANFILES += basic_db_auth basic_db_auth.8
+if ENABLE_POD2MAN_DOC
+man_MANS = basic_db_auth.8
+CLEANFILES += basic_db_auth.8
+EXTRA_DIST += basic_db_auth.8
+
+basic_db_auth.8: basic_db_auth
+       pod2man --section=8 basic_db_auth basic_db_auth.8
+
+endif

diff --git a/helpers/basic_auth/DB/required.m4 b/helpers/basic_auth/DB/required.m4
index 10d4dda8655c14e2a9c15487975ac54fe100c844..45f404453d5c0cd0bdc43fa39735aa3f924b59dd 100755 (executable)
--- a/helpers/basic_auth/DB/required.m4
+++ b/helpers/basic_auth/DB/required.m4
@@ -5,6 +5,10 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then
+if test "x$PERL" != "x"; then
   BUILD_HELPER="DB"
 fi
+if test "x$POD2MAN" = "x"; then
+  AC_MSG_WARN([pod2man not found. basic_db_auth man(8) page will not be built])
+fi
+

diff --git a/helpers/basic_auth/POP3/Makefile.am b/helpers/basic_auth/POP3/Makefile.am
index 2b34ed46a03587e70bd62250b6dbfcd612f2bf3a..48dac1ed409f51e9ffaf8fd153c5b048508a4fbb 100644 (file)
--- a/helpers/basic_auth/POP3/Makefile.am
+++ b/helpers/basic_auth/POP3/Makefile.am
@@ -8,16 +8,20 @@
 include $(top_srcdir)/src/Common.am
 
 libexec_SCRIPTS        = basic_pop3_auth
-man_MANS= basic_pop3_auth.8
+CLEANFILES += basic_pop3_auth
 EXTRA_DIST= \
-       basic_pop3_auth.8 \
        basic_pop3_auth.pl.in \
        required.m4
 
 basic_pop3_auth: basic_pop3_auth.pl.in
        $(subst_perlshell)
 
+if ENABLE_POD2MAN_DOC
+man_MANS = basic_pop3_auth.8
+CLEANFILES += basic_pop3_auth.8
+EXTRA_DIST += basic_pop3_auth.8
+
 basic_pop3_auth.8: basic_pop3_auth
-       pod2man basic_pop3_auth basic_pop3_auth.8
+       pod2man --section=8 basic_pop3_auth basic_pop3_auth.8
 
-CLEANFILES += basic_pop3_auth basic_pop3_auth.8
+endif

diff --git a/helpers/basic_auth/POP3/required.m4 b/helpers/basic_auth/POP3/required.m4
index dcf0d163f9ebc2c0097784b10001ad681e15b159..654f9eb9c21e86161671c9a754ed504d9400c11f 100755 (executable)
--- a/helpers/basic_auth/POP3/required.m4
+++ b/helpers/basic_auth/POP3/required.m4
@@ -5,6 +5,10 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then
+if test "x$PERL" != "x"; then
   BUILD_HELPER="POP3"
 fi
+if test "x$POD2MAN" = "x"; then
+  AC_MSG_WARN([pod2man not found. basic_pop3_auth man(8) page will not be built])
+fi
+

diff --git a/helpers/external_acl/SQL_session/Makefile.am b/helpers/external_acl/SQL_session/Makefile.am
index 9cd2efcc91973487df522549b3155a45074d608b..357146d4fc61d3357ad2cd4b2d02d20c2c99253f 100644 (file)
--- a/helpers/external_acl/SQL_session/Makefile.am
+++ b/helpers/external_acl/SQL_session/Makefile.am
@@ -8,15 +8,20 @@
 include $(top_srcdir)/src/Common.am
 
 libexec_SCRIPTS        = ext_sql_session_acl
-CLEANFILES += ext_sql_session_acl ext_sql_session_acl.8
-man_MANS = ext_sql_session_acl.8
+CLEANFILES += ext_sql_session_acl
 EXTRA_DIST= \
-       ext_sql_session_acl.8 \
        ext_sql_session_acl.pl.in \
        required.m4
 
-ext_sql_session_acl.8: ext_sql_session_acl
-       pod2man ext_sql_session_acl ext_sql_session_acl.8
-
 ext_sql_session_acl: ext_sql_session_acl.pl.in
        $(subst_perlshell)
+
+if ENABLE_POD2MAN_DOC
+man_MANS = ext_sql_session_acl.8
+CLEANFILES += ext_sql_session_acl.8
+EXTRA_DIST += ext_sql_session_acl.8
+
+ext_sql_session_acl.8: ext_sql_session_acl
+       pod2man --section=8 ext_sql_session_acl ext_sql_session_acl.8
+
+endif

diff --git a/helpers/external_acl/SQL_session/required.m4 b/helpers/external_acl/SQL_session/required.m4
index c74a0bee6ea0777a52257f93c3b0ea85b7cae6c3..eabeb6d9543820abddbfd4ccd97c518fe54154d5 100755 (executable)
--- a/helpers/external_acl/SQL_session/required.m4
+++ b/helpers/external_acl/SQL_session/required.m4
@@ -5,6 +5,10 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then
+if test "x$PERL" != "x"; then
   BUILD_HELPER="SQL_session"
 fi
+if test "x$POD2MAN" = "x"; then
+  AC_MSG_WARN([pod2man not found. ext_sql_session_acl man(8) page will not be built])
+fi
+

diff --git a/helpers/external_acl/delayer/Makefile.am b/helpers/external_acl/delayer/Makefile.am
index a20be06913289627833271fac5a71871b97ee208..02312a45f81fcd22851bfd7a48a0d3452c52b61b 100644 (file)
--- a/helpers/external_acl/delayer/Makefile.am
+++ b/helpers/external_acl/delayer/Makefile.am
@@ -8,12 +8,20 @@
 include $(top_srcdir)/src/Common.am
 
 libexec_SCRIPTS = ext_delayer_acl
-CLEANFILES += ext_delayer_acl ext_delayer_acl.8
+CLEANFILES += ext_delayer_acl
+EXTRA_DIST= \
+       required.m4 \
+       ext_delayer_acl.pl.in
+
+ext_delayer_acl: ext_delayer_acl.pl.in
+       $(subst_perlshell)
+
+if ENABLE_POD2MAN_DOC
 man_MANS = ext_delayer_acl.8
-EXTRA_DIST = ext_delayer_acl.pl.in ext_delayer_acl.8 required.m4
+CLEANFILES += ext_delayer_acl.8
+EXTRA_DIST += ext_delayer_acl.8
 
 ext_delayer_acl.8: ext_delayer_acl
-       pod2man ext_delayer_acl ext_delayer_acl.8
+       pod2man --section=8 ext_delayer_acl ext_delayer_acl.8
 
-ext_delayer_acl: ext_delayer_acl.pl.in
-       $(subst_perlshell)
+endif

diff --git a/helpers/external_acl/delayer/required.m4 b/helpers/external_acl/delayer/required.m4
index d360521d2763432b6a0573eb1a4220cfa74f7274..e9c2f131a21fc0468ecfde789f9424d95d5f5142 100755 (executable)
--- a/helpers/external_acl/delayer/required.m4
+++ b/helpers/external_acl/delayer/required.m4
@@ -5,6 +5,10 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then
+if test "x$PERL" != "x"; then
   BUILD_HELPER="delayer"
 fi
+if test "x$POD2MAN" = "x"; then
+  AC_MSG_WARN([pod2man not found. ext_delayer_acl man(8) page will not be built])
+fi
+

diff --git a/helpers/external_acl/wbinfo_group/Makefile.am b/helpers/external_acl/wbinfo_group/Makefile.am
index 86ad177d637eedc0e94426016442c2e3ee73d1a1..5fe17da5bfc84a48aa1ca67fd94fbab389c5ac53 100644 (file)
--- a/helpers/external_acl/wbinfo_group/Makefile.am
+++ b/helpers/external_acl/wbinfo_group/Makefile.am
@@ -8,16 +8,20 @@
 include $(top_srcdir)/src/Common.am
 
 libexec_SCRIPTS= ext_wbinfo_group_acl
-man_MANS= ext_wbinfo_group_acl.8
+CLEANFILES += ext_wbinfo_group_acl
 EXTRA_DIST= \
-       ext_wbinfo_group_acl.8 \
        ext_wbinfo_group_acl.pl.in \
        required.m4
 
 ext_wbinfo_group_acl: ext_wbinfo_group_acl.pl.in
        $(subst_perlshell)
 
+if ENABLE_POD2MAN_DOC
+man_MANS = ext_wbinfo_group_acl.8
+CLEANFILES += ext_wbinfo_group_acl.8
+EXTRA_DIST += ext_wbinfo_group_acl.8
+
 ext_wbinfo_group_acl.8: ext_wbinfo_group_acl
-       pod2man ext_wbinfo_group_acl ext_wbinfo_group_acl.8
+       pod2man --section=8 ext_wbinfo_group_acl ext_wbinfo_group_acl.8
 
-CLEANFILES += ext_wbinfo_group_acl.8 ext_wbinfo_group_acl
+endif

diff --git a/helpers/external_acl/wbinfo_group/required.m4 b/helpers/external_acl/wbinfo_group/required.m4
index 507a97f041de1866662b0179231572374c39343a..5b7986206b0ca8350bb841a3cf72a71fffd243b1 100755 (executable)
--- a/helpers/external_acl/wbinfo_group/required.m4
+++ b/helpers/external_acl/wbinfo_group/required.m4
@@ -15,6 +15,10 @@ if test "x$WBINFO" = "x"; then
 fi
 
 # allow script install anyway when perl is present
-if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then
+if test "x$PERL" != "x"; then
   BUILD_HELPER="wbinfo_group"
 fi
+if test "x$POD2MAN" = "x"; then
+  AC_MSG_WARN([pod2man not found. ext_wbinfo_group_acl man(8) page will not be built])
+fi
+

diff --git a/helpers/log_daemon/DB/Makefile.am b/helpers/log_daemon/DB/Makefile.am
index b1d6ca3a2dde642ebfe3d3eee8fcd23f137fda7e..4eb74260edab3451c79d3544ce5f597880f9b1b0 100644 (file)
--- a/helpers/log_daemon/DB/Makefile.am
+++ b/helpers/log_daemon/DB/Makefile.am
@@ -8,17 +8,22 @@
 include $(top_srcdir)/src/Common.am
 
 libexec_SCRIPTS        = log_db_daemon
-CLEANFILES += log_db_daemon log_db_daemon.8
-man_MANS = log_db_daemon.8
+CLEANFILES += log_db_daemon
 EXTRA_DIST= \
        required.m4 \
        doc/views.sql \
        doc/date_day_column.sql \
-       log_db_daemon.8 \
        log_db_daemon.pl.in
 
-log_db_daemon.8: log_db_daemon
-       pod2man log_db_daemon log_db_daemon.8
-
 log_db_daemon: log_db_daemon.pl.in
        $(subst_perlshell)
+
+if ENABLE_POD2MAN_DOC
+man_MANS = log_db_daemon.8
+CLEANFILES += log_db_daemon.8
+EXTRA_DIST += log_db_daemon.8
+
+log_db_daemon.8: log_db_daemon
+       pod2man --section=8 log_db_daemon log_db_daemon.8
+
+endif

diff --git a/helpers/log_daemon/DB/required.m4 b/helpers/log_daemon/DB/required.m4
index 10d4dda8655c14e2a9c15487975ac54fe100c844..c6c4ce4d6508a54cc015cf947ad8dd058fe92e81 100755 (executable)
--- a/helpers/log_daemon/DB/required.m4
+++ b/helpers/log_daemon/DB/required.m4
@@ -5,6 +5,10 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then
+if test "x$PERL" != "x"; then
   BUILD_HELPER="DB"
 fi
+if test "x$POD2MAN" = "x"; then
+  AC_MSG_WARN([pod2man not found. log_db_daemon man(8) page will not be built])
+fi
+

diff --git a/helpers/storeid_rewrite/file/Makefile.am b/helpers/storeid_rewrite/file/Makefile.am
index 1326aa28cb5fceed404f6c46a96d0d00087cfe92..4903a92d3682a72b24e521e0b9723d2c9236f8bf 100644 (file)
--- a/helpers/storeid_rewrite/file/Makefile.am
+++ b/helpers/storeid_rewrite/file/Makefile.am
@@ -8,15 +8,20 @@
 include $(top_srcdir)/src/Common.am
 
 libexec_SCRIPTS        = storeid_file_rewrite
-CLEANFILES += storeid_file_rewrite storeid_file_rewrite.8
-man_MANS = storeid_file_rewrite.8
+CLEANFILES += storeid_file_rewrite
 EXTRA_DIST= \
-       storeid_file_rewrite.8 \
        storeid_file_rewrite.pl.in \
        required.m4
 
-storeid_file_rewrite.8: storeid_file_rewrite
-       pod2man storeid_file_rewrite storeid_file_rewrite.8
-
 storeid_file_rewrite: storeid_file_rewrite.pl.in
        $(subst_perlshell)
+
+if ENABLE_POD2MAN_DOC
+man_MANS = storeid_file_rewrite.8
+CLEANFILES += storeid_file_rewrite.8
+EXTRA_DIST += storeid_file_rewrite.8
+
+storeid_file_rewrite.8: storeid_file_rewrite
+       pod2man --section=8 storeid_file_rewrite storeid_file_rewrite.8
+
+endif

diff --git a/helpers/storeid_rewrite/file/required.m4 b/helpers/storeid_rewrite/file/required.m4
index 181e204b53b53b8f001f79e8b5fd70d475d7914d..aa82f67760c9b1c3414b4cbfd0784960f008cc59 100755 (executable)
--- a/helpers/storeid_rewrite/file/required.m4
+++ b/helpers/storeid_rewrite/file/required.m4
@@ -5,6 +5,10 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then
+if test "x$PERL" != "x"; then
   BUILD_HELPER="file"
 fi
+if test "x$POD2MAN" = "x"; then
+  AC_MSG_WARN([pod2man not found. storeid_file_rewrite man(8) page will not be built])
+fi
+

diff --git a/helpers/url_rewrite/LFS/Makefile.am b/helpers/url_rewrite/LFS/Makefile.am
index 6520b008ea2a11c62d856e3fdc6864fd0fcb6809..12a9d9e33de68dcbd7768babd5d7fc8992fc1343 100644 (file)
--- a/helpers/url_rewrite/LFS/Makefile.am
+++ b/helpers/url_rewrite/LFS/Makefile.am
@@ -14,17 +14,20 @@ include $(top_srcdir)/src/Common.am
 
 # Perl helper
 libexec_SCRIPTS = url_lfs_rewrite
-man_MANS = url_lfs_rewrite.8
-
+CLEANFILES += url_lfs_rewrite
 EXTRA_DIST= \
        required.m4 \
-       url_lfs_rewrite.8 \
        url_lfs_rewrite.pl.in
 
-url_lfs_rewrite.8: url_lfs_rewrite
-       pod2man url_lfs_rewrite url_lfs_rewrite.8
-
 url_lfs_rewrite: url_lfs_rewrite.pl.in
        $(subst_perlshell)
 
-CLEANFILES += url_lfs_rewrite url_lfs_rewrite.8
+if ENABLE_POD2MAN_DOC
+man_MANS = url_lfs_rewrite.8
+CLEANFILES += url_lfs_rewrite.8
+EXTRA_DIST += url_lfs_rewrite.8
+
+url_lfs_rewrite.8: url_lfs_rewrite
+       pod2man --section=8 url_lfs_rewrite url_lfs_rewrite.8
+
+endif

diff --git a/helpers/url_rewrite/LFS/required.m4 b/helpers/url_rewrite/LFS/required.m4
index 74d3f7f6a3ff1339f5339edc0b4b8a38f8ef6118..c75c59f876d4ac45e7c2488d0befa523771728fa 100644 (file)
--- a/helpers/url_rewrite/LFS/required.m4
+++ b/helpers/url_rewrite/LFS/required.m4
@@ -5,6 +5,10 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then
+if test "x$PERL" != "x"; then
   BUILD_HELPER="LFS"
 fi
+if test "x$POD2MAN" = "x"; then
+  AC_MSG_WARN([pod2man not found. url_lfs_rewrite man(8) page will not be built])
+fi
+

diff --git a/tools/helper-mux/Makefile.am b/tools/helper-mux/Makefile.am
index a7f91542fdec1ab3c18a59b45bc85a7b1ee24363..c1ef5f60743440337bfe0e45de350b55fac7bb66 100644 (file)
--- a/tools/helper-mux/Makefile.am
+++ b/tools/helper-mux/Makefile.am
@@ -10,15 +10,15 @@ libexec_SCRIPTS     = helper-mux
 CLEANFILES += helper-mux
 EXTRA_DIST= helper-mux.pl.in
 
+helper-mux: helper-mux.pl.in
+       $(subst_perlshell)
+
 if ENABLE_POD2MAN_DOC
 man_MANS = helper-mux.8
 CLEANFILES += helper-mux.8
 EXTRA_DIST += helper-mux.8
 
 helper-mux.8: helper-mux
-       pod2man helper-mux helper-mux.8
+       pod2man --section=8 helper-mux helper-mux.8
 
 endif
-
-helper-mux: helper-mux.pl.in
-       $(subst_perlshell)