build: fix documentation build

Handle the docbook2x-man mess that is called differently on different distributions.
Also switch to dblatex since db2pdf is unable to handle XML on Fedora (and probably
other distributions).

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/Makefile.defs.in b/Makefile.defs.in
index 3fee9c22335745c176d1d609c287e62f6c1c6486..915d3d832e3e5f134ef89e2293a8761b0f28fd55 100644 (file)
--- a/Makefile.defs.in
+++ b/Makefile.defs.in
@@ -6,6 +6,7 @@ YACC            = @YACC@
 MKDIR_P                = @MKDIR_P@
 INSTALL                = @INSTALL@
 SED            = @SED@
+DB2MAN         = @DB2MAN@
 
 PACKAGE_TARNAME        = @PACKAGE_TARNAME@
 

diff --git a/Makefile.rules.in b/Makefile.rules.in
index ae563a540db74282af90723238e7ad00dd46ceb2..6a0091611b08261ee508bb8b7bca6a701c803429 100644 (file)
--- a/Makefile.rules.in
+++ b/Makefile.rules.in
@@ -37,11 +37,11 @@ configure:          configure.ac
 
 %.8:                   %.xml   $(makedeps)
                        @echo -e "  MAN\t\t$@"
-                       (cd $(SUBDIR); docbook2x-man ../$<)
+                       (cd $(SUBDIR); $(DB2MAN) --xinclude ../$<)
 
 %.pdf:                 %.xml   $(makedeps)
                        @echo -e "  PDF\t\t$@"
-                       db2pdf -o $(SUBDIR) $<
+                       dblatex -q -t pdf -o $@ $<
 
 archive:
                        git archive --prefix=nftables-@PACKAGE_VERSION@/ HEAD | \

diff --git a/configure.ac b/configure.ac
index 6a5e4ce62d1a889460ada60a6ead42a343e7265b..8cf76133dc686d536030b299ca35fe7d4c3945b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,16 +25,28 @@ AC_PROG_MKDIR_P
 AC_PROG_INSTALL
 AC_PROG_SED
 
-AC_CHECK_PROG(CONFIG_MAN, docbook2x-man, y, n)
-if test "$CONFIG_MAN" != "y"
+AC_CHECK_PROG(CONFIG_MAN1, [docbook2x-man], [y], [n])
+if test "$CONFIG_MAN1" == "y"
 then
-       AC_MSG_WARN([docbookx2-man not found, no manpages will be built])
+       CONFIG_MAN=y
+       DB2MAN=docbook2x-man
+else
+       AC_CHECK_PROG(CONFIG_MAN2, [db2x_docbook2man], [y], [n])
+       if test "$CONFIG_MAN2" == "y"
+       then
+               CONFIG_MAN=y
+               DB2MAN=db2x_docbook2man
+       else
+               AC_MSG_WARN([docbookx2-man/db2x_docbook2man not found, no manpages will be built])
+       fi
 fi
+AC_SUBST(CONFIG_MAN)
+AC_SUBST(DB2MAN)
 
-AC_CHECK_PROG(CONFIG_PDF, db2pdf, y, n)
+AC_CHECK_PROG(CONFIG_PDF, dblatex, y, n)
 if test "$CONFIG_PDF" != "y"
 then
-       AC_MSG_WARN([db2pdf not found, no PDF manpages will be built])
+       AC_MSG_WARN([dblatex not found, no PDF manpages will be built])
 fi
 
 AC_PATH_PROG(LEX, [flex])