From: Amos Jeffries Date: Sun, 3 May 2015 07:46:48 +0000 (-0700) Subject: Make pod2man an optional dependency X-Git-Tag: merge-candidate-3-v1~140 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff82290c855ee5e2dc90c4007d46281af52246f8;p=thirdparty%2Fsquid.git 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 661003b485..3c3e0a0e03 100644 --- 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 10d4dda865..45f404453d 100755 --- 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 2b34ed46a0..48dac1ed40 100644 --- 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 dcf0d163f9..654f9eb9c2 100755 --- 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 9cd2efcc91..357146d4fc 100644 --- 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 c74a0bee6e..eabeb6d954 100755 --- 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 a20be06913..02312a45f8 100644 --- 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 d360521d27..e9c2f131a2 100755 --- 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 86ad177d63..5fe17da5bf 100644 --- 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 507a97f041..5b7986206b 100755 --- 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 b1d6ca3a2d..4eb74260ed 100644 --- 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 10d4dda865..c6c4ce4d65 100755 --- 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 1326aa28cb..4903a92d36 100644 --- 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 181e204b53..aa82f67760 100755 --- 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 6520b008ea..12a9d9e33d 100644 --- 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 74d3f7f6a3..c75c59f876 100644 --- 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 a7f91542fd..c1ef5f6074 100644 --- 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)