7 files changed, 659 insertions, 844 deletions
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index b98b5da2..d92d3334 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -621,3 +621,300 @@ fi
 AC_SUBST(oa_enable_checking)
 AC_SUBST(oa_optimize_options)
 ])
+
+
+dnl -----------------------------
+dnl -- OPENAXIOM_CHECK_SIGNALS --
+dnl -----------------------------
+dnl The host platform must be able to handle signals.  Although, this is 
+dnl not strictly necessary, that is the way OpenAxiom source code
+dnl is currently written.  We ask for a POSIX or ISO C semantics, though
+dnl we have a strong preference for POSIX-conformant semantics.
+AC_DEFUN([OPENAXIOM_CHECK_SIGNALS],[
+AC_CHECK_HEADERS([signal.h],
+                 [],
+                 [AC_MSG_ERROR([OpenAxiom needs signal support.])])
+AC_CHECK_DECLS([sigaction], [], [], 
+               [#include <signal.h>])
+AC_CHECK_DECLS([kill], [], [],
+               [#include <signal.h>])
+])
+
+
+dnl -----------------------------
+dnl -- OPENAXIOM_CHECK_SOCKETS --
+dnl -----------------------------
+dnl The host environment must be capable of handling communication through
+dnl sockets.  This is required for interfacing AXIOMsys
+dnl and Superman.  Notice that ideally, we should decouple
+dnl that interface in such a way that we can still build OpenAxiom
+dnl when uperman is not needed or a socket library is not
+dnl available.
+AC_DEFUN([OPENAXIOM_CHECK_SOCKETS],[
+case $host in
+    *mingw*)
+	AC_CHECK_HEADERS([winsock2.h],
+	                [axiom_host_has_socket=yes],
+			[])
+	oa_c_runtime_extra="-lwsock32"
+	;;
+    *)
+        AC_CHECK_HEADERS([sys/socket.h], 
+                         [axiom_host_has_socket=yes],
+		         [])
+	;;
+esac
+if test x$axiom_host_has_socket != xyes; then \
+    AC_MSG_ERROR([OpenAxiom needs suport for sockets.])
+fi
+## solaris-based systems tend to hide the socket library.
+case $host in
+    *solaris*)
+       AC_SEARCH_LIBS([accept], [socket],
+	   [], [AC_MSG_ERROR([socket library not found])])
+       AC_SEARCH_LIBS([gethostbyname], [nsl])
+       ;;
+    *) ;;
+esac
+
+AC_EGREP_CPP([has_af_local],
+             [#if HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#else
+#  include <winsock2.h>
+#endif
+#ifdef AF_LOCAL
+   has_af_local
+#endif
+             ],
+             [AC_DEFINE([HAVE_AF_LOCAL], [1], [Host has AF_LOCAL])])
+
+
+AC_EGREP_CPP([has_af_unix],
+             [#if HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#else
+#  include <winsock2.h>
+#endif
+#ifdef AF_UNIX
+   has_af_unix
+#endif
+             ],
+             [AC_DEFINE([HAVE_AF_UNIX], [1], [Host has AF_UNIX])])
+])
+
+dnl --------------------------------
+dnl -- OPENAXIOM_CHECK_FILESYSTEM --
+dnl --------------------------------
+dnl Some parts of OpenAxiom manipulate files and directories.  They
+dnl more or less directly reflect the underlying platform semantics.
+dnl For the moment, we require POSIX semantics, though that does not
+dnl seem necessary.  That restriction should be removed as soon as possible.
+AC_DEFUN([OPENAXIOM_CHECK_FILESYSTEM],[
+AC_CHECK_HEADERS([sys/stat.h],
+                 [],
+		 [AC_MSG_ERROR([OpenAxiom needs <sys/stat.h>])])
+case $host in
+    *mingw*)
+        ;;
+    *)
+	AC_CHECK_HEADERS([dirent.h],
+			 [],
+			 [AC_MSG_ERROR([OpenAxiom needs <dirent.h>])])
+        ;;
+esac
+
+AC_CHECK_HEADERS([unistd.h], [],
+                 [AC_MSG_ERROR([OpenAxiom needs <unistd.h>])])
+])
+
+dnl -----------------------------
+dnl -- OPENAXIOM_CHECK_PROCESS --
+dnl -----------------------------
+AC_DEFUN([OPENAXIOM_CHECK_PROCESS],[
+AC_CHECK_DECLS([getuid, geteuid, getgid, getegid], [], [],
+               [#include <unistd.h>])
+AC_CHECK_HEADERS([sys/wait.h])
+if test x"$ac_cv_header_sys_wait_h" = xyes; then \
+    AC_CHECK_DECLS([wait], 
+                   [], 
+                   [], 
+                   [#include <sys/wait.h>])
+fi
+AC_CHECK_DECLS([fork],
+               [],
+               [],
+               [#include <unistd.h>])
+])
+
+dnl ----------------------------------
+dnl -- OPENAXIOM_CHECK_CORE_SUPPORT --
+dnl ----------------------------------
+AC_DEFUN([OPENAXIOM_CHECK_CORE_SUPPORT],[
+oa_c_runtime=
+AC_SUBST(oa_c_runtime)
+
+oa_c_runtime_extra=
+AC_SUBST(oa_c_runtime_extra)
+
+OPENAXIOM_CHECK_FILESYSTEM
+OPENAXIOM_CHECK_SIGNALS
+OPENAXIOM_CHECK_SOCKETS
+OPENAXIOM_CHECK_PROCESS
+])
+
+dnl ------------------------
+dnl -- OPENAXIOM_CHECK_IO --
+dnl ------------------------
+AC_DEFUN([OPENAXIOM_CHECK_IO],[
+## Does this system have openpty or shall we emulate?
+AC_CHECK_HEADERS([sys/ioctl.h pty.h util.h libutil.h termios.h])
+AC_CHECK_DECLS([openpty],[],[],
+   [#if HAVE_PTY_H
+#  include <pty.h>
+#endif
+#if HAVE_UTIL_H
+#  include <util.h>
+#endif
+#if HAVE_SYS_IOCTL_H
+#  include <sys/ioctl.h>
+#endif
+#if HAVE_TERMIOS_H
+#  include <termios.h>
+#endif
+#if HAVE_LIBUTIL_H
+#  include <sys/types.h>
+#  include <libutil.h>
+#endif
+   ])
+if test x"$ac_cv_have_decl_openpty" = xyes; then \
+   AC_SEARCH_LIBS([openpty],[util])
+fi
+
+axiom_use_sman=1
+if test x"$ac_cv_have_decl_fork" = xyes \
+     -a x"$ac_cv_have_decl_wait" = xyes; then \
+    oa_c_runtime="$oa_c_runtime terminal_io"
+    axiom_src_all="$axiom_src_all all-sman all-clef"
+    axiom_src_subdirs="$axiom_src_subdirs clef sman"
+    OPENAXIOM_MAKEFILE([src/clef/Makefile])
+    OPENAXIOM_MAKEFILE([src/sman/Makefile])
+else
+    axiom_use_sman=0
+    AC_MSG_NOTICE([Superman component is disabled.])
+fi
+
+AC_DEFINE_UNQUOTED([OPENAXIOM_USE_SMAN], [$axiom_use_sman],
+                   [Whether to use the session manager as driver.])
+
+axiom_src_all="all-input $axiom_src_all"
+])
+
+
+dnl -------------------------
+dnl -- OPENAXIOM_CHECK_X11 --
+dnl -------------------------
+dnl One of the thorniest issues with programs that use the X Window System
+dnl is portability.  There exist many implementations of the X11
+dnl specification, each with its own variations, extensions, and what
+dnl not.  Designing hand-written makefiles for such programs can be a
+dnl daunting task, fraut with all kinds of traps.  Fortunately, Autoconf
+dnl provides us with some help, namely the macro [[AC_PATH_X]] and 
+dnl [[AC_PATH_XTRA]].  The former searches the directories where the
+dnl X11 include files and the library files reside.  The latter is an
+dnl enhanced version that:
+dnl  1. computes the C compiler flags required by X11;
+dnl  2. computes the linker flags required by X11;
+dnl  3. checks for special libraries that some systems need in order to
+dnl     compile X11 programs;
+dnl  4. checks for special X11R6 libraries that need to be linked before
+dnl      the flag [[-lX11]].
+AC_DEFUN([OPENAXIOM_CHECK_X11],[
+AC_PATH_XTRA
+## Output directives for the C compiler
+AC_SUBST(X_CLFAGS)
+## Output directives for the linker
+AC_SUBST(X_LIBS)
+## Output any extra libraries required by X11
+AC_SUBST(X_EXTRA_LIBS)
+
+## Finally, output the list of libraries that need to appear before -lX11
+## Some part of OpenAxiom depends on Xpm.  That library has kind uncertain
+## future.  At some point in the past, it was deprecated, to be
+## replaced by xpm-nox; then came back again.  So, its support may
+## vary from system to system.  For the moment, we assume that if X11
+## is found then, Xpm is already present.  Though, clearly that is a
+## very optimistic assumption.  Long term, OpenAxiom should get rid of
+## dependence on Xpm.  A nearly fool-proof test would be probably
+## inspired by AC_PATH_XTRA.  I don't have time to get to that 
+## complication right now.  Will fix later.
+X_PRE_LIBS="-lXpm $X_PRE_LIBS"
+AC_SUBST(X_PRE_LIBS)
+
+## If the system supports X11, then build graphics
+axiom_use_x=no
+if test -z $no_x; then
+    axiom_use_x=yes
+    oa_c_runtime="$oa_c_runtime graphics"
+    axiom_src_all="$axiom_src_all all-graph"
+    axiom_src_subdirs="$axiom_src_subdirs graph"
+    OPENAXIOM_MAKEFILE([src/graph/Makefile])
+    OPENAXIOM_MAKEFILE([src/graph/Gdraws/Makefile])
+    OPENAXIOM_MAKEFILE([src/graph/view2D/Makefile])
+    OPENAXIOM_MAKEFILE([src/graph/view3D/Makefile])
+    OPENAXIOM_MAKEFILE([src/graph/viewAlone/Makefile])
+    OPENAXIOM_MAKEFILE([src/graph/viewman/Makefile])
+else
+    AC_MSG_NOTICE([The Garphics component is disabled.])
+fi
+AC_SUBST(axiom_src_all)
+AC_SUBST(axiom_use_x)
+])
+
+dnl ------------------------
+dnl -- OPENAXIOM_CHECK_QT --
+dnl ------------------------
+AC_DEFUN([OPENAXIOM_CHECK_QT],[
+# Check for Qt utilities.
+AC_CHECK_PROGS([OA_QT_MOC], [moc])
+AC_CHECK_PROGS([OA_QT_QMAKE], [qmake])
+if test -n "$OA_QT_MOC"; then
+  AC_MSG_CHECKING([Qt version])
+  oa_qt_version=`"$OA_QT_MOC" -v 2>&1 | sed -e 's/^.*(\(.*\))$/\1/'`
+  AC_MSG_RESULT([$oa_qt_version])
+  case $oa_qt_version in
+    *[1-3]\.[0-9]+\.[0-9]+)
+       AC_MSG_WARN([This version of Qt is too old for OpenAxiom.])
+       ;;
+  esac
+fi
+])
+
+dnl -------------------------------------
+dnl -- OPENAXIOM_CHECK_BROWSER_SUPPORT --
+dnl -------------------------------------
+dnl The HyperDoc component needs string pattern matching.  
+dnl We require [[<regex.h>]], with POSIX-conformant definition.  We used
+dnl to key build of HyperDoc component on the availability of X11
+dnl functionalities.  That, however, is a severe restriction.  Not all
+dnl of the HyperDoc components need X11.  Some, such as [[htadd]], don't
+dnl need X11 at all.  Therefore we have lifted part of the restrictions.
+dnl See \File{src/hyper/Makefile} for more details.  Note that is we don't
+dnl build the HyperDoc component, the compilation of algebra files are
+dnl drawn in [[Unexpected HT command]] noise.
+AC_DEFUN([OPENAXIOM_CHECK_BROWSER_SUPPORT],[
+openaxiom_host_has_regex=
+AC_CHECK_HEADER([regex.h], 
+		[openaxiom_host_has_regex=yes],
+		[openaxiom_host_has_regex=no])
+AC_SUBST(openaxiom_host_has_regex)
+])
+
+dnl ------------------------------
+dnl -- OPENAXIOM_CHECK_GRAPHICS --
+dnl ------------------------------
+AC_DEFUN([OPENAXIOM_CHECK_GRAPHICS],[
+OPENAXIOM_CHECK_X11
+OPENAXIOM_CHECK_QT
+OPENAXIOM_CHECK_BROWSER_SUPPORT
+])
diff --git a/config/var-def.mk b/config/var-def.mk
index e6ecd0a1..1e6d4272 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -205,7 +205,7 @@ open_axiom_installdir = @open_axiom_installdir@
 
 INC=$(top_srcdir)/src/include
 CCF=@CCF@
-oa_c_runtime_extra = @LIBS@ @axiom_c_runtime_extra@ -lm
+oa_c_runtime_extra = @LIBS@ @oa_c_runtime_extra@ -lm
 oa_c_libs = -lopen-axiom-core $(oa_c_runtime_extra) -lm
 
 oa_yesno_to_lisp_boolean = $(subst yes,t,$(subst no,nil,$(1)))
diff --git a/configure b/configure
index bb277f1e..3526ba02 100755
--- a/configure
+++ b/configure
@@ -797,18 +797,18 @@ void_type
 GCLOPTS
 CCF
 openaxiom_host_has_regex
-axiom_use_x
-axiom_src_all
 OA_QT_QMAKE
 OA_QT_MOC
+axiom_use_x
+axiom_src_all
 X_CLFAGS
 X_EXTRA_LIBS
 X_LIBS
 X_PRE_LIBS
 X_CFLAGS
 XMKMF
-axiom_c_runtime_extra
-axiom_c_runtime
+oa_c_runtime_extra
+oa_c_runtime
 axiom_src_subdirs
 MAKEINDEX
 LATEX
@@ -17878,13 +17878,15 @@ axiom_src_subdirs="lib hyper lisp boot interp share algebra input etc doc"
 
 
 
+oa_c_runtime=
 
-# FIXME: Move this out of here.
-axiom_c_runtime=
 
+oa_c_runtime_extra=
 
 
-for ac_header in signal.h
+
+
+for ac_header in sys/stat.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -18031,85 +18033,19 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
 _ACEOF
 
 else
-  { { $as_echo "$as_me:$LINENO: error: OpenAxiom needs signal support." >&5
-$as_echo "$as_me: error: OpenAxiom needs signal support." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: OpenAxiom needs <sys/stat.h>" >&5
+$as_echo "$as_me: error: OpenAxiom needs <sys/stat.h>" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether sigaction is declared" >&5
-$as_echo_n "checking whether sigaction is declared... " >&6; }
-if test "${ac_cv_have_decl_sigaction+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <signal.h>
-
-int
-main ()
-{
-#ifndef sigaction
-  (void) sigaction;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_sigaction=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_sigaction=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sigaction" >&5
-$as_echo "$ac_cv_have_decl_sigaction" >&6; }
-if test "x$ac_cv_have_decl_sigaction" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SIGACTION 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SIGACTION 0
-_ACEOF
-
-
-fi
-
-
+case $host in
+    *mingw*)
+        ;;
+    *)
 
-for ac_header in sys/stat.h
+for ac_header in dirent.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -18256,19 +18192,18 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
 _ACEOF
 
 else
-  { { $as_echo "$as_me:$LINENO: error: OpenAxiom needs <sys/stat.h>" >&5
-$as_echo "$as_me: error: OpenAxiom needs <sys/stat.h>" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: OpenAxiom needs <dirent.h>" >&5
+$as_echo "$as_me: error: OpenAxiom needs <dirent.h>" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 done
 
-case $host in
-    *mingw*)
         ;;
-    *)
+esac
 
-for ac_header in dirent.h
+
+for ac_header in unistd.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -18415,18 +18350,17 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
 _ACEOF
 
 else
-  { { $as_echo "$as_me:$LINENO: error: OpenAxiom needs <dirent.h>" >&5
-$as_echo "$as_me: error: OpenAxiom needs <dirent.h>" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: OpenAxiom needs <unistd.h>" >&5
+$as_echo "$as_me: error: OpenAxiom needs <unistd.h>" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 done
 
-        ;;
-esac
 
 
-for ac_header in unistd.h
+
+for ac_header in signal.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -18573,220 +18507,16 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
 _ACEOF
 
 else
-  { { $as_echo "$as_me:$LINENO: error: OpenAxiom needs <unistd.h>" >&5
-$as_echo "$as_me: error: OpenAxiom needs <unistd.h>" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: OpenAxiom needs signal support." >&5
+$as_echo "$as_me: error: OpenAxiom needs signal support." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether getuid is declared" >&5
-$as_echo_n "checking whether getuid is declared... " >&6; }
-if test "${ac_cv_have_decl_getuid+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <unistd.h>
-
-int
-main ()
-{
-#ifndef getuid
-  (void) getuid;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_getuid=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_getuid=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getuid" >&5
-$as_echo "$ac_cv_have_decl_getuid" >&6; }
-if test "x$ac_cv_have_decl_getuid" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETUID 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETUID 0
-_ACEOF
-
-
-fi
-{ $as_echo "$as_me:$LINENO: checking whether geteuid is declared" >&5
-$as_echo_n "checking whether geteuid is declared... " >&6; }
-if test "${ac_cv_have_decl_geteuid+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <unistd.h>
-
-int
-main ()
-{
-#ifndef geteuid
-  (void) geteuid;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_geteuid=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_geteuid=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_geteuid" >&5
-$as_echo "$ac_cv_have_decl_geteuid" >&6; }
-if test "x$ac_cv_have_decl_geteuid" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETEUID 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETEUID 0
-_ACEOF
-
-
-fi
-{ $as_echo "$as_me:$LINENO: checking whether getgid is declared" >&5
-$as_echo_n "checking whether getgid is declared... " >&6; }
-if test "${ac_cv_have_decl_getgid+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <unistd.h>
-
-int
-main ()
-{
-#ifndef getgid
-  (void) getgid;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_getgid=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_getgid=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getgid" >&5
-$as_echo "$ac_cv_have_decl_getgid" >&6; }
-if test "x$ac_cv_have_decl_getgid" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETGID 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETGID 0
-_ACEOF
-
-
-fi
-{ $as_echo "$as_me:$LINENO: checking whether getegid is declared" >&5
-$as_echo_n "checking whether getegid is declared... " >&6; }
-if test "${ac_cv_have_decl_getegid+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking whether sigaction is declared" >&5
+$as_echo_n "checking whether sigaction is declared... " >&6; }
+if test "${ac_cv_have_decl_sigaction+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18795,13 +18525,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <unistd.h>
+#include <signal.h>
 
 int
 main ()
 {
-#ifndef getegid
-  (void) getegid;
+#ifndef sigaction
+  (void) sigaction;
 #endif
 
   ;
@@ -18826,35 +18556,34 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_getegid=yes
+  ac_cv_have_decl_sigaction=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_have_decl_getegid=no
+	ac_cv_have_decl_sigaction=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getegid" >&5
-$as_echo "$ac_cv_have_decl_getegid" >&6; }
-if test "x$ac_cv_have_decl_getegid" = x""yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sigaction" >&5
+$as_echo "$ac_cv_have_decl_sigaction" >&6; }
+if test "x$ac_cv_have_decl_sigaction" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETEGID 1
+#define HAVE_DECL_SIGACTION 1
 _ACEOF
 
 
 else
   cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETEGID 0
+#define HAVE_DECL_SIGACTION 0
 _ACEOF
 
 
 fi
 
 
-
 { $as_echo "$as_me:$LINENO: checking whether kill is declared" >&5
 $as_echo_n "checking whether kill is declared... " >&6; }
 if test "${ac_cv_have_decl_kill+set}" = set; then
@@ -18925,6 +18654,8 @@ _ACEOF
 fi
 
 
+
+
 case $host in
     *mingw*)
 
@@ -19078,8 +18809,8 @@ fi
 
 done
 
-        axiom_c_runtime_extra="-lwsock32"
-        ;;
+	oa_c_runtime_extra="-lwsock32"
+	;;
     *)
 
 for ac_header in sys/socket.h
@@ -19232,7 +18963,7 @@ fi
 
 done
 
-        ;;
+	;;
 esac
 if test x$axiom_host_has_socket != xyes; then \
     { { $as_echo "$as_me:$LINENO: error: OpenAxiom needs suport for sockets." >&5
@@ -19424,8 +19155,6 @@ fi
     *) ;;
 esac
 
-
-
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -19482,6 +19211,281 @@ rm -f conftest*
 
 
 
+{ $as_echo "$as_me:$LINENO: checking whether getuid is declared" >&5
+$as_echo_n "checking whether getuid is declared... " >&6; }
+if test "${ac_cv_have_decl_getuid+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <unistd.h>
+
+int
+main ()
+{
+#ifndef getuid
+  (void) getuid;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_getuid=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_getuid=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getuid" >&5
+$as_echo "$ac_cv_have_decl_getuid" >&6; }
+if test "x$ac_cv_have_decl_getuid" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETUID 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETUID 0
+_ACEOF
+
+
+fi
+{ $as_echo "$as_me:$LINENO: checking whether geteuid is declared" >&5
+$as_echo_n "checking whether geteuid is declared... " >&6; }
+if test "${ac_cv_have_decl_geteuid+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <unistd.h>
+
+int
+main ()
+{
+#ifndef geteuid
+  (void) geteuid;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_geteuid=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_geteuid=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_geteuid" >&5
+$as_echo "$ac_cv_have_decl_geteuid" >&6; }
+if test "x$ac_cv_have_decl_geteuid" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETEUID 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETEUID 0
+_ACEOF
+
+
+fi
+{ $as_echo "$as_me:$LINENO: checking whether getgid is declared" >&5
+$as_echo_n "checking whether getgid is declared... " >&6; }
+if test "${ac_cv_have_decl_getgid+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <unistd.h>
+
+int
+main ()
+{
+#ifndef getgid
+  (void) getgid;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_getgid=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_getgid=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getgid" >&5
+$as_echo "$ac_cv_have_decl_getgid" >&6; }
+if test "x$ac_cv_have_decl_getgid" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETGID 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETGID 0
+_ACEOF
+
+
+fi
+{ $as_echo "$as_me:$LINENO: checking whether getegid is declared" >&5
+$as_echo_n "checking whether getegid is declared... " >&6; }
+if test "${ac_cv_have_decl_getegid+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <unistd.h>
+
+int
+main ()
+{
+#ifndef getegid
+  (void) getegid;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_getegid=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_getegid=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getegid" >&5
+$as_echo "$ac_cv_have_decl_getegid" >&6; }
+if test "x$ac_cv_have_decl_getegid" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETEGID 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETEGID 0
+_ACEOF
+
+
+fi
+
+
+
 for ac_header in sys/wait.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -19632,7 +19636,6 @@ fi
 
 done
 
-
 if test x"$ac_cv_header_sys_wait_h" = xyes; then \
     { $as_echo "$as_me:$LINENO: checking whether wait is declared" >&5
 $as_echo_n "checking whether wait is declared... " >&6; }
@@ -19705,7 +19708,6 @@ fi
 
 
 fi
-
 { $as_echo "$as_me:$LINENO: checking whether fork is declared" >&5
 $as_echo_n "checking whether fork is declared... " >&6; }
 if test "${ac_cv_have_decl_fork+set}" = set; then
@@ -19777,6 +19779,8 @@ fi
 
 
 
+
+
 ## Does this system have openpty or shall we emulate?
 
 
@@ -20112,7 +20116,7 @@ fi
 axiom_use_sman=1
 if test x"$ac_cv_have_decl_fork" = xyes \
      -a x"$ac_cv_have_decl_wait" = xyes; then \
-    axiom_c_runtime="$axiom_c_runtime terminal_io"
+    oa_c_runtime="$oa_c_runtime terminal_io"
     axiom_src_all="$axiom_src_all all-sman all-clef"
     axiom_src_subdirs="$axiom_src_subdirs clef sman"
     ac_config_files="$ac_config_files src/clef/Makefile:config/var-def.mk:src/clef/Makefile.in:config/setup-dep.mk"
@@ -20377,6 +20381,8 @@ else
 $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
+
+
 if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
@@ -21533,6 +21539,31 @@ X_PRE_LIBS="-lXpm $X_PRE_LIBS"
 
 
 ## If the system supports X11, then build graphics
+axiom_use_x=no
+if test -z $no_x; then
+    axiom_use_x=yes
+    oa_c_runtime="$oa_c_runtime graphics"
+    axiom_src_all="$axiom_src_all all-graph"
+    axiom_src_subdirs="$axiom_src_subdirs graph"
+    ac_config_files="$ac_config_files src/graph/Makefile:config/var-def.mk:src/graph/Makefile.in:config/setup-dep.mk"
+
+    ac_config_files="$ac_config_files src/graph/Gdraws/Makefile:config/var-def.mk:src/graph/Gdraws/Makefile.in:config/setup-dep.mk"
+
+    ac_config_files="$ac_config_files src/graph/view2D/Makefile:config/var-def.mk:src/graph/view2D/Makefile.in:config/setup-dep.mk"
+
+    ac_config_files="$ac_config_files src/graph/view3D/Makefile:config/var-def.mk:src/graph/view3D/Makefile.in:config/setup-dep.mk"
+
+    ac_config_files="$ac_config_files src/graph/viewAlone/Makefile:config/var-def.mk:src/graph/viewAlone/Makefile.in:config/setup-dep.mk"
+
+    ac_config_files="$ac_config_files src/graph/viewman/Makefile:config/var-def.mk:src/graph/viewman/Makefile.in:config/setup-dep.mk"
+
+else
+    { $as_echo "$as_me:$LINENO: The Garphics component is disabled." >&5
+$as_echo "$as_me: The Garphics component is disabled." >&6;}
+fi
+
+
+
 
 # Check for Qt utilities.
 for ac_prog in moc
@@ -21633,29 +21664,6 @@ $as_echo "$as_me: WARNING: This version of Qt is too old for OpenAxiom." >&2;}
   esac
 fi
 
-axiom_use_x=no
-if test -z $no_x; then
-    axiom_use_x=yes
-    axiom_c_runtime="$axiom_c_runtime graphics"
-    axiom_src_all="$axiom_src_all all-graph"
-    axiom_src_subdirs="$axiom_src_subdirs graph"
-    ac_config_files="$ac_config_files src/graph/Makefile:config/var-def.mk:src/graph/Makefile.in:config/setup-dep.mk"
-
-    ac_config_files="$ac_config_files src/graph/Gdraws/Makefile:config/var-def.mk:src/graph/Gdraws/Makefile.in:config/setup-dep.mk"
-
-    ac_config_files="$ac_config_files src/graph/view2D/Makefile:config/var-def.mk:src/graph/view2D/Makefile.in:config/setup-dep.mk"
-
-    ac_config_files="$ac_config_files src/graph/view3D/Makefile:config/var-def.mk:src/graph/view3D/Makefile.in:config/setup-dep.mk"
-
-    ac_config_files="$ac_config_files src/graph/viewAlone/Makefile:config/var-def.mk:src/graph/viewAlone/Makefile.in:config/setup-dep.mk"
-
-    ac_config_files="$ac_config_files src/graph/viewman/Makefile:config/var-def.mk:src/graph/viewman/Makefile.in:config/setup-dep.mk"
-
-else
-    { $as_echo "$as_me:$LINENO: The Garphics component is disabled." >&5
-$as_echo "$as_me: The Garphics component is disabled." >&6;}
-fi
-
 
 openaxiom_host_has_regex=
 if test "${ac_cv_header_regex_h+set}" = set; then
@@ -21799,6 +21807,8 @@ fi
 
 
 
+
+
 axiom_host_has_libbfd=
 ## Check for these only if we are going to build GCL from source.
 case $oa_all_prerequisites in
diff --git a/configure.ac b/configure.ac
index 08d53b64..aeab63d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,205 +42,9 @@ OPENAXIOM_HOST_PROGS
 axiom_src_subdirs="lib hyper lisp boot interp share algebra input etc doc"
 AC_SUBST(axiom_src_subdirs)
 
-
-
-# FIXME: Move this out of here.  
-axiom_c_runtime=
-AC_SUBST(axiom_c_runtime)
-
-AC_CHECK_HEADERS([signal.h],
-                 [],
-                 [AC_MSG_ERROR([OpenAxiom needs signal support.])])
-AC_CHECK_DECLS([sigaction], [], [], 
-               [#include <signal.h>])
-AC_CHECK_HEADERS([sys/stat.h],
-                 [],
-                 [AC_MSG_ERROR([OpenAxiom needs <sys/stat.h>])])
-case $host in
-    *mingw*)
-        ;;
-    *)
-        AC_CHECK_HEADERS([dirent.h],
-                         [],
-                         [AC_MSG_ERROR([OpenAxiom needs <dirent.h>])])
-        ;;
-esac
-
-AC_CHECK_HEADERS([unistd.h], [],
-                 [AC_MSG_ERROR([OpenAxiom needs <unistd.h>])])
-AC_CHECK_DECLS([getuid, geteuid, getgid, getegid], [], [],
-               [#include <unistd.h>])
-
-AC_CHECK_DECLS([kill], [], [],
-               [#include <signal.h>])
-case $host in
-    *mingw*)
-        AC_CHECK_HEADERS([winsock2.h],
-                        [axiom_host_has_socket=yes],
-                        [])
-        axiom_c_runtime_extra="-lwsock32"
-        ;;
-    *)
-        AC_CHECK_HEADERS([sys/socket.h], 
-                         [axiom_host_has_socket=yes],
-                         [])
-        ;;
-esac
-if test x$axiom_host_has_socket != xyes; then \
-    AC_MSG_ERROR([OpenAxiom needs suport for sockets.])
-fi
-## solaris-based systems tend to hide the socket library.
-case $host in
-    *solaris*)
-       AC_SEARCH_LIBS([accept], [socket],
-           [], [AC_MSG_ERROR([socket library not found])])
-       AC_SEARCH_LIBS([gethostbyname], [nsl])
-       ;;
-    *) ;;
-esac
-
-AC_SUBST(axiom_c_runtime_extra)
-
-AC_EGREP_CPP([has_af_local],
-             [#if HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#else
-#  include <winsock2.h>
-#endif
-#ifdef AF_LOCAL
-   has_af_local
-#endif
-             ],
-             [AC_DEFINE([HAVE_AF_LOCAL], [1], [Host has AF_LOCAL])])
-
-
-AC_EGREP_CPP([has_af_unix],
-             [#if HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#else
-#  include <winsock2.h>
-#endif
-#ifdef AF_UNIX
-   has_af_unix
-#endif
-             ],
-             [AC_DEFINE([HAVE_AF_UNIX], [1], [Host has AF_UNIX])])
-
-AC_CHECK_HEADERS([sys/wait.h])
-
-if test x"$ac_cv_header_sys_wait_h" = xyes; then \
-    AC_CHECK_DECLS([wait], 
-                   [], 
-                   [], 
-                   [#include <sys/wait.h>])
-fi
-
-AC_CHECK_DECLS([fork],
-               [],
-               [],
-               [#include <unistd.h>])
-
-## Does this system have openpty or shall we emulate?
-AC_CHECK_HEADERS([sys/ioctl.h pty.h util.h libutil.h termios.h])
-AC_CHECK_DECLS([openpty],[],[],
-   [#if HAVE_PTY_H
-#  include <pty.h>
-#endif
-#if HAVE_UTIL_H
-#  include <util.h>
-#endif
-#if HAVE_SYS_IOCTL_H
-#  include <sys/ioctl.h>
-#endif
-#if HAVE_TERMIOS_H
-#  include <termios.h>
-#endif
-#if HAVE_LIBUTIL_H
-#  include <sys/types.h>
-#  include <libutil.h>
-#endif
-   ])
-if test x"$ac_cv_have_decl_openpty" = xyes; then \
-   AC_SEARCH_LIBS([openpty],[util])
-fi
-
-axiom_use_sman=1
-if test x"$ac_cv_have_decl_fork" = xyes \
-     -a x"$ac_cv_have_decl_wait" = xyes; then \
-    axiom_c_runtime="$axiom_c_runtime terminal_io"
-    axiom_src_all="$axiom_src_all all-sman all-clef"
-    axiom_src_subdirs="$axiom_src_subdirs clef sman"
-    OPENAXIOM_MAKEFILE([src/clef/Makefile])
-    OPENAXIOM_MAKEFILE([src/sman/Makefile])
-else
-    axiom_use_sman=0
-    AC_MSG_NOTICE([Superman component is disabled.])
-fi
-
-AC_DEFINE_UNQUOTED([OPENAXIOM_USE_SMAN], [$axiom_use_sman],
-                   [Whether to use the session manager as driver.])
-
-axiom_src_all="all-input $axiom_src_all"
-
-AC_PATH_XTRA
-## Output directives for the C compiler
-AC_SUBST(X_CLFAGS)
-## Output directives for the linker
-AC_SUBST(X_LIBS)
-## Output any extra libraries required by X11
-AC_SUBST(X_EXTRA_LIBS)
-
-## Finally, output the list of libraries that need to appear before -lX11
-## Some part of OpenAxiom depends on Xpm.  That library has kind uncertain
-## future.  At some point in the past, it was deprecated, to be
-## replaced by xpm-nox; then came back again.  So, its support may
-## vary from system to system.  For the moment, we assume that if X11
-## is found then, Xpm is already present.  Though, clearly that is a
-## very optimistic assumption.  Long term, OpenAxiom should get rid of
-## dependence on Xpm.  A nearly fool-proof test would be probably
-## inspired by AC_PATH_XTRA.  I don't have time to get to that 
-## complication right now.  Will fix later.
-X_PRE_LIBS="-lXpm $X_PRE_LIBS"
-AC_SUBST(X_PRE_LIBS)
-
-## If the system supports X11, then build graphics
-
-# Check for Qt utilities.
-AC_CHECK_PROGS([OA_QT_MOC], [moc])
-AC_CHECK_PROGS([OA_QT_QMAKE], [qmake])
-if test -n "$OA_QT_MOC"; then
-  AC_MSG_CHECKING([Qt version])
-  oa_qt_version=`"$OA_QT_MOC" -v 2>&1 | sed -e 's/^.*(\(.*\))$/\1/'`
-  AC_MSG_RESULT([$oa_qt_version])
-  case $oa_qt_version in
-    *[1-3]\.[0-9]+\.[0-9]+)
-       AC_MSG_WARN([This version of Qt is too old for OpenAxiom.])
-       ;;
-  esac
-fi
-
-axiom_use_x=no
-if test -z $no_x; then
-    axiom_use_x=yes
-    axiom_c_runtime="$axiom_c_runtime graphics"
-    axiom_src_all="$axiom_src_all all-graph"
-    axiom_src_subdirs="$axiom_src_subdirs graph"
-    OPENAXIOM_MAKEFILE([src/graph/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/Gdraws/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/view2D/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/view3D/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/viewAlone/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/viewman/Makefile])
-else
-    AC_MSG_NOTICE([The Garphics component is disabled.])
-fi
-AC_SUBST(axiom_src_all)
-AC_SUBST(axiom_use_x)
-openaxiom_host_has_regex=
-AC_CHECK_HEADER([regex.h], 
-                [openaxiom_host_has_regex=yes],
-                [openaxiom_host_has_regex=no])
-AC_SUBST(openaxiom_host_has_regex)
+OPENAXIOM_CHECK_CORE_SUPPORT
+OPENAXIOM_CHECK_IO
+OPENAXIOM_CHECK_GRAPHICS
 
 axiom_host_has_libbfd=
 ## Check for these only if we are going to build GCL from source.
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 2f6933d9..6fbbcaf8 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -189,302 +189,10 @@ axiom_build_sharedir=$axiom_builddir/share
 
 \section{Host characteristics}
 
-As mentioned in the introduction, a small part of \Tool{OpenAxiom} is
-written in the C programming language.  That C runtime support
-can be decomposed in three components:
-\begin{enumerate}
-\item core runtime support,
-\item graphics (including HyperDoc), and
-\item terminal I/O.
-\end{enumerate}
-
-\subsection{Core runtime}
-
-\subsubsection{Signals}
-
-The host platform must be able to handle signals.  Although, this is 
-not strictly necessary, that is the way \Tool{OpenAxiom} source code
-is currently written.  We ask for a POSIX or ISO C semantics, though
-we have a strong preference for POSIX-conformant semantics.
-
-<<C headers and libraries>>=
-AC_CHECK_HEADERS([signal.h],
-                 [],
-                 [AC_MSG_ERROR([OpenAxiom needs signal support.])])
-AC_CHECK_DECLS([sigaction], [], [], 
-               [#include <signal.h>])
-@
-
-
-\subsubsection{Files and directtories}
-
-Some parts of \Tool{OpenAxiom} manipulate files and directories.  They
-more or less directly reflect the underlying platform semantics.
-For the moment, we require POSIX semantics, though that does not
-seem necessary.  That restriction should be removed as soon as possible.
-
-<<C headers and libraries>>=
-AC_CHECK_HEADERS([sys/stat.h],
-                 [],
-		 [AC_MSG_ERROR([OpenAxiom needs <sys/stat.h>])])
-case $host in
-    *mingw*)
-        ;;
-    *)
-	AC_CHECK_HEADERS([dirent.h],
-			 [],
-			 [AC_MSG_ERROR([OpenAxiom needs <dirent.h>])])
-        ;;
-esac
-
-AC_CHECK_HEADERS([unistd.h], [],
-                 [AC_MSG_ERROR([OpenAxiom needs <unistd.h>])])
-AC_CHECK_DECLS([getuid, geteuid, getgid, getegid], [], [],
-               [#include <unistd.h>])
-
-AC_CHECK_DECLS([kill], [], [],
-               [#include <signal.h>])
-@
-
-\subsubsection{Sockets}
-
-The host environment must be capable of handling communication through
-sockets.  This is required for interfacing \Tool{AXIOMsys}
-and \Tool{Superman}.  Notice that ideally, we should decouple
-that interface in such a way that we can still build \Tool{OpenAxiom}
-when \Tool{Superman} is not needed or a socket library is not
-available.
-
-<<C headers and libraries>>=
-case $host in
-    *mingw*)
-	AC_CHECK_HEADERS([winsock2.h],
-	                [axiom_host_has_socket=yes],
-			[])
-	axiom_c_runtime_extra="-lwsock32"
-	;;
-    *)
-        AC_CHECK_HEADERS([sys/socket.h], 
-                         [axiom_host_has_socket=yes],
-		         [])
-	;;
-esac
-if test x$axiom_host_has_socket != xyes; then \
-    AC_MSG_ERROR([OpenAxiom needs suport for sockets.])
-fi
-## solaris-based systems tend to hide the socket library.
-case $host in
-    *solaris*)
-       AC_SEARCH_LIBS([accept], [socket],
-	   [], [AC_MSG_ERROR([socket library not found])])
-       AC_SEARCH_LIBS([gethostbyname], [nsl])
-       ;;
-    *) ;;
-esac
-
-AC_SUBST(axiom_c_runtime_extra)
-
-AC_EGREP_CPP([has_af_local],
-             [#if HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#else
-#  include <winsock2.h>
-#endif
-#ifdef AF_LOCAL
-   has_af_local
-#endif
-             ],
-             [AC_DEFINE([HAVE_AF_LOCAL], [1], [Host has AF_LOCAL])])
-
-
-AC_EGREP_CPP([has_af_unix],
-             [#if HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#else
-#  include <winsock2.h>
-#endif
-#ifdef AF_UNIX
-   has_af_unix
-#endif
-             ],
-             [AC_DEFINE([HAVE_AF_UNIX], [1], [Host has AF_UNIX])])
-
-@
-
-
-\subsection{Terminal I/O}
-
-<<C headers and libraries>>=
-AC_CHECK_HEADERS([sys/wait.h])
-
-if test x"$ac_cv_header_sys_wait_h" = xyes; then \
-    AC_CHECK_DECLS([wait], 
-                   [], 
-                   [], 
-                   [#include <sys/wait.h>])
-fi
-
-AC_CHECK_DECLS([fork],
-               [],
-               [],
-               [#include <unistd.h>])
-
-## Does this system have openpty or shall we emulate?
-AC_CHECK_HEADERS([sys/ioctl.h pty.h util.h libutil.h termios.h])
-AC_CHECK_DECLS([openpty],[],[],
-   [#if HAVE_PTY_H
-#  include <pty.h>
-#endif
-#if HAVE_UTIL_H
-#  include <util.h>
-#endif
-#if HAVE_SYS_IOCTL_H
-#  include <sys/ioctl.h>
-#endif
-#if HAVE_TERMIOS_H
-#  include <termios.h>
-#endif
-#if HAVE_LIBUTIL_H
-#  include <sys/types.h>
-#  include <libutil.h>
-#endif
-   ])
-if test x"$ac_cv_have_decl_openpty" = xyes; then \
-   AC_SEARCH_LIBS([openpty],[util])
-fi
-
-axiom_use_sman=1
-if test x"$ac_cv_have_decl_fork" = xyes \
-     -a x"$ac_cv_have_decl_wait" = xyes; then \
-    axiom_c_runtime="$axiom_c_runtime terminal_io"
-    axiom_src_all="$axiom_src_all all-sman all-clef"
-    axiom_src_subdirs="$axiom_src_subdirs clef sman"
-    OPENAXIOM_MAKEFILE([src/clef/Makefile])
-    OPENAXIOM_MAKEFILE([src/sman/Makefile])
-else
-    axiom_use_sman=0
-    AC_MSG_NOTICE([Superman component is disabled.])
-fi
-
-AC_DEFINE_UNQUOTED([OPENAXIOM_USE_SMAN], [$axiom_use_sman],
-                   [Whether to use the session manager as driver.])
-
-axiom_src_all="all-input $axiom_src_all"
-
-@
-
-
-\subsection{Graphics}
-
-\subsubsection{Where is X11?}
-
-One of the thorniest issues with programs that use the X Window System
-is portability.  There exist many implementations of the X11
-specification, each with its own variations, extensions, and what
-not.  Designing hand-written makefiles for such programs can be a
-daunting task, fraut with all kinds of traps.  Fortunately, \Tool{Autoconf}
-provides us with some help, namely the macro [[AC_PATH_X]] and 
-[[AC_PATH_XTRA]].  The former searches the directories where the
-X11 include files and the library files reside.  The latter is an
-enhanced version that
-\begin{itemize}
-\item computes the C compiler flags required by X11;
-\item computes the linker flags required by X11;
-\item checks for special libraries that some systems need in order to
-   compile X11 programs;
-\item checks for special X11R6 libraries that need to be linked before
-  the flag [[-lX11]].
-\end{itemize}
-
-<<C headers and libraries>>=
-AC_PATH_XTRA
-## Output directives for the C compiler
-AC_SUBST(X_CLFAGS)
-## Output directives for the linker
-AC_SUBST(X_LIBS)
-## Output any extra libraries required by X11
-AC_SUBST(X_EXTRA_LIBS)
-
-## Finally, output the list of libraries that need to appear before -lX11
-## Some part of OpenAxiom depends on Xpm.  That library has kind uncertain
-## future.  At some point in the past, it was deprecated, to be
-## replaced by xpm-nox; then came back again.  So, its support may
-## vary from system to system.  For the moment, we assume that if X11
-## is found then, Xpm is already present.  Though, clearly that is a
-## very optimistic assumption.  Long term, OpenAxiom should get rid of
-## dependence on Xpm.  A nearly fool-proof test would be probably
-## inspired by AC_PATH_XTRA.  I don't have time to get to that 
-## complication right now.  Will fix later.
-X_PRE_LIBS="-lXpm $X_PRE_LIBS"
-AC_SUBST(X_PRE_LIBS)
-
-## If the system supports X11, then build graphics
-
-# Check for Qt utilities.
-AC_CHECK_PROGS([OA_QT_MOC], [moc])
-AC_CHECK_PROGS([OA_QT_QMAKE], [qmake])
-if test -n "$OA_QT_MOC"; then
-  AC_MSG_CHECKING([Qt version])
-  oa_qt_version=`"$OA_QT_MOC" -v 2>&1 | sed -e 's/^.*(\(.*\))$/\1/'`
-  AC_MSG_RESULT([$oa_qt_version])
-  case $oa_qt_version in
-    *[1-3]\.[0-9]+\.[0-9]+)
-       AC_MSG_WARN([This version of Qt is too old for OpenAxiom.])
-       ;;
-  esac
-fi
-
-axiom_use_x=no
-if test -z $no_x; then
-    axiom_use_x=yes
-    axiom_c_runtime="$axiom_c_runtime graphics"
-    axiom_src_all="$axiom_src_all all-graph"
-    axiom_src_subdirs="$axiom_src_subdirs graph"
-    OPENAXIOM_MAKEFILE([src/graph/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/Gdraws/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/view2D/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/view3D/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/viewAlone/Makefile])
-    OPENAXIOM_MAKEFILE([src/graph/viewman/Makefile])
-else
-    AC_MSG_NOTICE([The Garphics component is disabled.])
-fi
-AC_SUBST(axiom_src_all)
-AC_SUBST(axiom_use_x)
-@
-
-\subsubsection{HyperDoc}
-
-The HyperDoc component needs string pattern matching.  
-We require [[<regex.h>]], with POSIX-conformant definition.  We used
-to key build of HyperDoc component on the availability of X11
-functionalities.  That, however, is a severe restriction.  Not all
-of the HyperDoc components need X11.  Some, such as [[htadd]], don't
-need X11 at all.  Therefore we have lifted part of the restrictions.
-See \File{src/hyper/Makefile} for more details.  Note that is we don't
-build the HyperDoc component, the compilation of algebra files are
-drawn in [[Unexpected HT command]] noise.
-<<C headers and libraries>>=
-openaxiom_host_has_regex=
-AC_CHECK_HEADER([regex.h], 
-		[openaxiom_host_has_regex=yes],
-		[openaxiom_host_has_regex=no])
-AC_SUBST(openaxiom_host_has_regex)
-@
-
-
 \subsection{Lisp runtime}
 
 \subsubsection{Runtime checking}
 
-\Tool{OpenAxiom}'s Lisp runtime platform may be instructed to perform
-runtime checks.  This may be useful when chasing Heinsenbugs.
-It probably should be the default mode on development or experimental
-branches.
-<<runtime checking>>=
-@
-
-
 \Tool{GCL} relies on the libirary \Tool{BFD}, the include 
 headers of which may not exist (quite common).  In order to avoid 
 \Tool{GCL} build failure, we test for the existence of [[<bfd.h>]]
@@ -789,13 +497,9 @@ OPENAXIOM_HOST_PROGS
 axiom_src_subdirs="lib hyper lisp boot interp share algebra input etc doc"
 AC_SUBST(axiom_src_subdirs)
 
-<<runtime checking>>
-
-# FIXME: Move this out of here.  
-axiom_c_runtime=
-AC_SUBST(axiom_c_runtime)
-
-<<C headers and libraries>>
+OPENAXIOM_CHECK_CORE_SUPPORT
+OPENAXIOM_CHECK_IO
+OPENAXIOM_CHECK_GRAPHICS
 
 <<platform specific bits>>
 OPENAXIOM_FFI_TYPE_TABLE
diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in
index 638c7185..b642bda1 100644
--- a/src/etc/Makefile.in
+++ b/src/etc/Makefile.in
@@ -51,7 +51,7 @@ build_libdir = $(top_builddir)/src/lib
 
 libspad_la = -L$(build_libdir) -lspad
 
-openaxiom_c_libs = -lopen-axiom-core @axiom_c_runtime_extra@ -lm
+openaxiom_c_libs = -lopen-axiom-core @oa_c_runtime_extra@ -lm
 
 
 .PHONY: all all-asq
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 353cffc6..5bb925e7 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -44,7 +44,7 @@ graphics_SOURCES = \
 		XSpadFill.c
 
 libspad_SOURCES = $(foreach comp, \
-			 $(addsuffix _SOURCES, @axiom_c_runtime@), \
+			 $(addsuffix _SOURCES, @oa_c_runtime@), \
 			 $($(comp))) \
 		halloc.c hash.c 
 
@@ -88,7 +88,7 @@ $(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \
 	$(mkdir_p) $(axiom_target_libdir)
 	$(LINK_SHRLIB) $(oa_shrlib_flags) -o $@ \
 		$(libopen_axiom_core_objects) \
-		@axiom_c_runtime_extra@ -lm
+		@oa_c_runtime_extra@ -lm
 
 libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_SOURCES:.c=.lo)
 	$(LINK) -o $@ $(libopen_axiom_core_SOURCES:.c=.lo)