Rev 943: Use default autoconf extension,
add some ignore files. in file:///home/jelmer/samba-docs/trunk/
Jelmer Vernooij
jelmer at samba.org
Wed Mar 28 01:01:46 GMT 2007
At file:///home/jelmer/samba-docs/trunk/
------------------------------------------------------------
revno: 943
revision-id: svn-v2:1086 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
parent: svn-v2:1085 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
parent: jelmer at samba.org-20070328001455-qy44pgiskvijzrom
committer: jelmer
branch nick: trunk
timestamp: Wed 2007-03-28 00:15:16 +0000
message:
Use default autoconf extension, add some ignore files.
removed:
configure.in svn-v2:3 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-configure.in
added:
.bzrignore svn-v2:1086 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-.bzrignore
configure.ac svn-v2:1086 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-configure.ac
modified:
Makefile svn-v2:343 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-Makefile
------------------------------------------------------------
revno: 942.1.1
merged: jelmer at samba.org-20070328001455-qy44pgiskvijzrom
parent: svn-v2:1085 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2007-03-28 02:14:55 +0200
message:
Use default autoconf extension, add some ignore files.
=== removed file 'configure.in'
--- a/configure.in 2006-12-27 01:24:41 +0000
+++ b/configure.in 1970-01-01 00:00:00 +0000
@@ -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)
=== added file '.bzrignore'
--- a/.bzrignore 1970-01-01 00:00:00 +0000
+++ b/.bzrignore 2007-03-28 00:15:16 +0000
@@ -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
=== added file 'configure.ac'
--- a/configure.ac 1970-01-01 00:00:00 +0000
+++ b/configure.ac 2007-03-28 00:15:16 +0000
@@ -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)
=== modified file 'Makefile'
--- a/Makefile 2006-12-27 01:30:39 +0000
+++ b/Makefile 2007-03-28 00:15:16 +0000
@@ -26,7 +26,7 @@
@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
More information about the samba-cvs
mailing list