diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | doc/.gitignore | 3 | ||||
| -rw-r--r-- | doc/Makefile.am | 18 | ||||
| -rw-r--r-- | tests/build/README | 1 | ||||
| -rwxr-xr-x | tests/build/run-tests.sh | 2 |
6 files changed, 4 insertions, 38 deletions
@@ -26,8 +26,6 @@ Installation instructions for nftables - optional: docbook2x: required for building man-page - - optional: docbook-utils: required for building PDF man-page - Configuring and compiling ========================= diff --git a/configure.ac b/configure.ac index c1c9035f..c6536a31 100644 --- a/configure.ac +++ b/configure.ac @@ -24,12 +24,6 @@ AC_ARG_ENABLE([man-doc], [enable_man_doc=yes]), [enable_man_doc=yes]) AM_CONDITIONAL([BUILD_MAN], [test "x$enable_man_doc" == "xyes" ]) -AC_ARG_ENABLE([pdf-doc], - AS_HELP_STRING([--enable-pdf-doc], [Enable PDF documentation]), - AS_IF([test "x$enable_pdf_doc" = "xno"], [enable_pdf_doc=no], - [enable_pdf_doc=yes]), [enable_pdf_doc=no]) -AM_CONDITIONAL([BUILD_PDF], [test "x$enable_pdf_doc" == "xyes" ]) - # Checks for programs. AC_PROG_CC AC_PROG_MKDIR_P @@ -57,15 +51,6 @@ AM_PROG_LIBTOOL AC_CHECK_PROG(A2X, [a2x], [a2x]) AM_CONDITIONAL([BUILD_MAN], [test -n "$A2X"]) -AM_COND_IF([BUILD_PDF], [ - AC_CHECK_PROG(DBLATEX, [dblatex], [found], [no]) - AS_IF([test "$DBLATEX" == "no"], - [AC_MSG_ERROR([dblatex not found])]) - AS_IF([test -z "$A2X"], - [AC_MSG_ERROR([a2x not found])]) - [need_a2x=yes] -]) - AS_IF([test "$need_a2x" = "yes"], [ AC_CHECK_PROG(A2X, [a2x], [found], [no]) AS_IF([test "$A2X" != "found"], @@ -156,7 +141,6 @@ nft configuration: enable debugging symbols: ${with_debug} use mini-gmp: ${with_mini_gmp} enable man page: ${enable_man_doc} - enable pdf documentation: ${enable_pdf_doc} libxtables support: ${with_libxtables} json output support: ${with_json}" diff --git a/doc/.gitignore b/doc/.gitignore index 30ec6a35..baf2ecab 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,6 +1,3 @@ libnftables.3 -libnftables.pdf libnftables-json.5 -libnftables-json.pdf nft.8 -nft.pdf diff --git a/doc/Makefile.am b/doc/Makefile.am index 80a37608..e70dfc5e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,10 +2,6 @@ if BUILD_MAN man_MANS = nft.8 libnftables-json.5 libnftables.3 endif -if BUILD_PDF -pdf_DATA = nft.pdf libnftables-json.pdf libnftables.pdf -endif - ASCIIDOC_MAIN = nft.txt ASCIIDOC_INCLUDES = \ data-types.txt \ @@ -15,17 +11,9 @@ ASCIIDOC_INCLUDES = \ statements.txt ASCIIDOCS = ${ASCIIDOC_MAIN} ${ASCIIDOC_INCLUDES} -pdfdir=${docdir}/pdf - .txt.8: ${ASCIIDOCS} ${AM_V_GEN}${A2X} --doctype manpage --format manpage -D ${builddir} $< -.txt.pdf: ${ASCIIDOCS} - ${AM_V_GEN}${A2X} --doctype manpage --format pdf -D ${builddir} $< - -.adoc.pdf: - a2x --doctype manpage --format pdf -D ${builddir} $< - .adoc.3: a2x --doctype manpage --format manpage -D ${builddir} $< @@ -35,7 +23,7 @@ pdfdir=${docdir}/pdf EXTRA_DIST = ${ASCIIDOCS} libnftables-json.adoc libnftables.adoc CLEANFILES = \ - nft.pdf nft.8 \ - libnftables-json.pdf libnftables-json.5 \ - libnftables.pdf libnftables.3 \ + nft.8 \ + libnftables-json.5 \ + libnftables.3 \ *~ diff --git a/tests/build/README b/tests/build/README index dfe344b7..c365b88c 100644 --- a/tests/build/README +++ b/tests/build/README @@ -6,7 +6,6 @@ In this testsuite, automated testing is done for following nft compile options: enable debugging symbols use mini-gmp enable man page - enable pdf documentation libxtables support Run the test script 'run-tests.sh' as root user: ./run-tests.sh diff --git a/tests/build/run-tests.sh b/tests/build/run-tests.sh index 4aff1980..6ac2ef47 100755 --- a/tests/build/run-tests.sh +++ b/tests/build/run-tests.sh @@ -10,7 +10,7 @@ tarball="nftables-0.8.1.tar.bz2" dir=../.. cmd=./configure argument=( --without-cli --enable-debug --with-mini-gmp --enable-man-doc - --enable-pdf-doc --with-xtables --with-json) + --with-xtables --with-json) ok=0 failed=0 |