aboutsummaryrefslogtreecommitdiff
path: root/configure.ac.pamphlet
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2007-08-16 23:40:29 +0000
committerdos-reis <gdr@axiomatics.org>2007-08-16 23:40:29 +0000
commit6499807eec35fdedd84e4ee8ca4625c018652975 (patch)
treee726b988709d6f13f8455ed81ec327b8c278493e /configure.ac.pamphlet
parent0c807cce60341e98126b4d834e6fbda97b216af6 (diff)
downloadopen-axiom-6499807eec35fdedd84e4ee8ca4625c018652975.tar.gz
* configure.ac.pamphlet: Don't error out if noweb source files
are present when no executable is available. * configure.ac.: Regenerate. * configure: Likewise. * config/var-def.mk (axiom_build_nowebdir): Resurect. * Makefile.pamphlet (<<noweb>>): Resurect. (clean-local): Remove noweb build dir too. * Makefile.in: Regenerate.
Diffstat (limited to 'configure.ac.pamphlet')
-rw-r--r--configure.ac.pamphlet21
1 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 61011e4b..927e158d 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -681,9 +681,14 @@ AC_CHECK_PROG([AR], [ar], [ar], [AC_MSG_ERROR([program 'ar' is missing])])
OpenAxiom sources is literate, and it uses the \Tool{noweb} technology.
\Tool{noweb} is used to extract both the actual source code from the
pamphlet files, and the documentation as \LaTeX{} source files.
-There are many platforms on which \Tool{noweb} is inexistent. OpenAxiom source
-repository used to cache a copy of \Tool{noweb}. We now require
-that an external [[noweb]] executable.
+There are many platforms on which \Tool{noweb} is not installed
+by default. There is tarball of the dependencies on OpenAxiom's
+web site to people to grab in case they don't have \Tool{noweb}
+or \Tool{GCL}. What we do is that if noweb is not found, then
+we try to build one from the tarball of dependency. For that
+to work, the protocol is that the user has placed \Tool{noweb}'s source
+files in a directory named \File{noweb/} at the top level. Normally,
+this works right when one follows the installation instructions.
%
<<doc utils>>=
AC_PATH_PROG([LATEX], [latex])
@@ -704,8 +709,14 @@ AC_CHECK_PROGS([NOWEAVE], [noweave])
## In case noweb is missing we need to build our own.
if test -z $NOTANGLE -o -z $NOWEAVE ; then
- AC_MSG_NOTICE([OpenAxiom requires noweb utilties])
- AC_MSG_ERROR([Please install noweb and reconfigure])
+ ## Yes, but do we have the source files to build from?
+ if test ! -d ${srcdir}/noweb; then
+ AC_MSG_NOTICE([OpenAxiom requires noweb utilties])
+ AC_MSG_ERROR([Please get the tarball of dependencies and reconfigure])
+ fi
+ NOTANGLE='$(axiom_build_bindir)/notangle'
+ NOWEAVE='$(axiom_build_bindir)/noweave'
+ axiom_all_prerequisites="$axiom_all_prerequisites all-noweb"
fi
@