From 42c00eb3fd18295be5da760d2ed8e6dece2c91bc Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 15 Aug 2010 23:36:33 +0000
Subject: 	* config/open-axiom.m4 (OPENAXIOM_BUILD_TOOLS): New.  Abstract
 	over build tool requirements. 	* configure.ac.pamphlet: Use it.

---
 configure | 678 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 338 insertions(+), 340 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 50487704..0ae63cc3 100755
--- a/configure
+++ b/configure
@@ -819,21 +819,21 @@ axiom_fasl_type
 oa_use_dynamic_lib
 axiom_eval_flags
 axiom_quiet_flags
-NOWEAVE
-NOTANGLE
 MAKEINDEX
 LATEX
 PDFLATEX
 HOST_AWK
+oa_editor
+axiom_src_subdirs
+NOWEAVE
+NOTANGLE
+MAKE
 AWK
 MKTEMP
-TOUCH
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
-MAKE
-oa_editor
-axiom_src_subdirs
+TOUCH
 libext
 shared_ext
 LIBTOOL_DEPS
@@ -17014,131 +17014,16 @@ case $host in
 esac
 
 
-axiom_src_subdirs="lib hyper lisp boot interp share algebra input etc doc"
-
-
-## On Windows system, we prefer the default installation
-## location to be 'C:/Program Files/OpenAxiom', following Windows
-## convention.  We cannot use AC_PREFIX_DEFAULT directly as it seems
-## to operate unconditionally.  Therefore, we resort to this dirty
-## trick stepping over Autoconf's internals.
-case $host in
-    *mingw*)
-        ac_default_prefix="C:/Program Files/OpenAxiom"
-        for ac_prog in notepad.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_oa_editor+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $oa_editor in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_oa_editor="$oa_editor" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_oa_editor="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-oa_editor=$ac_cv_path_oa_editor
-if test -n "$oa_editor"; then
-  { $as_echo "$as_me:$LINENO: result: $oa_editor" >&5
-$as_echo "$oa_editor" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$oa_editor" && break
-done
-
-        ;;
-    *)
-        for ac_prog in vi
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_oa_editor+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $oa_editor in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_oa_editor="$oa_editor" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_oa_editor="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-oa_editor=$ac_cv_path_oa_editor
-if test -n "$oa_editor"; then
-  { $as_echo "$as_me:$LINENO: result: $oa_editor" >&5
-$as_echo "$oa_editor" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$oa_editor" && break
-done
-
-        ;;
-esac
-
-
-## Accumulate list of utils needed for the build platform
-## It is vital that noweb is present in the build environement.
-axiom_all_prerequisites=
 
-case $build in
-    *linux*)
-        # GNU/Linux systems come equipped with GNU Make, called `make'
-        for ac_prog in make
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+# Extract the first word of "touch", so it can be a program name with args.
+set dummy touch; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MAKE+set}" = set; then
+if test "${ac_cv_prog_TOUCH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$MAKE"; then
-  ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
+  if test -n "$TOUCH"; then
+  ac_cv_prog_TOUCH="$TOUCH" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -17147,7 +17032,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MAKE="$ac_prog"
+    ac_cv_prog_TOUCH="touch"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -17155,81 +17040,21 @@ done
 done
 IFS=$as_save_IFS
 
-fi
-fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
-  { $as_echo "$as_me:$LINENO: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$MAKE" && break
-done
-test -n "$MAKE" || MAKE="{ { $as_echo "$as_me:$LINENO: error: Make utility missing." >&5
-$as_echo "$as_me: error: Make utility missing." >&2;}
+  test -z "$ac_cv_prog_TOUCH" && ac_cv_prog_TOUCH="{ { $as_echo "$as_me:$LINENO: error: 'touch' program is missing." >&5
+$as_echo "$as_me: error: 'touch' program is missing." >&2;}
    { (exit 1); exit 1; }; }"
-
-        ;;
-    *)
-        # Other systems tend to spell it `gmake' and such
-        for ac_prog in gmake make
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MAKE+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MAKE"; then
-  ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MAKE="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
 fi
 fi
-MAKE=$ac_cv_prog_MAKE
-if test -n "$MAKE"; then
-  { $as_echo "$as_me:$LINENO: result: $MAKE" >&5
-$as_echo "$MAKE" >&6; }
+TOUCH=$ac_cv_prog_TOUCH
+if test -n "$TOUCH"; then
+  { $as_echo "$as_me:$LINENO: result: $TOUCH" >&5
+$as_echo "$TOUCH" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$MAKE" && break
-done
-test -n "$MAKE" || MAKE="{ { $as_echo "$as_me:$LINENO: error: Make utility missing." >&5
-$as_echo "$as_me: error: Make utility missing." >&2;}
-   { (exit 1); exit 1; }; }"
-
-        if ! $MAKE --version | grep 'GNU' 2>/dev/null; then
-            { { $as_echo "$as_me:$LINENO: error: OpenAxiom build system needs GNU Make." >&5
-$as_echo "$as_me: error: OpenAxiom build system needs GNU Make." >&2;}
-   { (exit 1); exit 1; }; }
-        fi
-        ;;
-esac
-
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -17323,47 +17148,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-# AC_PROG_LN_S
-# Extract the first word of "touch", so it can be a program name with args.
-set dummy touch; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_TOUCH+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$TOUCH"; then
-  ac_cv_prog_TOUCH="$TOUCH" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_TOUCH="touch"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_TOUCH" && ac_cv_prog_TOUCH="{ { $as_echo "$as_me:$LINENO: error: 'touch' program is missing." >&5
-$as_echo "$as_me: error: 'touch' program is missing." >&2;}
-   { (exit 1); exit 1; }; }"
-fi
-fi
-TOUCH=$ac_cv_prog_TOUCH
-if test -n "$TOUCH"; then
-  { $as_echo "$as_me:$LINENO: result: $TOUCH" >&5
-$as_echo "$TOUCH" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 for ac_prog in mktemp
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -17406,7 +17190,6 @@ fi
   test -n "$MKTEMP" && break
 done
 
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -17449,13 +17232,331 @@ fi
   test -n "$AWK" && break
 done
 
-for ac_prog in awk nawk gawk mawk
+
+## Find GNU Make
+case $build in
+    *linux*)
+	# GNU/Linux systems come equipped with GNU Make, called `make'
+        for ac_prog in make
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_HOST_AWK+set}" = set; then
+if test "${ac_cv_prog_MAKE+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MAKE"; then
+  ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MAKE="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+MAKE=$ac_cv_prog_MAKE
+if test -n "$MAKE"; then
+  { $as_echo "$as_me:$LINENO: result: $MAKE" >&5
+$as_echo "$MAKE" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$MAKE" && break
+done
+test -n "$MAKE" || MAKE="{ { $as_echo "$as_me:$LINENO: error: Make utility missing." >&5
+$as_echo "$as_me: error: Make utility missing." >&2;}
+   { (exit 1); exit 1; }; }"
+
+	;;
+    *)
+        # Other systems tend to spell it `gmake' and such
+        for ac_prog in gmake make
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_MAKE+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MAKE"; then
+  ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MAKE="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+MAKE=$ac_cv_prog_MAKE
+if test -n "$MAKE"; then
+  { $as_echo "$as_me:$LINENO: result: $MAKE" >&5
+$as_echo "$MAKE" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$MAKE" && break
+done
+test -n "$MAKE" || MAKE="{ { $as_echo "$as_me:$LINENO: error: Make utility missing." >&5
+$as_echo "$as_me: error: Make utility missing." >&2;}
+   { (exit 1); exit 1; }; }"
+
+	if ! $MAKE --version | grep 'GNU' 2>/dev/null; then
+	    { { $as_echo "$as_me:$LINENO: error: OpenAxiom build system needs GNU Make." >&5
+$as_echo "$as_me: error: OpenAxiom build system needs GNU Make." >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	;;
+esac
+
+## Make sure noweb executable is available
+for ac_prog in notangle
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NOTANGLE+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NOTANGLE"; then
+  ac_cv_prog_NOTANGLE="$NOTANGLE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NOTANGLE="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NOTANGLE=$ac_cv_prog_NOTANGLE
+if test -n "$NOTANGLE"; then
+  { $as_echo "$as_me:$LINENO: result: $NOTANGLE" >&5
+$as_echo "$NOTANGLE" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$NOTANGLE" && break
+done
+
+for ac_prog in noweave
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NOWEAVE+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NOWEAVE"; then
+  ac_cv_prog_NOWEAVE="$NOWEAVE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NOWEAVE="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NOWEAVE=$ac_cv_prog_NOWEAVE
+if test -n "$NOWEAVE"; then
+  { $as_echo "$as_me:$LINENO: result: $NOWEAVE" >&5
+$as_echo "$NOWEAVE" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$NOWEAVE" && break
+done
+
+## 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
+       { $as_echo "$as_me:$LINENO: OpenAxiom requires noweb utilties" >&5
+$as_echo "$as_me: OpenAxiom requires noweb utilties" >&6;}
+       { { $as_echo "$as_me:$LINENO: error: Please get the tarball of dependencies and reconfigure" >&5
+$as_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
+
+
+axiom_src_subdirs="lib hyper lisp boot interp share algebra input etc doc"
+
+
+## On Windows system, we prefer the default installation
+## location to be 'C:/Program Files/OpenAxiom', following Windows
+## convention.  We cannot use AC_PREFIX_DEFAULT directly as it seems
+## to operate unconditionally.  Therefore, we resort to this dirty
+## trick stepping over Autoconf's internals.
+case $host in
+    *mingw*)
+        ac_default_prefix="C:/Program Files/OpenAxiom"
+        for ac_prog in notepad.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_oa_editor+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $oa_editor in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_oa_editor="$oa_editor" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_oa_editor="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+oa_editor=$ac_cv_path_oa_editor
+if test -n "$oa_editor"; then
+  { $as_echo "$as_me:$LINENO: result: $oa_editor" >&5
+$as_echo "$oa_editor" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$oa_editor" && break
+done
+
+        ;;
+    *)
+        for ac_prog in vi
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_oa_editor+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $oa_editor in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_oa_editor="$oa_editor" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_oa_editor="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+oa_editor=$ac_cv_path_oa_editor
+if test -n "$oa_editor"; then
+  { $as_echo "$as_me:$LINENO: result: $oa_editor" >&5
+$as_echo "$oa_editor" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$oa_editor" && break
+done
+
+        ;;
+esac
+
+
+## Accumulate list of utils needed for the build platform
+## It is vital that noweb is present in the build environement.
+axiom_all_prerequisites=
+
+for ac_prog in awk nawk gawk mawk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_HOST_AWK+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $HOST_AWK in
@@ -17665,109 +17766,6 @@ fi
 done
 
 
-## ---------------------------------------
-## Make sure noweb executable is available
-## ---------------------------------------
-for ac_prog in notangle
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NOTANGLE+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NOTANGLE"; then
-  ac_cv_prog_NOTANGLE="$NOTANGLE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NOTANGLE="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-NOTANGLE=$ac_cv_prog_NOTANGLE
-if test -n "$NOTANGLE"; then
-  { $as_echo "$as_me:$LINENO: result: $NOTANGLE" >&5
-$as_echo "$NOTANGLE" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$NOTANGLE" && break
-done
-
-for ac_prog in noweave
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NOWEAVE+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NOWEAVE"; then
-  ac_cv_prog_NOWEAVE="$NOWEAVE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NOWEAVE="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-NOWEAVE=$ac_cv_prog_NOWEAVE
-if test -n "$NOWEAVE"; then
-  { $as_echo "$as_me:$LINENO: result: $NOWEAVE" >&5
-$as_echo "$NOWEAVE" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$NOWEAVE" && break
-done
-
-
-## 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
-       { $as_echo "$as_me:$LINENO: OpenAxiom requires noweb utilties" >&5
-$as_echo "$as_me: OpenAxiom requires noweb utilties" >&6;}
-       { { $as_echo "$as_me:$LINENO: error: Please get the tarball of dependencies and reconfigure" >&5
-$as_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