source4 smbd process: pass the fatal flag to terminate

[bbaumbach/samba-autobuild/.git] / docs-xml / configure.ac

diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 221081d7481036eb526451f9797e9c53f70b4bf8..9a7f9ce168ef1ed77b9721295dcb9a22ca4f73e4 100644 (file)
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -19,7 +19,6 @@ DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTMLHELP)
 DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PEARSON)
 DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PLUCKER)
 
 DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PEARSON)
 DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PLUCKER)
 

-DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF)

 DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS)
 DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS)
 DOCS_TARGET_REQUIRE_PROGRAM(DBLATEX, dblatex, LATEX)
 DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS)
 DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS)
 DOCS_TARGET_REQUIRE_PROGRAM(DBLATEX, dblatex, LATEX)


@@ -38,8 +37,8 @@ DOCS_DEFINE_TARGET(ALL, [], [base requirements], [])
 DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex ps pdf])
 DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html])
 DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp])
 DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex ps pdf])
 DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html])
 DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp])

-DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman3])
-DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages3])
+DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman])
+DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages])

 DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson])
 DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
 DOCS_DEFINE_TARGET(VALIDATE, ALL, [validating docbook output], [])
 DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson])
 DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
 DOCS_DEFINE_TARGET(VALIDATE, ALL, [validating docbook output], [])


@@ -56,4 +55,18 @@ fi
 
 AC_SUBST(TARGETS)
 
 
 AC_SUBST(TARGETS)
 

-AC_OUTPUT( Makefile.settings build/catalog.xml)
+. ../VERSION
+if test x"$DOC_VERSION" = x; then
+       #AC_MSG_ERROR([Please export DOC_VERSION variable])
+       VERSION_SUFFIX=""
+       if test x"$SAMBA_VERSION_PRE_RELEASE" != x; then
+               VERSION_SUFFIX=pre
+       fi
+       DOC_VERSION=${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}${VERSION_SUFFIX}
+else
+       AC_MSG_RESULT([DOC_VERSION: ${DOC_VERSION}])
+fi
+
+doc_version="${DOC_VERSION}"
+AC_SUBST(doc_version)
+AC_OUTPUT( Makefile.settings build/catalog.xml build/DTD/samba.build.version)