More configure work

1 files changed, 352 insertions, 342 deletions

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