From 6499807eec35fdedd84e4ee8ca4625c018652975 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Thu, 16 Aug 2007 23:40:29 +0000 Subject: * 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 (<>): Resurect. (clean-local): Remove noweb build dir too. * Makefile.in: Regenerate. --- configure | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index d0a6f7fd..21072ec1 100755 --- a/configure +++ b/configure @@ -20506,11 +20506,17 @@ done ## In case noweb is missing we need to build our own. if test -z $NOTANGLE -o -z $NOWEAVE ; then - { echo "$as_me:$LINENO: OpenAxiom requires noweb utilties" >&5 + ## Yes, but do we have the source files to build from? + if test ! -d ${srcdir}/noweb; then + { echo "$as_me:$LINENO: OpenAxiom requires noweb utilties" >&5 echo "$as_me: OpenAxiom requires noweb utilties" >&6;} - { { echo "$as_me:$LINENO: error: Please install noweb and reconfigure" >&5 -echo "$as_me: error: Please install noweb and reconfigure" >&2;} + { { echo "$as_me:$LINENO: error: Please get the tarball of dependencies and reconfigure" >&5 +echo "$as_me: error: Please get the tarball of dependencies and reconfigure" >&2;} { (exit 1); exit 1; }; } + fi + NOTANGLE='$(axiom_build_bindir)/notangle' + NOWEAVE='$(axiom_build_bindir)/noweave' + axiom_all_prerequisites="$axiom_all_prerequisites all-noweb" fi ## ------------------------ -- cgit v1.2.3