sad/firehol
1
0
Fork 0
mirror of https://github.com/firehol/firehol.git synced 2024-06-29 18:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow disabling of manpages

Browse Source 
configure script now produces an error suggesting options if the
documentation is not built.
This commit is contained in:
Phil Whineray 2015-10-18 09:28:45 +01:00
parent d7009ddd95
commit 12cc6f65bb
5 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -21,6 +21,13 @@ AC_ARG_ENABLE([doc],
[AS_HELP_STRING([--disable-doc], [disable doc installation @<:@enabled@:>@])],
,
[enable_doc="yes"])
AM_CONDITIONAL([ENABLE_DOC], [test "${enable_doc}" = "yes"])
AC_ARG_ENABLE([man],
[AS_HELP_STRING([--disable-man], [disable manpage installation @<:@enabled@:>@])],
,
[enable_man="yes"])
AM_CONDITIONAL([ENABLE_MAN], [test "${enable_man}" = "yes"])
if test x"$USE_MAINTAINER_MODE" = xyes; then
AC_MSG_NOTICE(***************** MAINTAINER MODE *****************)
@ -37,8 +44,15 @@ AC_SUBST(PACKAGE_BUILT_DATE)
AC_SUBST(PANDOC_VERSION)
AC_CONFIG_FILES([doc/tools/pandoc-post], [chmod +x doc/tools/pandoc-post])
AC_MSG_NOTICE(***************************************************)
else
if test ! -f doc/service-links; then
if test x"$enable_doc" = xyes -o x"$enable_man" = xyes; then
AC_MSG_ERROR([docs not built, use '--disable-doc --disable-man' or --enable-maintainer-mode])
fi
fi
fi
FIREHOL_CONFIG_DIR=$(eval echo "$sysconfdir/firehol" | sed -e 's|^NONE|/usr/local|')
AC_SUBST(FIREHOL_CONFIG_DIR)
@ -89,8 +103,6 @@ AC_CHECK_PROG([ZCAT_CMD], [gzcat], [gzcat])
AC_CHECK_PROG([ZCAT_CMD], [gunzip], [gunzip -c])
AX_NEED_PROG([ZCAT_CMD], [gzip], [gzip -d -c])
AM_CONDITIONAL([ENABLE_DOC], [test "${enable_doc}" = "yes"])
AC_CONFIG_FILES([
Makefile
sbin/Makefile

4
doc/Makefile.am
View File

@ -2,8 +2,6 @@
SUBDIRS = . firehol fireqos vnetbuild
all-local: service-links
dochtmldir = $(htmldir)/html
MANUAL_LINKS = \
@ -40,6 +38,8 @@ dochtml_DATA = \
if MAINTAINER_MODE
all-local: service-links
MKSERVICELINKS = ${top_srcdir}/doc/tools/mkservicelinks
FIREHOLIN = $(top_srcdir)/sbin/firehol.in

4
doc/firehol/Makefile.am
View File

@ -127,10 +127,14 @@ pdf_DATA = \
endif
if ENABLE_MAN
man_MANS = \
$(MANUALMAN_GENERATED) \
$(MANUALMAN_GENERATED_INDIRECT)
endif
if MAINTAINER_MODE
MKSERVICELINKS = ${top_srcdir}/doc/tools/mkservicelinks

4
doc/fireqos/Makefile.am
View File

@ -104,10 +104,14 @@ pdf_DATA = \
endif
if ENABLE_MAN
man_MANS = \
$(MANUALMAN_GENERATED) \
$(MANUALMAN_GENERATED_INDIRECT)
endif
if MAINTAINER_MODE
MKSERVICELINKS = ${top_srcdir}/doc/tools/mkservicelinks

4
doc/vnetbuild/Makefile.am
View File

@ -40,10 +40,14 @@ pdf_DATA = \
endif
if ENABLE_MAN
man_MANS = \
$(MANUALMAN_GENERATED) \
$(MANUALMAN_GENERATED_INDIRECT)
endif
if MAINTAINER_MODE
MKSERVICELINKS = ${top_srcdir}/doc/tools/mkservicelinks