From ef6d755c944ef5af40c909c6683a3691dc9f6a57 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 21 Aug 2010 03:07:54 +0000
Subject: 	External tool noweb is no longer required. 	* INSTALL:
 Update instructions. 	* Makefile.pamphlet: Remove rules for building noweb. 
 (AXIOM_SRC_TARGETS): Include all-utils. 	* config/open-axiom.m4
 (OPENAXIOM_BUILD_TOOLS): Don't check for 	notangle and noweave. 	*
 config/setup-dep.mk: Remove rules for generating document. 	*
 config/var-def.mk: Remove NOTANGLE and NOWEAVE variables. 	*
 configure.ac: Instantiate Makefile for src/utils.

---
 config/open-axiom.m4           | 18 ++----------------
 config/openaxiom-c-macros.h.in |  3 +++
 config/setup-dep.mk            | 12 ++----------
 config/var-def.mk              |  9 +--------
 4 files changed, 8 insertions(+), 34 deletions(-)

(limited to 'config')

diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index e888c971..a2e26e8b 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -573,21 +573,6 @@ case $build in
 	fi
 	;;
 esac
-
-## Make sure noweb executable is available
-AC_CHECK_PROGS([NOTANGLE], [notangle])
-AC_CHECK_PROGS([NOWEAVE], [noweave])
-## In case noweb is missing we need to build our own.
-if test -z "$NOTANGLE" -o -z "$NOWEAVE" ; then
-    ## 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'
-    oa_all_prerequisites="$oa_all_prerequisites all-noweb"
-fi
 ])
 
 dnl ---------------------------
@@ -992,7 +977,7 @@ dnl -- OPENAXIOM_CHECK_MM --
 dnl ------------------------
 dnl Check for host capability of memory mapping.
 AC_DEFUN([OPENAXIOM_CHECK_MM],[
-AC_CHECK_HEADERS([sys/mman.h])
+AC_CHECK_HEADERS([sys/mman.h fcntl.h])
 ## We want annonymous mapping for memory allocation.  Unfortunately,
 ## the flag for anonymous mapping is not standardized.  Popular names
 ##  are MAP_ANONYMOUS and MAP_ANON.
@@ -1032,6 +1017,7 @@ AC_DEFUN([OPENAXIOM_CHECK_MISC],[
 case $GCC in
   yes)
      CFLAGS="$CFLAGS -O2 -Wall"
+     CXXFLAGS="$CXXFLAGS -O2 -Wall"
      ;;
 esac
 ])
diff --git a/config/openaxiom-c-macros.h.in b/config/openaxiom-c-macros.h.in
index df10e836..c92cc8ac 100644
--- a/config/openaxiom-c-macros.h.in
+++ b/config/openaxiom-c-macros.h.in
@@ -51,6 +51,9 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
 /* Define to 1 if the system has the type `intptr_t'. */
 #undef HAVE_INTPTR_T
 
diff --git a/config/setup-dep.mk b/config/setup-dep.mk
index ab5913dc..a89e4ba5 100644
--- a/config/setup-dep.mk
+++ b/config/setup-dep.mk
@@ -97,16 +97,12 @@ $(axiom_target_docdir)/$(subdir)%.dvi: $(builddir)/%.dvi
 	export TEXINPUTS; \
 	BIBINPUTS=".:$(axiom_build_texdir):$${TEXINPUTS}"; \
 	export BIBINPUTS; \
-	$(axiom_build_document) --latex $<
+	$(oa_hammer) --latex $<
 
 %.tex: $(srcdir)/%.pamphlet
-	$(axiom_build_document) --weave --output=$@ $<
+	$(oa_hammer) --weave --output=$@ $<
 
 
-$(axiom_build_texdir)/axiom.sty: $(axiom_src_docdir)/axiom.sty.pamphlet
-	$(mkinstalldirs) $(axiom_build_texdir)/
-	$(axiom_build_document) --tangle=axiom.sty --output=$@ $<
-
 ## Rules for regenerating configure.ac and configure from
 ## pamphlet files.  
 $(top_srcdir)/configure.ac: $(top_srcdir)/configure.ac.pamphlet
@@ -135,10 +131,6 @@ Makefile: $(srcdir)/Makefile.in $(top_srcdir)/config/var-def.mk \
 	  $(abs_top_builddir)/config.status
 	cd $(abs_top_builddir) && $(SHELL) ./config.status $(subdir)$@
 
-$(axiom_build_document): $(axiom_src_srcdir)/scripts/document.in
-	cd $(abs_top_builddir) && \
-	$(SHELL) ./config.status build/scripts/document
-
 $(top_builddir)/src/lisp/core.lisp: \
 	$(top_srcdir)/src/lisp/core.lisp.in \
 	$(top_builddir)/config.status
diff --git a/config/var-def.mk b/config/var-def.mk
index 3fee05b7..928b1e8c 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -235,14 +235,7 @@ oa_include_gcl = @oa_include_gcl@
 ## -------------------------------------------
 ## -- Files generated for the build machine --
 ## -------------------------------------------
-axiom_build_document = $(axiom_top_builddir)/scripts/document
-axiom_build_nowebdir = $(axiom_builddir)/noweb
-
-TANGLE = @NOTANGLE@
-WEAVE = @NOWEAVE@
-## We export TANGLE and WEAVE for use in subshells, such as document.
-export TANGLE
-export WEAVE
+oa_hammer = $(top_builddir)/src/utils/hammer$(EXEEXT)
 
 AXIOM_LISP = @AXIOM_LISP@
 # Extension of the output file name returned by compile-file
-- 
cgit v1.2.3