From e5b6a02271ca2c74592e37468d2fcda9363ce032 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 28 Mar 2007 00:15:16 +0000 Subject: Use default autoconf extension, add some ignore files. (This used to be commit a6fab663589c8710172ea1545ac99b3c348a87b5) --- docs/.bzrignore | 15 ++++++++++ docs/Makefile | 2 +- docs/configure.ac | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/configure.in | 90 ------------------------------------------------------- 4 files changed, 106 insertions(+), 91 deletions(-) create mode 100644 docs/.bzrignore create mode 100644 docs/configure.ac delete mode 100644 docs/configure.in diff --git a/docs/.bzrignore b/docs/.bzrignore new file mode 100644 index 0000000000..4ecba7410c --- /dev/null +++ b/docs/.bzrignore @@ -0,0 +1,15 @@ +Makefile.settings +Samba3-Developers-Guide-attributions.xml +Samba3-HOWTO-attributions.xml +Samba3-HOWTO.d +Samba4-HOWTO.d +Samba4-HOWTO-attributions.xml +autom4te.cache +config.log +config.status +configure +test.d +tmp +smbdotconf/parameters.all.xml +smbdotconf/parameters.global.xml +smbdotconf/parameters.service.xml diff --git a/docs/Makefile b/docs/Makefile index f66ef6ae88..33c6425d1b 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -26,7 +26,7 @@ Makefile.settings: configure @echo Makefile.settings not present, trying to run configure... ./configure -configure: configure.in +configure: configure.ac @echo configure not present, trying to regenerate it... autoreconf endif diff --git a/docs/configure.ac b/docs/configure.ac new file mode 100644 index 0000000000..4440290d0c --- /dev/null +++ b/docs/configure.ac @@ -0,0 +1,90 @@ +AC_INIT(xslt/latex.xsl) + +AC_ARG_WITH(samba-sources, +[ --with-samba-sources=DIR Specify path to Samba sources], +[ test "$withval" && SPECIFIED_SOURCEDIR="$withval" ]) + +LATEX_DOCUMENTCLASS_OPTIONS="letterpaper,11pt,openright,twoside" +AC_ARG_ENABLE(prentice-hall, +[ --enable-prentice-hall Produce Prentice-Hall compatible output], +[ test "$enableval" && LATEX_DOCUMENTCLASS_OPTIONS="letterpaper,10pt,openleft,twoside,ph" ]) +AC_SUBST(LATEX_DOCUMENTCLASS_OPTIONS) + +DOC_BUILD_DATE=`date '+%d-%m-%Y'` +AC_SUBST(DOC_BUILD_DATE) +AC_SUBST(SAMBASOURCEDIR) + +DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL) +DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL) +DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, LATEX) +DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PS) +DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PDF) +DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTML) +DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTMLHELP) +DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PEARSON) +DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PLUCKER) +DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, FOPDF) + +# Check dia version number + +if test -n "$DIA"; then + [ DIA_VERSION=`$DIA -v | egrep -o '([0-9]+)\.([0-9]+)'`] + DIA_MAJ_VERSION=`echo $DIA_VERSION | cut -d . -f 1` + DIA_MIN_VERSION=`echo $DIA_VERSION | cut -d . -f 2` + + if test "$DIA_MAJ_VERSION" -le "0" + then + if test "$DIA_MIN_VERSION" -le "92" && test -z "$DISPLAY" + then + AC_MSG_ERROR([Dia below 0.93 requires an X environment. Set \$DISPLAY or install Dia 0.93 or higher]) + fi + fi +fi + +DOCS_TARGET_REQUIRE_PROGRAM(MAKEINDEX, makeindex, LATEX) +DOCS_TARGET_REQUIRE_PROGRAM(PDFLATEX, pdflatex, PDF) +DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF) +DOCS_TARGET_REQUIRE_PROGRAM(THUMBPDF, thumbpdf, PDF) +DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS) +DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS) +DOCS_TARGET_REQUIRE_PROGRAM(LATEX, latex, PS) +DOCS_TARGET_REQUIRE_PROGRAM(DVIPS, dvips, PS) +DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER) +DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT) +DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED) +DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VALIDATE) +DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF) +DOCS_TARGET_REQUIRE_PROGRAM(DB2TEXI, docbook2x-texi, TEXI) +DOCS_TARGET_REQUIRE_PROGRAM(MAKEINFO, makeinfo, TEXIINFO) +DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR $SPECIFIED_SOURCEDIR/source ..], [param/loadparm.c], SAMBASOURCEDIR, UNDOCUMENTED) + +AC_MSG_RESULT([]) +AC_MSG_RESULT([Summary:]) +AC_MSG_RESULT([--------------]) + +DOCS_DEFINE_TARGET(ALL, [], [base requirements], []) +DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex]) +DOCS_DEFINE_TARGET(PDF, LATEX, [PDF versions], [pdf]) +DOCS_DEFINE_TARGET(PS, LATEX, [PostScript versions], [ps]) +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(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(FOPDF, ALL, [PDF versions thru FO], [fo-pdf]) +DOCS_DEFINE_TARGET(TEXI, ALL, [TexInfo versions], [texi]) +DOCS_DEFINE_TARGET(TEXIINFO, ALL, [TexInfo Info versions], [texiinfo]) +DOCS_DEFINE_TARGET(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented]) +DOCS_DEFINE_TARGET(TXT, HTML, [text versions], [txt]) + +if test x"$TARGETS" = x; then + AC_MSG_ERROR([You won't be able to build any of the docs]) +else + AC_MSG_RESULT([You will be able to build: $TARGETS]) +fi + +AC_SUBST(TARGETS) + +AC_OUTPUT( Makefile.settings) diff --git a/docs/configure.in b/docs/configure.in deleted file mode 100644 index 4440290d0c..0000000000 --- a/docs/configure.in +++ /dev/null @@ -1,90 +0,0 @@ -AC_INIT(xslt/latex.xsl) - -AC_ARG_WITH(samba-sources, -[ --with-samba-sources=DIR Specify path to Samba sources], -[ test "$withval" && SPECIFIED_SOURCEDIR="$withval" ]) - -LATEX_DOCUMENTCLASS_OPTIONS="letterpaper,11pt,openright,twoside" -AC_ARG_ENABLE(prentice-hall, -[ --enable-prentice-hall Produce Prentice-Hall compatible output], -[ test "$enableval" && LATEX_DOCUMENTCLASS_OPTIONS="letterpaper,10pt,openleft,twoside,ph" ]) -AC_SUBST(LATEX_DOCUMENTCLASS_OPTIONS) - -DOC_BUILD_DATE=`date '+%d-%m-%Y'` -AC_SUBST(DOC_BUILD_DATE) -AC_SUBST(SAMBASOURCEDIR) - -DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL) -DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, LATEX) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PS) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PDF) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTML) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTMLHELP) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PEARSON) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PLUCKER) -DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, FOPDF) - -# Check dia version number - -if test -n "$DIA"; then - [ DIA_VERSION=`$DIA -v | egrep -o '([0-9]+)\.([0-9]+)'`] - DIA_MAJ_VERSION=`echo $DIA_VERSION | cut -d . -f 1` - DIA_MIN_VERSION=`echo $DIA_VERSION | cut -d . -f 2` - - if test "$DIA_MAJ_VERSION" -le "0" - then - if test "$DIA_MIN_VERSION" -le "92" && test -z "$DISPLAY" - then - AC_MSG_ERROR([Dia below 0.93 requires an X environment. Set \$DISPLAY or install Dia 0.93 or higher]) - fi - fi -fi - -DOCS_TARGET_REQUIRE_PROGRAM(MAKEINDEX, makeindex, LATEX) -DOCS_TARGET_REQUIRE_PROGRAM(PDFLATEX, pdflatex, PDF) -DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF) -DOCS_TARGET_REQUIRE_PROGRAM(THUMBPDF, thumbpdf, PDF) -DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS) -DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS) -DOCS_TARGET_REQUIRE_PROGRAM(LATEX, latex, PS) -DOCS_TARGET_REQUIRE_PROGRAM(DVIPS, dvips, PS) -DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER) -DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT) -DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED) -DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VALIDATE) -DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF) -DOCS_TARGET_REQUIRE_PROGRAM(DB2TEXI, docbook2x-texi, TEXI) -DOCS_TARGET_REQUIRE_PROGRAM(MAKEINFO, makeinfo, TEXIINFO) -DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR $SPECIFIED_SOURCEDIR/source ..], [param/loadparm.c], SAMBASOURCEDIR, UNDOCUMENTED) - -AC_MSG_RESULT([]) -AC_MSG_RESULT([Summary:]) -AC_MSG_RESULT([--------------]) - -DOCS_DEFINE_TARGET(ALL, [], [base requirements], []) -DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex]) -DOCS_DEFINE_TARGET(PDF, LATEX, [PDF versions], [pdf]) -DOCS_DEFINE_TARGET(PS, LATEX, [PostScript versions], [ps]) -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(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(FOPDF, ALL, [PDF versions thru FO], [fo-pdf]) -DOCS_DEFINE_TARGET(TEXI, ALL, [TexInfo versions], [texi]) -DOCS_DEFINE_TARGET(TEXIINFO, ALL, [TexInfo Info versions], [texiinfo]) -DOCS_DEFINE_TARGET(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented]) -DOCS_DEFINE_TARGET(TXT, HTML, [text versions], [txt]) - -if test x"$TARGETS" = x; then - AC_MSG_ERROR([You won't be able to build any of the docs]) -else - AC_MSG_RESULT([You will be able to build: $TARGETS]) -fi - -AC_SUBST(TARGETS) - -AC_OUTPUT( Makefile.settings) -- cgit