* configure.ac.pamphlet: Look for path to `awk'.

	Instantiate src/hyper/presea.

1 files changed, 15 insertions, 26 deletions

diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 6ebb61d8..2af9939c 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -692,32 +692,18 @@ AC_CHECK_PROGS([MKTEMP], [mktemp])
 @
 
 \paragraph{The [[awk]] program}
-The old build machinery needs 'awk'.  Currently, it checks for
-'gawk', 'nawk', and 'awk'.  Autoconf has a predefined test for that
-task.  It checks for 'gawk', 'mawk', 'nawk', and 'awk' in that order.
-That should be OK and match OpenAxiom's need.
-
-The old build system claims that on solaris9, gawk, gtar 
-and gpatch are required (with no much explanation of why).  Notice
-that these programs are needed only to build OpenAxiom; so we do
-check based on the value of [[build]]. 
-<<awk and tar program>>=
-case $build in
-     *-solaris9)
-        AC_CHECK_PROG([AWK], [gawk], 
-                      [gawk], [AC_MSG_ERROR([OpenAxiom needs gawk])])
-
-        AC_CHECK_PROG([PATCH], [gpatch],
-                      [gptach], [AC_MSG_ERROR([OpenAxiom needs gpatch])]) 
-        ;;
+The old build machinery needs \Tool{awk} on the build machine for
+extracting algebra definitions.  The same tool is needed on the
+host machine for proper run of HyperDoc utilities.  Note that at
+the moment we do not make a distinction between the build machine
+and the host machine (though that may change in the future).
 
-      *)
-        AC_PROG_AWK
+<<awk and tar program>>=
+AC_PROG_AWK
+AC_PATH_PROGS([HOST_AWK],[gawk mawk nawk awk])
 
-        AC_CHECK_PROGS([PATCH], [gpatch patch], 
-                       [AC_MSG_ERROR([OpenAxiom needs a patch program])])
-        ;;
-esac
+AC_CHECK_PROGS([PATCH], [gpatch patch], 
+   [AC_MSG_ERROR([OpenAxiom needs a patch program])])
 @
 
 \paragraph{Binary utils.}
@@ -1126,7 +1112,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2008-10-24], 
+AC_INIT([OpenAxiom], [1.3.0-2008-10-25], 
         [open-axiom-bugs@lists.sf.net])
 
 @
@@ -1199,6 +1185,8 @@ AXIOM_MAKEFILE([src/input/Makefile])
 AXIOM_MAKEFILE([src/etc/Makefile])
 AXIOM_MAKEFILE([src/doc/Makefile])
 
+AC_CONFIG_FILES([src/hyper/presea], [chmod +x src/hyper/presea])
+
 
 ## We now generate the "document" script and support files at configure time.
 ## We put them in the build directory because they are intended to be 
@@ -1218,7 +1206,8 @@ egrep '@<<(category|domain|package) .*>>=' \
 	set $chunk_desc; spad_abbrev=$2
 	cat >> src/algebra/tmp-extract-spad.mk <<EOF
 $spad_abbrev.spad: \$(srcdir)/`basename $spad_file` ; \
-    @\$(axiom_build_document) --output=\$@ --tangle="$chunk_desc" \$<
+    @\$(axiom_build_document) --output=\$@.tmp --tangle="$chunk_desc" \$< && \
+    \$(top_confdir)/move-if-change \$@.tmp \$@
 EOF
     done 
 echo done