Changeset aac46c in git

Timestamp:

Dec 14, 1999, 4:53:15 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

2bdfccbccdab814148f3d987b9a8100db861d0fc

Parents:

002eadb7aea4ec696a64e2ab62c5bab73995fb0b

Message:

* configure and Makefile stuff


git-svn-id: file:///usr/local/Singular/svn/trunk@4018 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Makefile.in (modified) (1 diff)
• Singular/configure (modified) (215 diffs)
• Singular/configure.in (modified) (4 diffs)
• Singular/mod2.h.in (modified) (2 diffs)
• configure (modified) (96 diffs)
• configure.in (modified) (9 diffs)
• doc/texinfo.tex (modified) (71 diffs)
• emacs/Makefile.in (modified) (1 diff)

Makefile.in

@@ -14 +14 @@
 SINGULAR        = @SINGULAR@
 
-BUILD_SUBDIRS   = @CONFIG_SUBDIRS@ @BUILD_SUBDIRS@
+BUILD_SUBDIRS   = @BUILD_SUBDIRS@
 SUBDIRS         = @SUBDIRS@
 

Singular/configure

@@ -2 +2 @@
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
@@ -21 +21 @@
   --with-perl5=[PERL5,no] uses PERL5 as perl5 program, default is perl5"
 ac_help="$ac_help
-  --without-readline      do not use readline for fancy display"
+  --with-readline          do use static readline for fancy display"
 ac_help="$ac_help
   --without-MP            do not use MP (no MP links)"
@@ -84 +84 @@
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
@@ -367 +368 @@
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
@@ -537 +538 @@
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -557 +560 @@
 
 echo $ac_n "checking uname for singular""... $ac_c" 1>&6
-echo "configure:560: checking uname for singular" >&5
+echo "configure:563: checking uname for singular" >&5
 if eval "test \"`echo '$''{'ac_cv_singuname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -645 +648 @@
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:648: checking for $ac_word" >&5
+echo "configure:651: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -652 +655 @@
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -674 +678 @@
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:677: checking for $ac_word" >&5
+echo "configure:681: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -681 +685 @@
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  for ac_dir in $PATH; do
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -718 +723 @@
 fi
 
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:732: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:725: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
@@ -728 +767 @@
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 735 "configure"
-#include "confdefs.h"
+cat > conftest.$ac_ext << EOF
+
+#line 775 "configure"
+#include "confdefs.h"
+
 main(){return(0);}
 EOF
-if { (eval echo configure:739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -750 +791 @@
 fi
 rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
@@ -756 +803 @@
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:759: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:806: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:764: checking whether we are using GNU C" >&5
+echo "configure:811: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -770 +817 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -781 +828 @@
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:788: checking whether ${CC-cc} accepts -g" >&5
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:839: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -800 +851 @@
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
     CFLAGS="-O2"
+  else
+    CFLAGS=
   fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:816: checking how to run the C preprocessor" >&5
+echo "configure:871: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -828 +883 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 831 "configure"
+#line 886 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -834 +889 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -845 +900 @@
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 848 "configure"
+#line 903 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -851 +906 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -860 +915 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 920 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
   CPP=/lib/cpp
 fi
@@ -865 +937 @@
 fi
 rm -f conftest*
+fi
+rm -f conftest*
   ac_cv_prog_CPP="$CPP"
 fi
@@ -873 +947 @@
 echo "$ac_t""$CPP" 1>&6
 
-for ac_prog in $CCC c++ g++ gcc CC cxx cc++
+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:881: checking for $ac_word" >&5
+echo "configure:955: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -885 +959 @@
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -909 +984 @@
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:912: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:987: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
@@ -915 +990 @@
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 922 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-if { (eval echo configure:926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+cat > conftest.$ac_ext << EOF
+
+#line 998 "configure"
+#include "confdefs.h"
+
+int main(){return(0);}
+EOF
+if { (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -941 +1018 @@
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
@@ -949 +1026 @@
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:952: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1029: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:957: checking whether we are using GNU C++" >&5
+echo "configure:1034: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -963 +1040 @@
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
@@ -974 +1051 @@
 if test $ac_cv_prog_gxx = yes; then
   GXX=yes
-  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS=
-  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:981: checking whether ${CXX-g++} accepts -g" >&5
+else
+  GXX=
+fi
+
+ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ac_save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=
+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+echo "configure:1062: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -993 +1074 @@
 
 echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-  if test "$ac_test_CXXFLAGS" = set; then
-    CXXFLAGS="$ac_save_CXXFLAGS"
-  elif test $ac_cv_prog_cxx_g = yes; then
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS="$ac_save_CXXFLAGS"
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
     CXXFLAGS="-g -O2"
   else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
     CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
   fi
-else
-  GXX=
-  test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
 fi
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1009: checking for AIX" >&5
+echo "configure:1094: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1011 "configure"
+#line 1096 "configure"
 #include "confdefs.h"
 #ifdef _AIX
@@ -1038 +1123 @@
 # check whether the compiler accepts -pipe
 echo $ac_n "checking whether compiler accepts -pipe""... $ac_c" 1>&6
-echo "configure:1041: checking whether compiler accepts -pipe" >&5
+echo "configure:1126: checking whether compiler accepts -pipe" >&5
 temp_cflags=${CFLAGS}
 CFLAGS="${CFLAGS} -pipe"
@@ -1045 +1130 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1048 "configure"
+#line 1133 "configure"
 #include "confdefs.h"
 
@@ -1052 +1137 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cxx_have_pipe=yes
@@ -1076 +1161 @@
 # Customize CFLAGS
 echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
-echo "configure:1079: checking whether _AIX is defined" >&5
+echo "configure:1164: checking whether _AIX is defined" >&5
 if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1084 "configure"
+#line 1169 "configure"
 #include "confdefs.h"
 #ifdef _AIX
@@ -1132 +1217 @@
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1135: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1220: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
@@ -1211 +1296 @@
 if test "${with_lex+set}" != set; then
   echo $ac_n "checking for flex""... $ac_c" 1>&6
-echo "configure:1214: checking for flex" >&5
+echo "configure:1299: checking for flex" >&5
     if eval "test \"`echo '$''{'ac_cv_prog_flex'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1242 +1327 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1245: checking for $ac_word" >&5
+echo "configure:1330: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1249 +1334 @@
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1281 +1367 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1284: checking for $ac_word" >&5
+echo "configure:1370: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1288 +1374 @@
   ac_cv_prog_BISON="$BISON" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1315 +1402 @@
 # ln -s
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1318: checking whether ln -s works" >&5
+echo "configure:1405: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1338 +1425 @@
 # lib checks
 echo $ac_n "checking for atof in -lm""... $ac_c" 1>&6
-echo "configure:1341: checking for atof in -lm" >&5
+echo "configure:1428: checking for atof in -lm" >&5
 ac_lib_var=`echo m'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1346 +1433 @@
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1349 "configure"
+#line 1436 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1357 +1444 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1385 +1472 @@
 
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:1388: checking for socket in -lbsd" >&5
+echo "configure:1475: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1393 +1480 @@
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1396 "configure"
+#line 1483 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1404 +1491 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1432 +1519 @@
 
 echo $ac_n "checking for listen in -lsocket""... $ac_c" 1>&6
-echo "configure:1435: checking for listen in -lsocket" >&5
+echo "configure:1522: checking for listen in -lsocket" >&5
 ac_lib_var=`echo socket'_'listen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1440 +1527 @@
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1443 "configure"
+#line 1530 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1451 +1538 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1479 +1566 @@
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1482: checking for gethostbyname in -lnsl" >&5
+echo "configure:1569: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1487 +1574 @@
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1490 "configure"
+#line 1577 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1498 +1585 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1526 +1613 @@
 
 echo $ac_n "checking for index in -lucb""... $ac_c" 1>&6
-echo "configure:1529: checking for index in -lucb" >&5
+echo "configure:1616: checking for index in -lucb" >&5
 ac_lib_var=`echo ucb'_'index | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1534 +1621 @@
 LIBS="-lucb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1537 "configure"
+#line 1624 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1545 +1632 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1575 +1662 @@
 # heder file checks
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1578: checking for ANSI C header files" >&5
+echo "configure:1665: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1583 "configure"
+#line 1670 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1588 +1675 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1605 +1692 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1608 "configure"
+#line 1695 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -1623 +1710 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1626 "configure"
+#line 1713 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1644 +1731 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1647 "configure"
+#line 1734 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -1655 +1742 @@
 
 EOF
-if { (eval echo configure:1658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
@@ -1682 +1769 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1685: checking for $ac_hdr" >&5
+echo "configure:1772: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1690 "configure"
+#line 1777 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1720 +1807 @@
 
 
-for ac_hdr in malloc.h sys/file.h sys/ioctl.h sys/time.h sys/times.h sys/types.h sys/stat.h fcntl.h sys/param.h pwd.h asm/sigcontext.h pwd.h
+for ac_hdr in malloc.h sys/file.h sys/ioctl.h sys/time.h sys/times.h sys/types.h sys/stat.h fcntl.h sys/param.h pwd.h asm/sigcontext.h pwd.h termcap.h termios.h term.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1727: checking for $ac_hdr" >&5
+echo "configure:1814: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1732 "configure"
+#line 1819 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1763 +1850 @@
 # typedefs, structures
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1766: checking for working const" >&5
+echo "configure:1853: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1771 "configure"
+#line 1858 "configure"
 #include "confdefs.h"
 
@@ -1817 +1904 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -1838 +1925 @@
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1841: checking for inline" >&5
+echo "configure:1928: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1845 +1932 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1848 "configure"
+#line 1935 "configure"
 #include "confdefs.h"
 
@@ -1852 +1939 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -1878 +1965 @@
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1881: checking for size_t" >&5
+echo "configure:1968: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1886 "configure"
+#line 1973 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1892 +1979 @@
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_size_t=yes
@@ -1911 +1998 @@
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1914: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2001: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1919 "configure"
+#line 2006 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1925 +2012 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
@@ -1946 +2033 @@
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:1949: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2036: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1954 "configure"
+#line 2041 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1959 +2046 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
@@ -1984 +2071 @@
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1987: checking for working alloca.h" >&5
+echo "configure:2074: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1992 "configure"
+#line 2079 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -1996 +2083 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
@@ -2017 +2104 @@
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2020: checking for alloca" >&5
+echo "configure:2107: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2025 "configure"
+#line 2112 "configure"
 #include "confdefs.h"
 
@@ -2028 +2115 @@
 # define alloca __builtin_alloca
 #else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
 # else
-#  ifdef _AIX
+#  if HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
  #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
+#    endif
 #   endif
 #  endif
@@ -2045 +2137 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
@@ -2070 +2162 @@
   # contain a buggy version.  If you still want to use their alloca,
   # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.o
+  ALLOCA=alloca.${ac_objext}
   cat >> confdefs.h <<\EOF
 #define C_ALLOCA 1
@@ -2077 +2169 @@
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2080: checking whether alloca needs Cray hooks" >&5
+echo "configure:2172: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2085 "configure"
+#line 2177 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -2107 +2199 @@
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2110: checking for $ac_func" >&5
+echo "configure:2202: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2115 "configure"
+#line 2207 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2135 +2227 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2162 +2254 @@
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2165: checking stack direction for C alloca" >&5
+echo "configure:2257: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2170 +2262 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2173 "configure"
+#line 2265 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -2189 +2281 @@
 }
 EOF
-if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
@@ -2212 +2304 @@
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:2215: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:2307: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2218 +2310 @@
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 2221 "configure"
+#line 2313 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
@@ -2236 +2328 @@
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 2239 "configure"
+#line 2331 "configure"
 #include "confdefs.h"
 #include <termio.h>
@@ -2261 +2353 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2264: checking for $ac_hdr" >&5
+echo "configure:2356: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2269 "configure"
+#line 2361 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2300 +2392 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2303: checking for $ac_func" >&5
+echo "configure:2395: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2308 "configure"
+#line 2400 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2328 +2420 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2353 +2445 @@
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2356: checking for working mmap" >&5
+echo "configure:2448: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2361 +2453 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2364 "configure"
+#line 2456 "configure"
 #include "confdefs.h"
 
@@ -2501 +2593 @@
 
 EOF
-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
@@ -2524 +2616 @@
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2527: checking return type of signal handlers" >&5
+echo "configure:2619: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2532 "configure"
+#line 2624 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2546 +2638 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
@@ -2565 +2657 @@
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2568: checking for vprintf" >&5
+echo "configure:2660: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2573 "configure"
+#line 2665 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2593 +2685 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
@@ -2617 +2709 @@
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2620: checking for _doprnt" >&5
+echo "configure:2712: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2625 "configure"
+#line 2717 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2645 +2737 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
@@ -2672 +2764 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2675: checking for $ac_func" >&5
+echo "configure:2767: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2680 "configure"
+#line 2772 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2700 +2792 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2728 +2820 @@
 # arithmetic shifts
 echo $ac_n "checking whether your machine has correct arithmetic shifts""... $ac_c" 1>&6
-echo "configure:2731: checking whether your machine has correct arithmetic shifts" >&5
+echo "configure:2823: checking whether your machine has correct arithmetic shifts" >&5
 if eval "test \"`echo '$''{'ac_cv_shift'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2741 +2833 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2744 "configure"
+#line 2836 "configure"
 #include "confdefs.h"
  int main() { if (-2 >> 1 == -1) exit(0); else exit(1); } 
 EOF
-if { (eval echo configure:2748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_shift=yes
@@ -2770 +2862 @@
 # check for a peculiar constructor initialization
 echo $ac_n "checking whether explicit C++ constructor calls are allowed""... $ac_c" 1>&6
-echo "configure:2773: checking whether explicit C++ constructor calls are allowed" >&5
+echo "configure:2865: checking whether explicit C++ constructor calls are allowed" >&5
 
 ac_ext=C
@@ -2776 +2868 @@
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
@@ -2783 +2875 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2786 "configure"
+#line 2878 "configure"
 #include "confdefs.h"
 
@@ -2801 +2893 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_explicit_const=yes
@@ -2817 +2909 @@
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
@@ -2830 +2922 @@
 # sprintf returns number of printed chars
 echo $ac_n "checking whether vsprintf returns number of printed chars""... $ac_c" 1>&6
-echo "configure:2833: checking whether vsprintf returns number of printed chars" >&5
+echo "configure:2925: checking whether vsprintf returns number of printed chars" >&5
 if eval "test \"`echo '$''{'ac_cv_returns_n_of_chars'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2838 +2930 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2841 "configure"
+#line 2933 "configure"
 #include "confdefs.h"
 #include <stdio.h>
  main() { char *str=(char*)malloc(20); if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
 EOF
-if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_returns_n_of_chars=yes
@@ -2869 +2961 @@
 # determine ALIGN_8
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:2872: checking size of char" >&5
+echo "configure:2964: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2877 +2969 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2880 "configure"
+#line 2972 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -2888 +2980 @@
 }
 EOF
-if { (eval echo configure:2891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
@@ -2908 +3000 @@
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:2911: checking size of short" >&5
+echo "configure:3003: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2916 +3008 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2919 "configure"
+#line 3011 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -2927 +3019 @@
 }
 EOF
-if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
@@ -2947 +3039 @@
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2950: checking size of int" >&5
+echo "configure:3042: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2955 +3047 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2958 "configure"
+#line 3050 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -2966 +3058 @@
 }
 EOF
-if { (eval echo configure:2969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
@@ -2986 +3078 @@
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2989: checking size of long" >&5
+echo "configure:3081: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2994 +3086 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2997 "configure"
+#line 3089 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3005 +3097 @@
 }
 EOF
-if { (eval echo configure:3008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
@@ -3025 +3117 @@
 
 echo $ac_n "checking size of void*""... $ac_c" 1>&6
-echo "configure:3028: checking size of void*" >&5
+echo "configure:3120: checking size of void*" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3033 +3125 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3036 "configure"
+#line 3128 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3044 +3136 @@
 }
 EOF
-if { (eval echo configure:3047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_voidp=`cat conftestval`
@@ -3064 +3156 @@
 
 echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:3067: checking size of double" >&5
+echo "configure:3159: checking size of double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3072 +3164 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3075 "configure"
+#line 3167 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3083 +3175 @@
 }
 EOF
-if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_double=`cat conftestval`
@@ -3103 +3195 @@
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3106: checking whether byte ordering is bigendian" >&5
+echo "configure:3198: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3110 +3202 @@
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3113 "configure"
+#line 3205 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3121 +3213 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3128 "configure"
+#line 3220 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3136 +3228 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
@@ -3156 +3248 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3159 "configure"
+#line 3251 "configure"
 #include "confdefs.h"
 main () {
@@ -3169 +3261 @@
 }
 EOF
-if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
@@ -3206 +3298 @@
 
 echo $ac_n "checking size of system page""... $ac_c" 1>&6
-echo "configure:3209: checking size of system page" >&5
+echo "configure:3301: checking size of system page" >&5
 if eval "test \"`echo '$''{'ac_cv_pagesize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3214 +3306 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3217 "configure"
+#line 3309 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3228 +3320 @@
 }
 EOF
-if { (eval echo configure:3231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_pagesize=`cat conftestval`
@@ -3252 +3344 @@
 
 echo $ac_n "checking for page aligned valloc""... $ac_c" 1>&6
-echo "configure:3255: checking for page aligned valloc" >&5
+echo "configure:3347: checking for page aligned valloc" >&5
 if eval "test \"`echo '$''{'ac_cv_have_page_alignment'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3298 +3390 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3301 "configure"
+#line 3393 "configure"
 #include "confdefs.h"
 
@@ -3305 +3397 @@
 
 EOF
-if { (eval echo configure:3308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_page_alignment="ac_cv_usable_pagesize="`cat  conftestval`
@@ -3322 +3414 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3325 "configure"
+#line 3417 "configure"
 #include "confdefs.h"
 
@@ -3329 +3421 @@
 
 EOF
-if { (eval echo configure:3332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_page_alignment="ac_cv_usable_pagesize="`cat  conftestval`
@@ -3349 +3441 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3352 "configure"
+#line 3444 "configure"
 #include "confdefs.h"
 
@@ -3358 +3450 @@
 
 EOF
-if { (eval echo configure:3361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_page_alignment="ac_cv_have_gmalloc=yes; ac_cv_usable_pagesize="`cat  conftestval`
@@ -3375 +3467 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3378 "configure"
+#line 3470 "configure"
 #include "confdefs.h"
 
@@ -3384 +3476 @@
 
 EOF
-if { (eval echo configure:3387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_page_alignment="ac_cv_have_gmalloc=yes; ac_cv_usable_pagesize="`cat  conftestval`
@@ -3519 +3611 @@
 if test "${with_perl5+set}" != set; then
   echo $ac_n "checking for perl5""... $ac_c" 1>&6
-echo "configure:3522: checking for perl5" >&5
+echo "configure:3614: checking for perl5" >&5
     if eval "test \"`echo '$''{'ac_cv_prog_perl5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3556 +3648 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3559: checking for $ac_word" >&5
+echo "configure:3651: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PERL5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3563 +3655 @@
   ac_cv_prog_PERL5="$PERL5" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -3590 +3683 @@
 
 
-# fereadl - io routines
-for ac_hdr in termcap.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3598: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3603 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in termios.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3638: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3643 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in term.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3678: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3683 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-# readline
-if test "$with_readline" != no; then
-  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:3718: checking for tgetent in -lncurses" >&5
+echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
+echo "configure:3687: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3723 +3692 @@
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3726 "configure"
+#line 3695 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3734 +3703 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3760 +3729 @@
   echo "$ac_t""no" 1>&6
 \
-   echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:3764: checking for tgetent in -lcurses" >&5
+ echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
+echo "configure:3733: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3769 +3738 @@
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3772 "configure"
+#line 3741 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3780 +3749 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3806 +3775 @@
   echo "$ac_t""no" 1>&6
 \
-   echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:3810: checking for tgetent in -ltermcap" >&5
+  echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
+echo "configure:3779: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3815 +3784 @@
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3818 "configure"
+#line 3787 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3826 +3795 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3857 +3826 @@
 fi
 
+
+# readline
+if test "$with_readline" = yes; then
    echo $ac_n "checking for rl_abort in -lreadline""... $ac_c" 1>&6
-echo "configure:3861: checking for rl_abort in -lreadline" >&5
+echo "configure:3833: checking for rl_abort in -lreadline" >&5
 ac_lib_var=`echo readline'_'rl_abort | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3866 +3838 @@
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3869 "configure"
+#line 3841 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3877 +3849 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3908 +3880 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3911: checking for $ac_hdr" >&5
+echo "configure:3883: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3916 "configure"
+#line 3888 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:3893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3947 +3919 @@
       test "$ac_cv_header_readline_readline_h" = yes; then
      echo $ac_n "checking whether readline.h is ok""... $ac_c" 1>&6
-echo "configure:3950: checking whether readline.h is ok" >&5
+echo "configure:3922: checking whether readline.h is ok" >&5
      if eval "test \"`echo '$''{'ac_cv_header_readline_readline_h_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3955 "configure"
+#line 3927 "configure"
 #include "confdefs.h"
 #include<unistd.h>
@@ -3977 +3949 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_readline_readline_h_ok="yes"
@@ -3993 +3965 @@
 #not ok -- try once more with explicitly declaring everything
       echo $ac_n "checking whether or not we nevertheless can use readline""... $ac_c" 1>&6
-echo "configure:3996: checking whether or not we nevertheless can use readline" >&5
+echo "configure:3968: checking whether or not we nevertheless can use readline" >&5
       if eval "test \"`echo '$''{'ac_cv_have_readline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4001 "configure"
+#line 3973 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -4028 +4000 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_readline="yes"
@@ -4058 +4030 @@
   else
     echo "configure: warning: building without readline: disabling fancy display" 1>&2
-    echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:4062: checking for tgetent in -lncurses" >&5
-ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lncurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4070 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char tgetent();
-
-int main() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:4081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lncurses $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-\
-    echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:4108: checking for tgetent in -lcurses" >&5
-ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4116 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char tgetent();
-
-int main() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/^a-zA-Z0-9_/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lcurses $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-\
-    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:4154: checking for tgetent in -ltermcap" >&5
-ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ltermcap  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4162 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char tgetent();
-
-int main() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:4173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/^a-zA-Z0-9_/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ltermcap $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-\
-    cat >> confdefs.h <<\EOF
-#define HAVE_FEREAD 1
-EOF
-
-fi
-
-fi
-
-fi
-
   fi
-else
-    echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:4212: checking for tgetent in -lncurses" >&5
-ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lncurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4220 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char tgetent();
-
-int main() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:4231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lncurses $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-\
-    echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:4258: checking for tgetent in -lcurses" >&5
-ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4266 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char tgetent();
-
-int main() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:4277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/^a-zA-Z0-9_/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lcurses $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-\
-    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:4304: checking for tgetent in -ltermcap" >&5
-ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ltermcap  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4312 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char tgetent();
-
-int main() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:4323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/^a-zA-Z0-9_/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ltermcap $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-\
-  cat >> confdefs.h <<\EOF
-#define HAVE_FEREAD 1
-EOF
-
-fi
-
-fi
-
-fi
-
 fi
 
@@ -4362 +4037 @@
 # gmp, smallgmp, MP, MPT, factory, libfac
 echo $ac_n "checking for mpq_init in -lgmp""... $ac_c" 1>&6
-echo "configure:4365: checking for mpq_init in -lgmp" >&5
+echo "configure:4040: checking for mpq_init in -lgmp" >&5
 ac_lib_var=`echo gmp'_'mpq_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4370 +4045 @@
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4373 "configure"
+#line 4048 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4381 +4056 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4412 +4087 @@
 fi
 echo $ac_n "checking for mpz_init in -lsmallgmp""... $ac_c" 1>&6
-echo "configure:4415: checking for mpz_init in -lsmallgmp" >&5
+echo "configure:4090: checking for mpz_init in -lsmallgmp" >&5
 ac_lib_var=`echo smallgmp'_'mpz_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4420 +4095 @@
 LIBS="-lsmallgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4423 "configure"
+#line 4098 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4431 +4106 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4459 +4134 @@
 
 echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
-echo "configure:4462: checking for IMP_PutGmpInt in -lMP" >&5
+echo "configure:4137: checking for IMP_PutGmpInt in -lMP" >&5
 ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4467 +4142 @@
 LIBS="-lMP  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4470 "configure"
+#line 4145 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4478 +4153 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4506 +4181 @@
 
 echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
-echo "configure:4509: checking for MPT_GetTree in -lMPT" >&5
+echo "configure:4184: checking for MPT_GetTree in -lMPT" >&5
 ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4514 +4189 @@
 LIBS="-lMPT  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4517 "configure"
+#line 4192 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4525 +4200 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4553 +4228 @@
 
 echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
-echo "configure:4556: checking for atof in -lsingcf" >&5
+echo "configure:4231: checking for atof in -lsingcf" >&5
 ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4561 +4236 @@
 LIBS="-lsingcf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4564 "configure"
+#line 4239 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4572 +4247 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4600 +4275 @@
 
 echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
-echo "configure:4603: checking for atof in -lsingfac" >&5
+echo "configure:4278: checking for atof in -lsingfac" >&5
 ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4608 +4283 @@
 LIBS="-lsingfac  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4611 "configure"
+#line 4286 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4619 +4294 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4651 +4326 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4654: checking for $ac_hdr" >&5
+echo "configure:4329: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4659 "configure"
+#line 4334 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:4339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4718 +4393 @@
 # evaluate results
 echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
-echo "configure:4721: checking which apint package to use" >&5
+echo "configure:4396: checking which apint package to use" >&5
 if test "${with_apint}" != gmp && test "${with_apint}" != smallgmp; then
   if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
@@ -4762 +4437 @@
 if test "$with_dl" != no; then
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4765: checking for dlopen in -ldl" >&5
+echo "configure:4440: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4770 +4445 @@
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4773 "configure"
+#line 4448 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4781 +4456 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4821 +4496 @@
   fi
   echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4824: checking for shl_load in -ldld" >&5
+echo "configure:4499: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4829 +4504 @@
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4832 "configure"
+#line 4507 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4840 +4515 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4880 +4555 @@
 
 echo $ac_n "checking whether to have MP""... $ac_c" 1>&6
-echo "configure:4883: checking whether to have MP" >&5
+echo "configure:4558: checking whether to have MP" >&5
 if test "${with_MP}" != yes && test "${with_MP}" != no; then
   if (test "${will_have_gmp}" = yes) && \
@@ -4911 +4586 @@
 
 echo $ac_n "checking whether to have factory""... $ac_c" 1>&6
-echo "configure:4914: checking whether to have factory" >&5
+echo "configure:4589: checking whether to have factory" >&5
 if test "${with_factory}" != yes && test "${with_factory}" != no; then
   if test "$ac_factory_ok" =  yes || test "$enable_factory" = yes; then
@@ -4942 +4617 @@
 
 echo $ac_n "checking whether to have libfac""... $ac_c" 1>&6
-echo "configure:4945: checking whether to have libfac" >&5
+echo "configure:4620: checking whether to have libfac" >&5
 if test "${with_libfac}" != yes && test "${with_libfac}" != no; then
   if (test "${will_have_factory}" = yes) && \
@@ -4974 +4649 @@
 
 echo $ac_n "checking whether to have dbm links""... $ac_c" 1>&6
-echo "configure:4977: checking whether to have dbm links" >&5
+echo "configure:4652: checking whether to have dbm links" >&5
 if test "$with_dbm" != no; then
   cat >> confdefs.h <<\EOF
@@ -4986 +4661 @@
 
 echo $ac_n "checking whether to have namespaces""... $ac_c" 1>&6
-echo "configure:4989: checking whether to have namespaces" >&5
+echo "configure:4664: checking whether to have namespaces" >&5
 if test "$with_namespaces" != yes; then
   echo "$ac_t""no" 1>&6
@@ -4998 +4673 @@
 
 echo $ac_n "checking whether to have dynamic loading""... $ac_c" 1>&6
-echo "configure:5001: checking whether to have dynamic loading" >&5
+echo "configure:4676: checking whether to have dynamic loading" >&5
 if test "$with_dl" != yes; then
   echo "$ac_t""no" 1>&6
@@ -5011 +4686 @@
         HPUX-9)
           echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:5014: checking for shl_load in -ldld" >&5
+echo "configure:4689: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -5019 +4694 @@
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5022 "configure"
+#line 4697 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5030 +4705 @@
 ; return 0; }
 EOF
-if { (eval echo configure:5033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -5062 +4737 @@
         HPUX-10)
           echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:5065: checking for shl_load in -ldld" >&5
+echo "configure:4740: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -5070 +4745 @@
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5073 "configure"
+#line 4748 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5081 +4756 @@
 ; return 0; }
 EOF
-if { (eval echo configure:5084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -5120 +4795 @@
 
 echo $ac_n "checking whether to use mtrack""... $ac_c" 1>&6
-echo "configure:5123: checking whether to use mtrack" >&5
+echo "configure:4798: checking whether to use mtrack" >&5
 if test "$with_mtrack" = yes && test "$ac_cv_singuname" = ix86-Linux; then
   echo "$ac_t""yes" 1>&6
@@ -5134 +4809 @@
 
 echo $ac_n "checking which exponent type to use""... $ac_c" 1>&6
-echo "configure:5137: checking which exponent type to use" >&5
+echo "configure:4812: checking which exponent type to use" >&5
 if test "$with_exp_type" = "char"; then
   echo "$ac_t""char" 1>&6
@@ -5190 +4865 @@
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
@@ -5257 +4932 @@
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
@@ -5276 +4951 @@
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g

Singular/configure.in

@@ -249 +249 @@
   AC_MSG_ERROR(Can not compile without limits.h unistd.h))
 
-AC_CHECK_HEADERS(malloc.h sys/file.h sys/ioctl.h sys/time.h sys/times.h sys/types.h sys/stat.h fcntl.h sys/param.h pwd.h asm/sigcontext.h pwd.h)
+AC_CHECK_HEADERS(malloc.h sys/file.h sys/ioctl.h sys/time.h sys/times.h sys/types.h sys/stat.h fcntl.h sys/param.h pwd.h asm/sigcontext.h pwd.h termcap.h termios.h term.h)
 
 # typedefs, structures
@@ -485 +485 @@
 AC_ARG_WITH(
   readline,
-  [  --without-readline      do not use readline for fancy display])
+  [  --with-readline          do use static readline for fancy display])
 AC_ARG_WITH(
   MP,
@@ -567 +567 @@
 dnl
 
-# fereadl - io routines
-AC_CHECK_HEADERS(termcap.h)
-AC_CHECK_HEADERS(termios.h)
-AC_CHECK_HEADERS(term.h)
+AC_CHECK_LIB(ncurses,tgetent,,\
+ AC_CHECK_LIB(curses,tgetent,,\
+  AC_CHECK_LIB(termcap,tgetent)))
 
 # readline
-if test "$with_readline" != no; then
-  AC_CHECK_LIB(ncurses,tgetent,,\
-   AC_CHECK_LIB(curses,tgetent,,\
-   AC_CHECK_LIB(termcap,tgetent)))
+if test "$with_readline" = yes; then
    AC_CHECK_LIB(readline, rl_abort)
    AC_CHECK_HEADERS(readline/readline.h readline/history.h)
@@ -652 +648 @@
   else
     AC_MSG_WARN(building without readline: disabling fancy display)
-    AC_CHECK_LIB(ncurses,tgetent,,\
-    AC_CHECK_LIB(curses,tgetent,,\
-    AC_CHECK_LIB(termcap,tgetent,,\
-    AC_DEFINE(HAVE_FEREAD))))
-  fi
-else
-    AC_CHECK_LIB(ncurses,tgetent,,\
-    AC_CHECK_LIB(curses,tgetent,,\
-    AC_CHECK_LIB(termcap,tgetent,,\
-  AC_DEFINE(HAVE_FEREAD))))
+  fi
 fi
 

Singular/mod2.h.in

@@ -5 +5 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.78 1999-11-29 13:01:28 obachman Exp $
+ *  Version: $Id: mod2.h.in,v 1.79 1999-12-14 15:53:13 obachman Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -17 +17 @@
 /* Define to use readline lib for fancy display */
 #undef HAVE_READLINE
-/* Define to use built-in command line parser */
-#undef HAVE_FEREAD
 /* Define if you want to use dld's */
 #undef HAVE_DLD

configure

@@ -2 +2 @@
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
@@ -20 +20 @@
 ac_help="$ac_help
 \
-  --enable-PACKAGE        configure and build PACKAGE
-  --disable-PACKAGE       do not configure and build PACKAGE
+  --enable-PACKAGE        configure and/or build PACKAGE
+  --disable-PACKAGE       do not configure and/or build PACKAGE
    where PACKAGE can be:
      smallgmp             minimal version of gmp written in C only"
@@ -41 +41 @@
 ac_help="$ac_help
 \
+     mtrack               utility to track unused memory"
+ac_help="$ac_help
+\
      Singular             CAS for Polynomial Computations"
 ac_help="$ac_help
 \
      Texinfo              Texinfo for info, texi2dvi, makeinfo"
+ac_help="$ac_help
+\
+     Texi2html            Texinfo to HTML converter"
+ac_help="$ac_help
+\
+     doc                  Singular documentation"
+ac_help="$ac_help
+\
+     emacs                emacs completion files"
 ac_help="$ac_help
 \
@@ -57 +69 @@
 \
      libfac               char set and modp poly factorization library"
+ac_help="$ac_help
+\
+     mtrack               utility to track unused memory"
 ac_help="$ac_help
 \
@@ -102 +117 @@
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
@@ -385 +401 @@
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
@@ -555 +571 @@
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -572 +590 @@
 
 
-OUTPUT_MAKEFILES="Makefile doc/Makefile doc/version.texi doc/uname.texi"
+OUTPUT_MAKEFILES="Makefile"
+if test -d "doc"; then
+   OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES doc/Makefile doc/version.texi doc/uname.texi"
+fi
 if test -d "rpm"; then
    OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" rpm/Makefile"
@@ -590 +611 @@
 
 echo $ac_n "checking uname for singular""... $ac_c" 1>&6
-echo "configure:593: checking uname for singular" >&5
+echo "configure:614: checking uname for singular" >&5
 if eval "test \"`echo '$''{'ac_cv_singuname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -635 +656 @@
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:638: checking for $ac_word" >&5
+echo "configure:659: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -642 +663 @@
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -664 +686 @@
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:667: checking for $ac_word" >&5
+echo "configure:689: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -671 +693 @@
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  for ac_dir in $PATH; do
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -708 +731 @@
 fi
 
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:740: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:715: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
@@ -718 +775 @@
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 725 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 783 "configure"
 #include "confdefs.h"
+
 main(){return(0);}
 EOF
-if { (eval echo configure:729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -740 +799 @@
 fi
 rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
@@ -746 +811 @@
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:754: checking whether we are using GNU C" >&5
+echo "configure:819: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -760 +825 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -771 +836 @@
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:778: checking whether ${CC-cc} accepts -g" >&5
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -790 +859 @@
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
     CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
+  else
+    CFLAGS=
+  fi
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:806: checking how to run the C preprocessor" >&5
+echo "configure:879: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -818 +891 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 821 "configure"
+#line 894 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -824 +897 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -835 +908 @@
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 838 "configure"
+#line 911 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -841 +914 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 928 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -851 +941 @@
   rm -rf conftest*
   CPP=/lib/cpp
+fi
+rm -f conftest*
 fi
 rm -f conftest*
@@ -889 +981 @@
 # IRIX /sbin/install
 # AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:896: checking for a BSD compatible install" >&5
+echo "configure:989: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS=         }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+    IFS="${IFS=         }"; ac_save_IFS="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
@@ -905 +998 @@
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
         if test -f $ac_dir/$ac_prog; then
           if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
             # AIX install.  It has an incompatible calling convention.
-            # OSF/1 installbsd also uses dspmsg, but is usable.
             :
           else
@@ -940 +1034 @@
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:946: checking for AIX" >&5
+echo "configure:1042: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 948 "configure"
+#line 1044 "configure"
 #include "confdefs.h"
 #ifdef _AIX
@@ -972 +1068 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:975: checking for $ac_word" >&5
+echo "configure:1071: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -979 +1075 @@
   ac_cv_prog_PERL="$PERL" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1005 +1102 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1008: checking for $ac_word" >&5
+echo "configure:1105: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GUNZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1012 +1109 @@
   ac_cv_prog_GUNZIP="$GUNZIP" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1040 +1138 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1043: checking for $ac_word" >&5
+echo "configure:1141: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MYGZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1047 +1145 @@
   ac_cv_prog_MYGZIP="$MYGZIP" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1072 +1171 @@
 set dummy latex2html; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1075: checking for $ac_word" >&5
+echo "configure:1174: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LATEX2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1079 +1178 @@
   ac_cv_prog_LATEX2HTML="$LATEX2HTML" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1098 +1198 @@
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1101: checking whether ln -s works" >&5
+echo "configure:1201: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1130 +1230 @@
 set dummy texi2html; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1133: checking for $ac_word" >&5
+echo "configure:1233: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TEXI2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1137 +1237 @@
   ac_cv_prog_TEXI2HTML="$TEXI2HTML" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1203 +1304 @@
 # check for AIX
 echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
-echo "configure:1206: checking whether _AIX is defined" >&5
+echo "configure:1307: checking whether _AIX is defined" >&5
 if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1211 "configure"
+#line 1312 "configure"
 #include "confdefs.h"
 #ifdef _AIX
@@ -1234 +1335 @@
 
 echo $ac_n "checking for atof in -lm""... $ac_c" 1>&6
-echo "configure:1237: checking for atof in -lm" >&5
+echo "configure:1338: checking for atof in -lm" >&5
 ac_lib_var=`echo m'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1242 +1343 @@
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1245 "configure"
+#line 1346 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1253 +1354 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1281 +1382 @@
 
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:1284: checking for socket in -lbsd" >&5
+echo "configure:1385: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1289 +1390 @@
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1292 "configure"
+#line 1393 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1300 +1401 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1328 +1429 @@
 
 echo $ac_n "checking for listen in -lsocket""... $ac_c" 1>&6
-echo "configure:1331: checking for listen in -lsocket" >&5
+echo "configure:1432: checking for listen in -lsocket" >&5
 ac_lib_var=`echo socket'_'listen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1336 +1437 @@
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1339 "configure"
+#line 1440 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1347 +1448 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1375 +1476 @@
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1378: checking for gethostbyname in -lnsl" >&5
+echo "configure:1479: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1383 +1484 @@
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1386 "configure"
+#line 1487 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1394 +1495 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1422 +1523 @@
 
 echo $ac_n "checking for mpq_init in -lgmp""... $ac_c" 1>&6
-echo "configure:1425: checking for mpq_init in -lgmp" >&5
+echo "configure:1526: checking for mpq_init in -lgmp" >&5
 ac_lib_var=`echo gmp'_'mpq_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1430 +1531 @@
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1433 "configure"
+#line 1534 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1441 +1542 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1469 +1570 @@
 
 echo $ac_n "checking for mpz_init in -lsmallgmp""... $ac_c" 1>&6
-echo "configure:1472: checking for mpz_init in -lsmallgmp" >&5
+echo "configure:1573: checking for mpz_init in -lsmallgmp" >&5
 ac_lib_var=`echo smallgmp'_'mpz_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1477 +1578 @@
 LIBS="-lsmallgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1480 "configure"
+#line 1581 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1488 +1589 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1516 +1617 @@
 
 echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
-echo "configure:1519: checking for IMP_PutGmpInt in -lMP" >&5
+echo "configure:1620: checking for IMP_PutGmpInt in -lMP" >&5
 ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1524 +1625 @@
 LIBS="-lMP  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1527 "configure"
+#line 1628 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1535 +1636 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1563 +1664 @@
 
 echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
-echo "configure:1566: checking for MPT_GetTree in -lMPT" >&5
+echo "configure:1667: checking for MPT_GetTree in -lMPT" >&5
 ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1571 +1672 @@
 LIBS="-lMPT  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1574 "configure"
+#line 1675 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1582 +1683 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1610 +1711 @@
 
 echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
-echo "configure:1613: checking for atof in -lsingcf" >&5
+echo "configure:1714: checking for atof in -lsingcf" >&5
 ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1618 +1719 @@
 LIBS="-lsingcf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1621 "configure"
+#line 1722 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1629 +1730 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1657 +1758 @@
 
 echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
-echo "configure:1660: checking for atof in -lsingfac" >&5
+echo "configure:1761: checking for atof in -lsingfac" >&5
 ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1665 +1766 @@
 LIBS="-lsingfac  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1668 "configure"
+#line 1769 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1676 +1777 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1708 +1809 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1711: checking for $ac_hdr" >&5
+echo "configure:1812: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1716 "configure"
+#line 1817 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1822 +1923 @@
 fi
 
+# Check whether --enable-mtrack or --disable-mtrack was given.
+if test "${enable_mtrack+set}" = set; then
+  enableval="$enable_mtrack"
+  :
+fi
+
 # Check whether --enable-Singular or --disable-Singular was given.
 if test "${enable_Singular+set}" = set; then
@@ -1834 +1941 @@
 fi
 
+# Check whether --enable-Texi2html or --disable-Texi2html was given.
+if test "${enable_Texi2html+set}" = set; then
+  enableval="$enable_Texi2html"
+  :
+fi
+
+# Check whether --enable-doc or --disable-doc was given.
+if test "${enable_doc+set}" = set; then
+  enableval="$enable_doc"
+  :
+fi
+
+# Check whether --enable-emacs or --disable-emacs was given.
+if test "${enable_emacs+set}" = set; then
+  enableval="$enable_emacs"
+  :
+fi
+
 # Check whether --with-MP or --without-MP was given.
 if test "${with_MP+set}" = set; then
@@ -1852 +1977 @@
 fi
 
+# Check whether --with-mtrack or --without-mtrack was given.
+if test "${with_mtrack+set}" = set; then
+  withval="$with_mtrack"
+  :
+fi
+
 # Check whether --with-gmp or --without-gmp was given.
 if test "${with_gmp+set}" = set; then
@@ -1860 +1991 @@
 
 echo $ac_n "checking which tmp dir to use""... $ac_c" 1>&6
-echo "configure:1863: checking which tmp dir to use" >&5
+echo "configure:1994: checking which tmp dir to use" >&5
 if test "${with_tmpdir+set}" = set && test -d ${with_tmpdir}; then
   if (echo "${with_tmpdir}" | egrep "\." >/dev/null 2>&1)
@@ -1877 +2008 @@
 if test "${with_perl5+set}" != set; then
   echo $ac_n "checking for perl5""... $ac_c" 1>&6
-echo "configure:1880: checking for perl5" >&5
+echo "configure:2011: checking for perl5" >&5
     if eval "test \"`echo '$''{'ac_cv_prog_perl5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1914 +2045 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1917: checking for $ac_word" >&5
+echo "configure:2048: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PERL5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1921 +2052 @@
   ac_cv_prog_PERL5="$PERL5" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1948 +2080 @@
 
 
-echo $ac_n "checking whether to configure and build texinfo""... $ac_c" 1>&6
-echo "configure:1952: checking whether to configure and build texinfo" >&5
-if test "$enable_texinfo" != no && test -d Texinfo; then
+
+echo $ac_n "checking whether to configure and build gmp lib""... $ac_c" 1>&6
+echo "configure:2085: checking whether to configure and build gmp lib" >&5
+if test "$enable_gmp" != yes && test "$enable_gmp" != no; then
+  if test "$ac_gmp_ok" != yes && test -d gmp; then
+    echo "$ac_t""yes" 1>&6
+    enable_gmp=yes
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"
+    ac_configure_args="$ac_configure_args --enable-gmp"
+    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"
+  else
+    echo "$ac_t""no" 1>&6
+    enable_gmp=no
+  fi
+elif test "$enable_gmp" = yes; then
+  if test ! -d gmp; then
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: Can not find gmp subdir" 1>&2; exit 1; }
+  else
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"
+    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"
+  fi
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking whether to configure and build smallgmp lib""... $ac_c" 1>&6
+echo "configure:2111: checking whether to configure and build smallgmp lib" >&5
+if test "$enable_smallgmp" != yes && test "$enable_smallgmp" != no; then
+  if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
+     test "$enable_gmp" != yes && test -d smallgmp; then
+    echo "$ac_t""yes" 1>&6
+    enable_smallgmp=yes
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS smallgmp"
+    ac_configure_args="$ac_configure_args --enable-smallgmp --enable-gmp"
+  else
+    echo "$ac_t""no" 1>&6
+    enable_smallgmp=no
+  fi
+elif test "$enable_smallgmp" = yes; then
+  if test ! -d smallgmp; then
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: Can not find smallgmp subdir" 1>&2; exit 1; }
+  else
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS smallgmp"
+    if test "$ac_gmp_ok" != yes && test "$enable_gmp" != yes; then
+      ac_configure_args="$ac_configure_args --enable-gmp"
+    fi
+  fi
+else 
+  echo "$ac_t""${enable_smallgmp}" 1>&6
+fi
+
+# Check whether we have at least one of smallgmp or gmp
+if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
+   test "$enable_smallgmp" != yes && test "$enable_gmp" != yes; then
+  { echo "configure: error: can neither find nor built gmp or smallgmp" 1>&2; exit 1; }
+fi
+
+# Check whether we need to cheat subsequent configures with --enable-gmp
+if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes; then
+  ac_configure_args="$ac_configure_args --enable-gmp"
+fi
+
+echo $ac_n "checking whether to configure and build MP lib""... $ac_c" 1>&6
+echo "configure:2150: checking whether to configure and build MP lib" >&5
+if test "$enable_MP" != yes && test "$enable_MP" != no; then
+  if test "$with_MP" != no && test "$ac_MP_ok" != yes && test -d MP && \
+     (test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes); then
+    echo "$ac_t""yes" 1>&6
+    enable_MP=yes
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
+    ac_configure_args="$ac_configure_args --enable-MP"
+  else
+    echo "$ac_t""no" 1>&6
+    enable_MP=no
+  fi
+elif test "$enable_MP" = yes; then
+  if test ! -d MP; then
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: can not build MP without MP directory" 1>&2; exit 1; }
+  fi
+  if test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes; then
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
+  else
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: can not build MP without gmp" 1>&2; exit 1; }
+  fi
+else
+  echo "$ac_t""no" 1>&6
+fi
+  
+echo $ac_n "checking whether to configure and build factory lib""... $ac_c" 1>&6
+echo "configure:2179: checking whether to configure and build factory lib" >&5
+if test "$enable_factory" != yes && test "$enable_factory" != no; then
+  if test "$with_factory" != no && test "$ac_factory_ok" != yes && \
+     test -d factory; then
+    enable_factory=yes
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
+    ac_configure_args="$ac_configure_args --enable-factory"
+  else
+    enable_factory=no
+    echo "$ac_t""no" 1>&6
+  fi
+elif test "$enable_factory" = yes; then
+  if test -d factory; then
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
+  else
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: can not build factory without factory directory" 1>&2; exit 1; }
+  fi
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking whether to configure and build libfac lib""... $ac_c" 1>&6
+echo "configure:2204: checking whether to configure and build libfac lib" >&5
+if test "$enable_libfac" != yes && test "$enable_libfac" != no; then
+  if test "$with_libfac" != no && test "$ac_libfac_ok" != yes && \
+     test -d libfac && \
+     (test "$ac_factory_ok" = yes || test "$enable_factory" = yes); then
+    enable_libfac=yes
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
+    ac_configure_args="$ac_configure_args --enable-libfac"
+  else
+    enable_libfac=no
+    echo "$ac_t""no" 1>&6
+  fi
+elif  test "$enable_libfac" = yes; then
+  if test ! -d libfac; then
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: can not build libfac without libfac directory" 1>&2; exit 1; }
+  fi
+  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
+  else
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: Can not build libfac without factory" 1>&2; exit 1; }
+  fi
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking whether to configure and build sgroup lib""... $ac_c" 1>&6
+echo "configure:2234: checking whether to configure and build sgroup lib" >&5
+if test "$enable_sgroup" != yes && test "$enable_sgroup" != no; then
+  if test "$with_sgroup" != no && test "$ac_sgroup_ok" != yes && \
+     test -d sgroup && \
+     (test "$ac_MP_ok" = yes || test "$enable_MP" = yes); then
+    enable_sgroup=yes
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS sgroup"
+    ac_configure_args="$ac_configure_args --enable-sgroup"
+  else
+    enable_sgroup=no
+    echo "$ac_t""no" 1>&6
+  fi
+elif  test "$enable_sgroup" = yes; then
+  if test ! -d sgroup; then
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: can not build sgroup without sgroup directory" 1>&2; exit 1; }
+  fi
+  if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS sgroup"
+  else
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: Can not build sgroup without MP" 1>&2; exit 1; }
+  fi
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+BUILD_SUBDIRS="$CONFIG_SUBDIRS"
+
+echo $ac_n "checking whether to build mpr and use mtrack""... $ac_c" 1>&6
+echo "configure:2266: checking whether to build mpr and use mtrack" >&5
+if test -d mpr && test "$ac_cv_singuname" = ix86-Linux && test "$enable_mtrack" != no; then
+  echo "$ac_t""yes" 1>&6
+  if test "$enable_mtrack" != yes; then
+     ac_configure_args="$ac_configure_args --enable-mtrack"
+  fi 
+  enable_mtrack=yes
+  OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" mpr/Makefile"
+  BUILD_SUBDIRS="$BUILD_SUBDIRS mpr"
+else
+  echo "$ac_t""no" 1>&6
+  enable_mtrack=no
+fi
+
+echo $ac_n "checking whether to configure and build Singular""... $ac_c" 1>&6
+echo "configure:2281: checking whether to configure and build Singular" >&5
+if test "$enable_Singular" != yes && test "$enable_Singular" != no; then
+  if test "$with_Singular" != no && test -d Singular; then
+    enable_Singular=yes
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS Singular"
+    BUILD_SUBDIRS="$BUILD_SUBDIRS Singular"     
+    ac_configure_args="$ac_configure_args --enable-Singular"
+  else
+    enable_Singular=no
+    echo "$ac_t""no" 1>&6
+  fi
+elif test "$enable_Singular" = yes; then
+  if test -d Singular; then
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS Singular"
+    BUILD_SUBDIRS="$BUILD_SUBDIRS Singular"     
+  else
+    echo "$ac_t""no" 1>&6
+    { echo "configure: error: can not build Singular without Singular directory" 1>&2; exit 1; }
+  fi
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking whether to configure and build Texinfo""... $ac_c" 1>&6
+echo "configure:2307: checking whether to configure and build Texinfo" >&5
+if test "$enable_Texinfo" != no && test -d Texinfo; then
   echo "$ac_t""yes" 1>&6
   enable_texinfo=yes
   CONFIG_SUBDIRS="$CONFIG_SUBDIRS Texinfo"
+  BUILD_SUBDIRS="$BUILD_SUBDIRS Texinfo"        
   TEXI2DVI=${bindir}/texi2dvi
   MAKEINFO="${bindir}/makeinfo --force"
@@ -1960 +2316 @@
   
   
+  if test "$enable_Texinfo" != yes; then
+    ac_configure_args="$ac_configure_args --enable-Texinfo"
+  fi
 else
   echo "$ac_t""no" 1>&6
@@ -1967 +2326 @@
 set dummy makeinfo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1970: checking for $ac_word" >&5
+echo "configure:2329: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1974 +2333 @@
   ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1996 +2356 @@
 set dummy texi2dvi; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1999: checking for $ac_word" >&5
+echo "configure:2359: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TEXI2DVI'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2003 +2363 @@
   ac_cv_prog_TEXI2DVI="$TEXI2DVI" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -2025 +2386 @@
 set dummy texindex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2028: checking for $ac_word" >&5
+echo "configure:2389: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TEXINDEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2032 +2393 @@
   ac_cv_prog_TEXINDEX="$TEXINDEX" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -2054 +2416 @@
 
 
-echo $ac_n "checking whether to configure and build gmp lib""... $ac_c" 1>&6
-echo "configure:2058: checking whether to configure and build gmp lib" >&5
-if test "$enable_gmp" != yes && test "$enable_gmp" != no; then
-  if test "$ac_gmp_ok" != yes && test -d gmp; then
-    echo "$ac_t""yes" 1>&6
-    enable_gmp=yes
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"
-    ac_configure_args="$ac_configure_args --enable-gmp"
-    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"
-  else
-    echo "$ac_t""no" 1>&6
-    enable_gmp=no
-  fi
-elif test "$enable_gmp" = yes; then
-  if test ! -d gmp; then
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: Can not find gmp subdir" 1>&2; exit 1; }
-  else
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"
-    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"
-  fi
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking whether to configure and build smallgmp lib""... $ac_c" 1>&6
-echo "configure:2084: checking whether to configure and build smallgmp lib" >&5
-if test "$enable_smallgmp" != yes && test "$enable_smallgmp" != no; then
-  if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
-     test "$enable_gmp" != yes && test -d smallgmp; then
-    echo "$ac_t""yes" 1>&6
-    enable_smallgmp=yes
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS smallgmp"
-    ac_configure_args="$ac_configure_args --enable-smallgmp --enable-gmp"
-  else
-    echo "$ac_t""no" 1>&6
-    enable_smallgmp=no
-  fi
-elif test "$enable_smallgmp" = yes; then
-  if test ! -d smallgmp; then
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: Can not find smallgmp subdir" 1>&2; exit 1; }
-  else
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS smallgmp"
-    if test "$ac_gmp_ok" != yes && test "$enable_gmp" != yes; then
-      ac_configure_args="$ac_configure_args --enable-gmp"
-    fi
-  fi
-else 
-  echo "$ac_t""${enable_smallgmp}" 1>&6
-fi
-
-# Check whether we have at least one of smallgmp or gmp
-if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
-   test "$enable_smallgmp" != yes && test "$enable_gmp" != yes; then
-  { echo "configure: error: can neither find nor built gmp or smallgmp" 1>&2; exit 1; }
-fi
-
-# Check whether we need to cheat subsequent configures with --enable-gmp
-if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes; then
-  ac_configure_args="$ac_configure_args --enable-gmp"
-fi
-
-echo $ac_n "checking whether to configure and build MP lib""... $ac_c" 1>&6
-echo "configure:2123: checking whether to configure and build MP lib" >&5
-if test "$enable_MP" != yes && test "$enable_MP" != no; then
-  if test "$with_MP" != no && test "$ac_MP_ok" != yes && test -d MP && \
-     (test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes); then
-    echo "$ac_t""yes" 1>&6
-    enable_MP=yes
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
-    ac_configure_args="$ac_configure_args --enable-MP"
-  else
-    echo "$ac_t""no" 1>&6
-    enable_MP=no
-  fi
-elif test "$enable_MP" = yes; then
-  if test ! -d MP; then
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: can not build MP without MP directory" 1>&2; exit 1; }
-  fi
-  if test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes; then
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
-  else
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: can not build MP without gmp" 1>&2; exit 1; }
-  fi
-else
-  echo "$ac_t""no" 1>&6
-fi
-  
-echo $ac_n "checking whether to configure and build factory lib""... $ac_c" 1>&6
-echo "configure:2152: checking whether to configure and build factory lib" >&5
-if test "$enable_factory" != yes && test "$enable_factory" != no; then
-  if test "$with_factory" != no && test "$ac_factory_ok" != yes && \
-     test -d factory; then
-    enable_factory=yes
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
-    ac_configure_args="$ac_configure_args --enable-factory"
-  else
-    enable_factory=no
-    echo "$ac_t""no" 1>&6
-  fi
-elif test "$enable_factory" = yes; then
-  if test -d factory; then
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
-  else
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: can not build factory without factory directory" 1>&2; exit 1; }
-  fi
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking whether to configure and build libfac lib""... $ac_c" 1>&6
-echo "configure:2177: checking whether to configure and build libfac lib" >&5
-if test "$enable_libfac" != yes && test "$enable_libfac" != no; then
-  if test "$with_libfac" != no && test "$ac_libfac_ok" != yes && \
-     test -d libfac && \
-     (test "$ac_factory_ok" = yes || test "$enable_factory" = yes); then
-    enable_libfac=yes
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
-    ac_configure_args="$ac_configure_args --enable-libfac"
-  else
-    enable_libfac=no
-    echo "$ac_t""no" 1>&6
-  fi
-elif  test "$enable_libfac" = yes; then
-  if test ! -d libfac; then
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: can not build libfac without libfac directory" 1>&2; exit 1; }
-  fi
-  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
-  else
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: Can not build libfac without factory" 1>&2; exit 1; }
-  fi
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking whether to configure and build sgroup lib""... $ac_c" 1>&6
-echo "configure:2207: checking whether to configure and build sgroup lib" >&5
-if test "$enable_sgroup" != yes && test "$enable_sgroup" != no; then
-  if test "$with_sgroup" != no && test "$ac_sgroup_ok" != yes && \
-     test -d sgroup && \
-     (test "$ac_MP_ok" = yes || test "$enable_MP" = yes); then
-    enable_sgroup=yes
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS sgroup"
-    ac_configure_args="$ac_configure_args --enable-sgroup"
-  else
-    enable_sgroup=no
-    echo "$ac_t""no" 1>&6
-  fi
-elif  test "$enable_sgroup" = yes; then
-  if test ! -d sgroup; then
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: can not build sgroup without sgroup directory" 1>&2; exit 1; }
-  fi
-  if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS sgroup"
-  else
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: Can not build sgroup without MP" 1>&2; exit 1; }
-  fi
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking whether to configure and build Singular""... $ac_c" 1>&6
-echo "configure:2237: checking whether to configure and build Singular" >&5
-if test "$enable_Singular" != yes && test "$enable_Singular" != no; then
-  if test "$with_Singular" != no && test -d Singular; then
-    enable_Singular=yes
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS Singular"
-    ac_configure_args="$ac_configure_args --enable-Singular"
-  else
-    enable_Singular=no
-    echo "$ac_t""no" 1>&6
-  fi
-elif test "$enable_Singular" = yes; then
-  if test -d Singular; then
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS Singular"
-  else
-    echo "$ac_t""no" 1>&6
-    { echo "configure: error: can not build Singular without Singular directory" 1>&2; exit 1; }
-  fi
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+echo $ac_n "checking whether to build Texi2html""... $ac_c" 1>&6
+echo "configure:2420: checking whether to build Texi2html" >&5
+if test "$enable_Texi2html" != no && test -d Texi2html; then
+ echo "$ac_t""yes" 1>&6
+ BUILD_SUBDIRS="$BUILD_SUBDIRS Texi2html"
+ if test "$enable_Texi2html" != yes; then
+   ac_configure_args="$ac_configure_args --enable-Texi2html"
+ fi
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking whether to build doc""... $ac_c" 1>&6
+echo "configure:2432: checking whether to build doc" >&5
+if test "$enable_doc" != no && test -d doc; then
+ echo "$ac_t""yes" 1>&6
+ BUILD_SUBDIRS="$BUILD_SUBDIRS doc"
+ if test "$enable_doc" != yes; then
+   enable_doc=yes
+   ac_configure_args="$ac_configure_args --enable-doc"
+ fi
+else
+ enable_doc=no
+ echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking whether to build emacs""... $ac_c" 1>&6
+echo "configure:2446: checking whether to build emacs" >&5
+if test "$enable_doc" = yes && test "$enable_emacs" != no && test -d emacs; then
+ echo "$ac_t""yes" 1>&6
+ BUILD_SUBDIRS="$BUILD_SUBDIRS emacs"
+ if test "$enable_emacs" != yes; then
+   ac_configure_args="$ac_configure_args --enable-emacs"
+ fi
+else
+ echo "$ac_t""no" 1>&6
+fi
 
 echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
-echo "configure:2262: checking which apint package to use" >&5
+echo "configure:2458: checking which apint package to use" >&5
 if test "$with_apint" = gmp; then
   if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
@@ -2283 +2479 @@
 
 echo $ac_n "checking whether to use with MP""... $ac_c" 1>&6
-echo "configure:2286: checking whether to use with MP" >&5
+echo "configure:2482: checking whether to use with MP" >&5
 if test "$with_MP" = yes; then
   if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
@@ -2302 +2498 @@
 
 echo $ac_n "checking whether to use with factory""... $ac_c" 1>&6
-echo "configure:2305: checking whether to use with factory" >&5
+echo "configure:2501: checking whether to use with factory" >&5
 if test "$with_factory" = yes; then
   if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
@@ -2321 +2517 @@
   
 echo $ac_n "checking whether to use with libfac""... $ac_c" 1>&6
-echo "configure:2324: checking whether to use with libfac" >&5
+echo "configure:2520: checking whether to use with libfac" >&5
 if test "$with_libfac" = yes; then
   if test "$ac_libfac_ok" = yes || test "$enable_libfac" = yes; then
@@ -2339 +2535 @@
 fi
 
-echo $ac_n "checking whether to use mtrack""... $ac_c" 1>&6
-echo "configure:2343: checking whether to use mtrack" >&5
-if test -d mpr && test "$ac_cv_singuname" = ix86-Linux; then
-   echo "$ac_t""yes" 1>&6
-   ac_configure_args="$ac_configure_args --with-mtrack"
-   OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" mpr/Makefile"
-   BUILD_SUBDIRS="$BUILD_SUBDIRS mpr"
-fi
+
+echo $ac_n "checking whether to use with mtrack""... $ac_c" 1>&6
+echo "configure:2540: checking whether to use with mtrack" >&5
+if test "$with_mtrack" != no && test "$with_mtrack" != yes; then
+  if test "$enable_mtrack" = yes; then
+    with_mtrack=yes
+  else
+    with_mtrack=no
+  fi
+  ac_configure_args="$ac_configure_args --with-mtrack=$with_mtrack"
+elif test "$with_mtrack" = yes && test "$enable_mtrack" != yes; then
+  with_mtrack=no
+  ac_configure_args="$ac_configure_args --with-mtrack=no"
+fi
+if test "$with_mtrack" != yes; then
+  echo "$ac_t""no" 1>&6
+else
+  echo "$ac_t""yes" 1>&6
+fi
+
 
 echo $ac_n "checking whether to use with Singular""... $ac_c" 1>&6
-echo "configure:2352: checking whether to use with Singular" >&5
+echo "configure:2560: checking whether to use with Singular" >&5
 if test "$with_Singular" != no && test "$with_Singular" != yes; then
   if test "$enable_Singular" = yes; then
@@ -2367 +2575 @@
 
 SUBDIRS=""
+if test -d smallgmp; then
+  SUBDIRS="$SUBDIRS smallgmp"
+fi
+if test -d gmp; then
+  SUBDIRS="$SUBDIRS gmp"
+fi
+if test -d MP; then
+  SUBDIRS="$SUBDIRS MP"
+fi
+if test -d factory; then
+  SUBDIRS="$SUBDIRS factory"
+fi
+if test -d libfac; then
+  SUBDIRS="$SUBDIRS libfac"
+fi
+if test -d mpr; then
+  SUBDIRS="$SUBDIRS mpr"
+fi
+if test -d sgroup; then
+  SUBDIRS="$SUBDIRS sgroup"
+fi
+if test -d Singular; then
+  SUBDIRS="$SUBDIRS Singular"
+fi
+if test -d Texinfo; then
+  SUBDIRS="$SUBDIRS Texinfo"
+fi
+if test -d Texi2html; then
+  SUBDIRS="$SUBDIRS Texi2html"
+fi
 if test -d doc; then
   SUBDIRS="$SUBDIRS doc"
 fi
-if test -d smallgmp; then
-  SUBDIRS="$SUBDIRS smallgmp"
-fi
-if test -d gmp; then
-  SUBDIRS="$SUBDIRS gmp"
-fi
-if test -d MP; then
-  SUBDIRS="$SUBDIRS MP"
-fi
-if test -d factory; then
-  SUBDIRS="$SUBDIRS factory"
-fi
-if test -d libfac; then
-  SUBDIRS="$SUBDIRS libfac"
+if test -d emacs; then
+  SUBDIRS="$SUBDIRS emacs"
 fi
 if test -d rpm; then
   SUBDIRS="$SUBDIRS rpm"
 fi
-if test -d mpr; then
-  SUBDIRS="$SUBDIRS mpr"
-fi
-if test -d Singular; then
-  SUBDIRS="$SUBDIRS Singular"
-fi
-if test -d emacs; then
-  SUBDIRS="$SUBDIRS emacs"
-  BUILD_SUBDIRS="$BUILD_SUBDIRS emacs"
-fi
-if test -d Texi2html; then
-  SUBDIRS="$SUBDIRS Texi2html"
-  BUILD_SUBDIRS="$BUILD_SUBDIRS Texi2html"
-fi
-if test -d sgroup; then
-  SUBDIRS="$SUBDIRS sgroup"
-fi
   
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2411: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2620: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
@@ -2463 +2672 @@
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
@@ -2542 +2751 @@
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
@@ -2562 +2771 @@
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
@@ -2590 +2801 @@
 s%@CPP@%$CPP%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@PERL@%$PERL%g

configure.in

@@ -2 +2 @@
 AC_INIT(Singular/matpol.h)
 AC_PREFIX_DEFAULT(`pwd`)
-OUTPUT_MAKEFILES="Makefile doc/Makefile doc/version.texi doc/uname.texi"
+OUTPUT_MAKEFILES="Makefile"
+if test -d "doc"; then
+   OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES doc/Makefile doc/version.texi doc/uname.texi"
+fi
 if test -d "rpm"; then
    OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" rpm/Makefile"
@@ -209 +212 @@
   [  --with-perl5=[PERL5,no] uses PERL5 as perl5 program, default is perl5])
 AC_ARG_ENABLE(smallgmp, \
- [ --enable-PACKAGE        configure and build PACKAGE
-  --disable-PACKAGE       do not configure and build PACKAGE
+ [ --enable-PACKAGE        configure and/or build PACKAGE
+  --disable-PACKAGE       do not configure and/or build PACKAGE
    where PACKAGE can be:
      smallgmp             minimal version of gmp written in C only])
@@ -223 +226 @@
 AC_ARG_ENABLE(sgroup, \
  [    sgroup               numerical semigroup computations])
+AC_ARG_ENABLE(mtrack, \
+ [    mtrack               utility to track unused memory])
 AC_ARG_ENABLE(Singular, \
  [    Singular             CAS for Polynomial Computations])
 AC_ARG_ENABLE(Texinfo, \
  [    Texinfo              Texinfo for info, texi2dvi, makeinfo])
+AC_ARG_ENABLE(Texi2html, \
+ [    Texi2html            Texinfo to HTML converter])
+AC_ARG_ENABLE(doc, \
+ [    doc                  Singular documentation])
+AC_ARG_ENABLE(emacs, \
+ [    emacs                emacs completion files])
 AC_ARG_WITH(MP,\
  [ --with-PACKAGE          use PACKAGE, provide dependent functionality
@@ -236 +247 @@
 AC_ARG_WITH(libfac, \
  [    libfac               char set and modp poly factorization library])
+AC_ARG_WITH(mtrack, \
+ [    mtrack               utility to track unused memory])
 AC_ARG_WITH(gmp, \
  [ --with-apint=PACKAGE    use PACKAGE for arbitary integer arithmetic
@@ -305 +318 @@
 dnl Check whether or not to configure and build various packages
 dnl
-AC_MSG_CHECKING(whether to configure and build texinfo)
-if test "$enable_texinfo" != no && test -d Texinfo; then
+
+AC_MSG_CHECKING(whether to configure and build gmp lib)
+if test "$enable_gmp" != yes && test "$enable_gmp" != no; then
+  if test "$ac_gmp_ok" != yes && test -d gmp; then
+    AC_MSG_RESULT(yes)
+    enable_gmp=yes
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"
+    ac_configure_args="$ac_configure_args --enable-gmp"
+    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"
+  else
+    AC_MSG_RESULT(no)
+    enable_gmp=no
+  fi
+elif test "$enable_gmp" = yes; then
+  if test ! -d gmp; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(Can not find gmp subdir)
+  else
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"
+    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(whether to configure and build smallgmp lib)
+if test "$enable_smallgmp" != yes && test "$enable_smallgmp" != no; then
+  if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
+     test "$enable_gmp" != yes && test -d smallgmp; then
+    AC_MSG_RESULT(yes)
+    enable_smallgmp=yes
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS smallgmp"
+    ac_configure_args="$ac_configure_args --enable-smallgmp --enable-gmp"
+  else
+    AC_MSG_RESULT(no)
+    enable_smallgmp=no
+  fi
+elif test "$enable_smallgmp" = yes; then
+  if test ! -d smallgmp; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(Can not find smallgmp subdir)
+  else
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS smallgmp"
+    if test "$ac_gmp_ok" != yes && test "$enable_gmp" != yes; then
+      ac_configure_args="$ac_configure_args --enable-gmp"
+    fi
+  fi
+else 
+  AC_MSG_RESULT(${enable_smallgmp})
+fi
+
+# Check whether we have at least one of smallgmp or gmp
+if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
+   test "$enable_smallgmp" != yes && test "$enable_gmp" != yes; then
+  AC_MSG_ERROR(can neither find nor built gmp or smallgmp)
+fi
+
+# Check whether we need to cheat subsequent configures with --enable-gmp
+if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes; then
+  ac_configure_args="$ac_configure_args --enable-gmp"
+fi
+
+AC_MSG_CHECKING(whether to configure and build MP lib)
+if test "$enable_MP" != yes && test "$enable_MP" != no; then
+  if test "$with_MP" != no && test "$ac_MP_ok" != yes && test -d MP && \
+     (test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes); then
+    AC_MSG_RESULT(yes)
+    enable_MP=yes
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
+    ac_configure_args="$ac_configure_args --enable-MP"
+  else
+    AC_MSG_RESULT(no)
+    enable_MP=no
+  fi
+elif test "$enable_MP" = yes; then
+  if test ! -d MP; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(can not build MP without MP directory)
+  fi
+  if test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes; then
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(can not build MP without gmp)
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+  
+AC_MSG_CHECKING(whether to configure and build factory lib)
+if test "$enable_factory" != yes && test "$enable_factory" != no; then
+  if test "$with_factory" != no && test "$ac_factory_ok" != yes && \
+     test -d factory; then
+    enable_factory=yes
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
+    ac_configure_args="$ac_configure_args --enable-factory"
+  else
+    enable_factory=no
+    AC_MSG_RESULT(no)
+  fi
+elif test "$enable_factory" = yes; then
+  if test -d factory; then
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(can not build factory without factory directory)
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(whether to configure and build libfac lib)
+if test "$enable_libfac" != yes && test "$enable_libfac" != no; then
+  if test "$with_libfac" != no && test "$ac_libfac_ok" != yes && \
+     test -d libfac && \
+     (test "$ac_factory_ok" = yes || test "$enable_factory" = yes); then
+    enable_libfac=yes
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
+    ac_configure_args="$ac_configure_args --enable-libfac"
+  else
+    enable_libfac=no
+    AC_MSG_RESULT(no)
+  fi
+elif  test "$enable_libfac" = yes; then
+  if test ! -d libfac; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(can not build libfac without libfac directory)
+  fi
+  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(Can not build libfac without factory)
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(whether to configure and build sgroup lib)
+if test "$enable_sgroup" != yes && test "$enable_sgroup" != no; then
+  if test "$with_sgroup" != no && test "$ac_sgroup_ok" != yes && \
+     test -d sgroup && \
+     (test "$ac_MP_ok" = yes || test "$enable_MP" = yes); then
+    enable_sgroup=yes
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS sgroup"
+    ac_configure_args="$ac_configure_args --enable-sgroup"
+  else
+    enable_sgroup=no
+    AC_MSG_RESULT(no)
+  fi
+elif  test "$enable_sgroup" = yes; then
+  if test ! -d sgroup; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(can not build sgroup without sgroup directory)
+  fi
+  if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS sgroup"
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(Can not build sgroup without MP)
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
+BUILD_SUBDIRS="$CONFIG_SUBDIRS"
+
+AC_MSG_CHECKING(whether to build mpr and use mtrack)
+if test -d mpr && test "$ac_cv_singuname" = ix86-Linux && test "$enable_mtrack" != no; then
+  AC_MSG_RESULT(yes)
+  if test "$enable_mtrack" != yes; then
+     ac_configure_args="$ac_configure_args --enable-mtrack"
+  fi 
+  enable_mtrack=yes
+  OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" mpr/Makefile"
+  BUILD_SUBDIRS="$BUILD_SUBDIRS mpr"
+else
+  AC_MSG_RESULT(no)
+  enable_mtrack=no
+fi
+
+AC_MSG_CHECKING(whether to configure and build Singular)
+if test "$enable_Singular" != yes && test "$enable_Singular" != no; then
+  if test "$with_Singular" != no && test -d Singular; then
+    enable_Singular=yes
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS Singular"
+    BUILD_SUBDIRS="$BUILD_SUBDIRS Singular"     
+    ac_configure_args="$ac_configure_args --enable-Singular"
+  else
+    enable_Singular=no
+    AC_MSG_RESULT(no)
+  fi
+elif test "$enable_Singular" = yes; then
+  if test -d Singular; then
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS Singular"
+    BUILD_SUBDIRS="$BUILD_SUBDIRS Singular"     
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(can not build Singular without Singular directory)
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(whether to configure and build Texinfo)
+if test "$enable_Texinfo" != no && test -d Texinfo; then
   AC_MSG_RESULT(yes)
   enable_texinfo=yes
   CONFIG_SUBDIRS="$CONFIG_SUBDIRS Texinfo"
+  BUILD_SUBDIRS="$BUILD_SUBDIRS Texinfo"        
   TEXI2DVI=${bindir}/texi2dvi
   MAKEINFO="${bindir}/makeinfo --force"
@@ -316 +545 @@
   AC_SUBST(MAKEINFO)
   AC_SUBST(TEXINDEX)
+  if test "$enable_Texinfo" != yes; then
+    ac_configure_args="$ac_configure_args --enable-Texinfo"
+  fi
 else
   AC_MSG_RESULT(no)
@@ -326 +558 @@
 
 
-AC_MSG_CHECKING(whether to configure and build gmp lib)
-if test "$enable_gmp" != yes && test "$enable_gmp" != no; then
-  if test "$ac_gmp_ok" != yes && test -d gmp; then
-    AC_MSG_RESULT(yes)
-    enable_gmp=yes
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"
-    ac_configure_args="$ac_configure_args --enable-gmp"
-    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"
-  else
-    AC_MSG_RESULT(no)
-    enable_gmp=no
-  fi
-elif test "$enable_gmp" = yes; then
-  if test ! -d gmp; then
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(Can not find gmp subdir)
-  else
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"
-    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(whether to configure and build smallgmp lib)
-if test "$enable_smallgmp" != yes && test "$enable_smallgmp" != no; then
-  if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
-     test "$enable_gmp" != yes && test -d smallgmp; then
-    AC_MSG_RESULT(yes)
-    enable_smallgmp=yes
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS smallgmp"
-    ac_configure_args="$ac_configure_args --enable-smallgmp --enable-gmp"
-  else
-    AC_MSG_RESULT(no)
-    enable_smallgmp=no
-  fi
-elif test "$enable_smallgmp" = yes; then
-  if test ! -d smallgmp; then
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(Can not find smallgmp subdir)
-  else
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS smallgmp"
-    if test "$ac_gmp_ok" != yes && test "$enable_gmp" != yes; then
-      ac_configure_args="$ac_configure_args --enable-gmp"
-    fi
-  fi
-else 
-  AC_MSG_RESULT(${enable_smallgmp})
-fi
-
-# Check whether we have at least one of smallgmp or gmp
-if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
-   test "$enable_smallgmp" != yes && test "$enable_gmp" != yes; then
-  AC_MSG_ERROR(can neither find nor built gmp or smallgmp)
-fi
-
-# Check whether we need to cheat subsequent configures with --enable-gmp
-if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes; then
-  ac_configure_args="$ac_configure_args --enable-gmp"
-fi
-
-AC_MSG_CHECKING(whether to configure and build MP lib)
-if test "$enable_MP" != yes && test "$enable_MP" != no; then
-  if test "$with_MP" != no && test "$ac_MP_ok" != yes && test -d MP && \
-     (test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes); then
-    AC_MSG_RESULT(yes)
-    enable_MP=yes
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
-    ac_configure_args="$ac_configure_args --enable-MP"
-  else
-    AC_MSG_RESULT(no)
-    enable_MP=no
-  fi
-elif test "$enable_MP" = yes; then
-  if test ! -d MP; then
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(can not build MP without MP directory)
-  fi
-  if test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes; then
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
-  else
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(can not build MP without gmp)
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-  
-AC_MSG_CHECKING(whether to configure and build factory lib)
-if test "$enable_factory" != yes && test "$enable_factory" != no; then
-  if test "$with_factory" != no && test "$ac_factory_ok" != yes && \
-     test -d factory; then
-    enable_factory=yes
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
-    ac_configure_args="$ac_configure_args --enable-factory"
-  else
-    enable_factory=no
-    AC_MSG_RESULT(no)
-  fi
-elif test "$enable_factory" = yes; then
-  if test -d factory; then
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
-  else
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(can not build factory without factory directory)
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(whether to configure and build libfac lib)
-if test "$enable_libfac" != yes && test "$enable_libfac" != no; then
-  if test "$with_libfac" != no && test "$ac_libfac_ok" != yes && \
-     test -d libfac && \
-     (test "$ac_factory_ok" = yes || test "$enable_factory" = yes); then
-    enable_libfac=yes
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
-    ac_configure_args="$ac_configure_args --enable-libfac"
-  else
-    enable_libfac=no
-    AC_MSG_RESULT(no)
-  fi
-elif  test "$enable_libfac" = yes; then
-  if test ! -d libfac; then
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(can not build libfac without libfac directory)
-  fi
-  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
-  else
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(Can not build libfac without factory)
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(whether to configure and build sgroup lib)
-if test "$enable_sgroup" != yes && test "$enable_sgroup" != no; then
-  if test "$with_sgroup" != no && test "$ac_sgroup_ok" != yes && \
-     test -d sgroup && \
-     (test "$ac_MP_ok" = yes || test "$enable_MP" = yes); then
-    enable_sgroup=yes
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS sgroup"
-    ac_configure_args="$ac_configure_args --enable-sgroup"
-  else
-    enable_sgroup=no
-    AC_MSG_RESULT(no)
-  fi
-elif  test "$enable_sgroup" = yes; then
-  if test ! -d sgroup; then
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(can not build sgroup without sgroup directory)
-  fi
-  if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS sgroup"
-  else
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(Can not build sgroup without MP)
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(whether to configure and build Singular)
-if test "$enable_Singular" != yes && test "$enable_Singular" != no; then
-  if test "$with_Singular" != no && test -d Singular; then
-    enable_Singular=yes
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS Singular"
-    ac_configure_args="$ac_configure_args --enable-Singular"
-  else
-    enable_Singular=no
-    AC_MSG_RESULT(no)
-  fi
-elif test "$enable_Singular" = yes; then
-  if test -d Singular; then
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS Singular"
-  else
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(can not build Singular without Singular directory)
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
+AC_MSG_CHECKING(whether to build Texi2html)
+if test "$enable_Texi2html" != no && test -d Texi2html; then
+ AC_MSG_RESULT(yes)
+ BUILD_SUBDIRS="$BUILD_SUBDIRS Texi2html"
+ if test "$enable_Texi2html" != yes; then
+   ac_configure_args="$ac_configure_args --enable-Texi2html"
+ fi
+else
+ AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(whether to build doc)
+if test "$enable_doc" != no && test -d doc; then
+ AC_MSG_RESULT(yes)
+ BUILD_SUBDIRS="$BUILD_SUBDIRS doc"
+ if test "$enable_doc" != yes; then
+   enable_doc=yes
+   ac_configure_args="$ac_configure_args --enable-doc"
+ fi
+else
+ enable_doc=no
+ AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(whether to build emacs)
+if test "$enable_doc" = yes && test "$enable_emacs" != no && test -d emacs; then
+ AC_MSG_RESULT(yes)
+ BUILD_SUBDIRS="$BUILD_SUBDIRS emacs"
+ if test "$enable_emacs" != yes; then
+   ac_configure_args="$ac_configure_args --enable-emacs"
+ fi
+else
+ AC_MSG_RESULT(no)
+fi
 
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
@@ -605 +675 @@
 fi
 
-AC_MSG_CHECKING(whether to use mtrack)
-if test -d mpr && test "$ac_cv_singuname" = ix86-Linux; then
-   AC_MSG_RESULT(yes)
-   ac_configure_args="$ac_configure_args --with-mtrack"
-   OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" mpr/Makefile"
-   BUILD_SUBDIRS="$BUILD_SUBDIRS mpr"
-fi
+
+AC_MSG_CHECKING(whether to use with mtrack)
+if test "$with_mtrack" != no && test "$with_mtrack" != yes; then
+  if test "$enable_mtrack" = yes; then
+    with_mtrack=yes
+  else
+    with_mtrack=no
+  fi
+  ac_configure_args="$ac_configure_args --with-mtrack=$with_mtrack"
+elif test "$with_mtrack" = yes && test "$enable_mtrack" != yes; then
+  with_mtrack=no
+  ac_configure_args="$ac_configure_args --with-mtrack=no"
+fi
+if test "$with_mtrack" != yes; then
+  AC_MSG_RESULT(no)
+else
+  AC_MSG_RESULT(yes)
+fi
+
 
 AC_MSG_CHECKING(whether to use with Singular)
@@ -634 +716 @@
 dnl
 SUBDIRS=""
+if test -d smallgmp; then
+  SUBDIRS="$SUBDIRS smallgmp"
+fi
+if test -d gmp; then
+  SUBDIRS="$SUBDIRS gmp"
+fi
+if test -d MP; then
+  SUBDIRS="$SUBDIRS MP"
+fi
+if test -d factory; then
+  SUBDIRS="$SUBDIRS factory"
+fi
+if test -d libfac; then
+  SUBDIRS="$SUBDIRS libfac"
+fi
+if test -d mpr; then
+  SUBDIRS="$SUBDIRS mpr"
+fi
+if test -d sgroup; then
+  SUBDIRS="$SUBDIRS sgroup"
+fi
+if test -d Singular; then
+  SUBDIRS="$SUBDIRS Singular"
+fi
+if test -d Texinfo; then
+  SUBDIRS="$SUBDIRS Texinfo"
+fi
+if test -d Texi2html; then
+  SUBDIRS="$SUBDIRS Texi2html"
+fi
 if test -d doc; then
   SUBDIRS="$SUBDIRS doc"
 fi
-if test -d smallgmp; then
-  SUBDIRS="$SUBDIRS smallgmp"
-fi
-if test -d gmp; then
-  SUBDIRS="$SUBDIRS gmp"
-fi
-if test -d MP; then
-  SUBDIRS="$SUBDIRS MP"
-fi
-if test -d factory; then
-  SUBDIRS="$SUBDIRS factory"
-fi
-if test -d libfac; then
-  SUBDIRS="$SUBDIRS libfac"
+if test -d emacs; then
+  SUBDIRS="$SUBDIRS emacs"
 fi
 if test -d rpm; then
   SUBDIRS="$SUBDIRS rpm"
-fi
-if test -d mpr; then
-  SUBDIRS="$SUBDIRS mpr"
-fi
-if test -d Singular; then
-  SUBDIRS="$SUBDIRS Singular"
-fi
-if test -d emacs; then
-  SUBDIRS="$SUBDIRS emacs"
-  BUILD_SUBDIRS="$BUILD_SUBDIRS emacs"
-fi
-if test -d Texi2html; then
-  SUBDIRS="$SUBDIRS Texi2html"
-  BUILD_SUBDIRS="$BUILD_SUBDIRS Texi2html"
-fi
-if test -d sgroup; then
-  SUBDIRS="$SUBDIRS sgroup"
 fi
   

doc/texinfo.tex

@@ -4 +4 @@
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{1999-02-21.16}%
+\def\texinfoversion{1999-09-25.10}
 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
@@ -30 +30 @@
 % Please try the latest version of texinfo.tex before submitting bug
 % reports; you can get the latest version from:
-%   ftp://ftp.gnu.org/pub/gnu/texinfo.tex
+%   ftp://ftp.gnu.org/gnu/texinfo.tex
 %   (and all GNU mirrors, see http://www.gnu.org/order/ftp.html)
-%   ftp://tug.org/tex/texinfo.tex
-%   ftp://ctan.org/macros/texinfo/texinfo.tex
-%   (and all CTAN mirrors, finger ctan@ctan.org for a list).
+%   ftp://texinfo.org/tex/texinfo.tex
+%   ftp://us.ctan.org/macros/texinfo/texinfo.tex
+%   (and all CTAN mirrors, finger ctan@us.ctan.org for a list).
 %   /home/gd/gnu/doc/texinfo.tex on the GNU machines.
 % The texinfo.tex in any given Texinfo distribution could well be out
 % of date, so if that's what you're using, please check.
-% There is a small home page for Texinfo at http://texinfo.org/.
+% Texinfo has a small home page at http://texinfo.org/.
 %
 % Send bug reports to bug-texinfo@gnu.org.  Please include including a
@@ -68 +68 @@
 
 % Save some parts of plain tex whose names we will redefine.
-
 \let\ptexb=\b
 \let\ptexbullet=\bullet
@@ -88 +87 @@
 \let\+ = \relax
 
-
 \message{Basics,}
 \chardef\other=12
@@ -100 +98 @@
 \ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
 \ifx\putwordfile\undefined      \gdef\putwordfile{file}\fi
+\ifx\putwordin\undefined        \gdef\putwordin{in}\fi
 \ifx\putwordIndexIsEmpty\undefined     \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
 \ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
 \ifx\putwordInfo\undefined      \gdef\putwordInfo{Info}\fi
+\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
 \ifx\putwordMethodon\undefined  \gdef\putwordMethodon{Method on}\fi
 \ifx\putwordNoTitle\undefined   \gdef\putwordNoTitle{No Title}\fi
@@ -130 +130 @@
 \ifx\putwordDefmac\undefined    \gdef\putwordDefmac{Macro}\fi
 \ifx\putwordDefspec\undefined   \gdef\putwordDefspec{Special Form}\fi
-\ifx\putwordDefivar\undefined   \gdef\putwordDefivar{Instance Variable}\fi
 \ifx\putwordDefvar\undefined    \gdef\putwordDefvar{Variable}\fi
 \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
@@ -245 +244 @@
       \fi
       %
+      \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi
+      %
       \ifcropmarks
           \egroup % end of \vbox\bgroup
@@ -599 +600 @@
 
 \def\needx#1{%
-  % Go into vertical mode, so we don't make a big box in the middle of a
+  % Ensure vertical mode, so we don't make a big box in the middle of a
   % paragraph.
   \par
   %
-  % Don't add any leading before our big empty box, but allow a page
-  % break, since the best break might be right here.
-  \allowbreak
-  \nointerlineskip
-  \vtop to #1\mil{\vfil}%
-  %
-  % TeX does not even consider page breaks if a penalty added to the
-  % main vertical list is 10000 or more.  But in order to see if the
-  % empty box we just added fits on the page, we must make it consider
-  % page breaks.  On the other hand, we don't want to actually break the
-  % page after the empty box.  So we use a penalty of 9999.
-  %
-  % There is an extremely small chance that TeX will actually break the
-  % page at this \penalty, if there are no other feasible breakpoints in
-  % sight.  (If the user is using lots of big @group commands, which
-  % almost-but-not-quite fill up a page, TeX will have a hard time doing
-  % good page breaking, for example.)  However, I could not construct an
-  % example where a page broke at this \penalty; if it happens in a real
-  % document, then we can reconsider our strategy.
-  \penalty9999
-  %
-  % Back up by the size of the box, whether we did a page break or not.
-  \kern -#1\mil
-  %
-  % Do not allow a page break right after this kern.
-  \nobreak
+  % If the @need value is less than one line space, it's useless.
+  \dimen0 = #1\mil
+  \dimen2 = \ht\strutbox
+  \advance\dimen2 by \dp\strutbox
+  \ifdim\dimen0 > \dimen2
+    %
+    % Do a \strut just to make the height of this box be normal, so the
+    % normal leading is inserted relative to the preceding line.
+    % And a page break here is fine.
+    \vtop to #1\mil{\strut\vfil}%
+    %
+    % TeX does not even consider page breaks if a penalty added to the
+    % main vertical list is 10000 or more.  But in order to see if the
+    % empty box we just added fits on the page, we must make it consider
+    % page breaks.  On the other hand, we don't want to actually break the
+    % page after the empty box.  So we use a penalty of 9999.
+    %
+    % There is an extremely small chance that TeX will actually break the
+    % page at this \penalty, if there are no other feasible breakpoints in
+    % sight.  (If the user is using lots of big @group commands, which
+    % almost-but-not-quite fill up a page, TeX will have a hard time doing
+    % good page breaking, for example.)  However, I could not construct an
+    % example where a page broke at this \penalty; if it happens in a real
+    % document, then we can reconsider our strategy.
+    \penalty9999
+    %
+    % Back up by the size of the box, whether we did a page break or not.
+    \kern -#1\mil
+    %
+    % Do not allow a page break right after this kern.
+    \nobreak
+  \fi
 }
 
@@ -755 +762 @@
   \fi
   \parindent = \defaultparindent
+}
+
+% @exampleindent NCHARS
+% We'll use ems for NCHARS like @paragraphindent.
+% It seems @exampleindent asis isn't necessary, but
+% I preserve it to make it similar to @paragraphindent.
+\def\exampleindent{\parsearg\doexampleindent}
+\def\doexampleindent#1{%
+  \def\temp{#1}%
+  \ifx\temp\asisword
+  \else
+    \ifx\temp\noneword
+      \lispnarrowing = 0pt
+    \else
+      \lispnarrowing = #1em
+    \fi
+  \fi
 }
 
@@ -823 +847 @@
 % @bye.
 \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
+
+
+\message{pdf,}
+% adobe `portable' document format
+\newcount\tempnum
+\newcount\lnkcount
+\newtoks\filename
+\newcount\filenamelength
+\newcount\pgn
+\newtoks\toksA
+\newtoks\toksB
+\newtoks\toksC
+\newtoks\toksD
+\newbox\boxA
+\newcount\countA
+\newif\ifpdf
+\newif\ifpdfmakepagedest
+
+\ifx\pdfoutput\undefined
+  \pdffalse
+  \let\pdfmkdest = \gobble
+  \let\pdfurl = \gobble
+  \let\endlink = \relax
+  \let\linkcolor = \relax
+  \let\pdfmakeoutlines = \relax
+\else
+  \pdftrue
+  \pdfoutput = 1
+  \input pdfcolor
+  \def\dopdfimage#1#2#3{%
+    \def\imagewidth{#2}%
+    \def\imageheight{#3}%
+    \ifnum\pdftexversion < 14
+      \pdfimage
+    \else
+      \pdfximage
+    \fi
+      \ifx\empty\imagewidth\else width \imagewidth \fi
+      \ifx\empty\imageheight\else height \imageheight \fi
+      {#1.pdf}%
+    \ifnum\pdftexversion < 14 \else
+      \pdfrefximage \pdflastximage
+    \fi}
+  \def\pdfmkdest#1{\pdfdest name{#1@} xyz}
+  \def\pdfmkpgn#1{#1@}
+  \let\linkcolor = \Cyan
+  \def\endlink{\Black\pdfendlink}
+  % Adding outlines to PDF; macros for calculating structure of outlines
+  % come from Petr Olsak
+  \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
+    \else \csname#1\endcsname \fi}
+  \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
+    \advance\tempnum by1
+    \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
+  \def\pdfmakeoutlines{{%
+    \openin 1 \jobname.toc
+    \ifeof 1\else\bgroup
+      \closein 1 
+      \indexnofonts
+      \def\tt{}
+      % thanh's hack / proper braces in bookmarks  
+      \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
+      \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
+      %
+      \def\chapentry ##1##2##3{}
+      \def\unnumbchapentry ##1##2{}
+      \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
+      \def\unnumbsecentry ##1##2{}
+      \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}}
+      \def\unnumbsubsecentry ##1##2{}
+      \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}}
+      \def\unnumbsubsubsecentry ##1##2{}
+      \input \jobname.toc
+      \def\chapentry ##1##2##3{%
+        \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
+      \def\unnumbchapentry ##1##2{%
+        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
+      \def\secentry ##1##2##3##4{%
+        \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}}
+      \def\unnumbsecentry ##1##2{%
+        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
+      \def\subsecentry ##1##2##3##4##5{%
+        \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
+      \def\unnumbsubsecentry ##1##2{%
+        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
+      \def\subsubsecentry ##1##2##3##4##5##6{%
+        \pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
+      \def\unnumbsubsubsecentry ##1##2{%
+        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
+      \input \jobname.toc
+    \egroup\fi
+  }}
+  \def\makelinks #1,{%
+    \def\params{#1}\def\E{END}%
+    \ifx\params\E
+      \let\nextmakelinks=\relax
+    \else
+      \let\nextmakelinks=\makelinks
+      \ifnum\lnkcount>0,\fi
+      \picknum{#1}%
+      \startlink attr{/Border [0 0 0]} 
+        goto name{\pdfmkpgn{\the\pgn}}%
+      \linkcolor #1%
+      \advance\lnkcount by 1%
+      \endlink
+    \fi
+    \nextmakelinks
+  }
+  \def\picknum#1{\expandafter\pn#1}
+  \def\pn#1{%
+    \def\p{#1}%
+    \ifx\p\lbrace
+      \let\nextpn=\ppn
+    \else
+      \let\nextpn=\ppnn
+      \def\first{#1}
+    \fi
+    \nextpn
+  }
+  \def\ppn#1{\pgn=#1\gobble}
+  \def\ppnn{\pgn=\first}
+  \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
+  \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
+  \def\skipspaces#1{\def\PP{#1}\def\D{|}%
+    \ifx\PP\D\let\nextsp\relax
+    \else\let\nextsp\skipspaces
+      \ifx\p\space\else\addtokens{\filename}{\PP}%
+        \advance\filenamelength by 1
+      \fi
+    \fi
+    \nextsp}
+  \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
+  \ifnum\pdftexversion < 14
+    \let \startlink \pdfannotlink
+  \else
+    \let \startlink \pdfstartlink
+  \fi
+  \def\pdfurl#1{%
+    \begingroup
+      \normalturnoffactive\def\@{@}%
+      \leavevmode\Red
+      \startlink attr{/Border [0 0 0]}%
+        user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
+        % #1
+    \endgroup}
+  \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
+  \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
+  \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
+  \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
+  \def\maketoks{%
+    \expandafter\poptoks\the\toksA|ENDTOKS|
+    \ifx\first0\adn0
+    \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
+    \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
+    \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 
+    \else
+      \ifnum0=\countA\else\makelink\fi
+      \ifx\first.\let\next=\done\else
+        \let\next=\maketoks
+        \addtokens{\toksB}{\the\toksD}
+        \ifx\first,\addtokens{\toksB}{\space}\fi
+      \fi
+    \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+    \next}
+  \def\makelink{\addtokens{\toksB}%
+    {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
+  \def\pdflink#1{%
+    \startlink attr{/Border [0 0 0]} goto name{\mkpgn{#1}}
+    \linkcolor #1\endlink}
+  \def\mkpgn#1{#1@} 
+  \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
+\fi % \ifx\pdfoutput
 
 
@@ -894 +1090 @@
 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
 
-% Fonts for indices and small examples (9pt).
-% We actually use the slanted font rather than the italic,
-% because texinfo normally uses the slanted fonts for that.
-% Do not make many font distinctions in general in the index, since they
-% aren't very useful.
-\setfont\ninett\ttshape{9}{1000}
-\setfont\ninettsl\ttslshape{10}{900}
-\setfont\indrm\rmshape{9}{1000}
-\setfont\indit\itshape{9}{1000}
-\setfont\indsl\slshape{9}{1000}
-\let\indtt=\ninett
-\let\indttsl=\ninettsl
-\let\indsf=\indrm
-\let\indbf=\indrm
-\setfont\indsc\scshape{10}{900}
-\font\indi=cmmi9
-\font\indsy=cmsy9
+% Fonts for indices, footnotes, small examples (9pt).
+\setfont\smallrm\rmshape{9}{1000}
+\setfont\smalltt\ttshape{9}{1000}
+\setfont\smallbf\bfshape{10}{900}
+\setfont\smallit\itshape{9}{1000}
+\setfont\smallsl\slshape{9}{1000}
+\setfont\smallsf\sfshape{9}{1000}
+\setfont\smallsc\scshape{10}{900}
+\setfont\smallttsl\ttslshape{10}{900}
+\font\smalli=cmmi9
+\font\smallsy=cmsy9
 
 % Fonts for title page:
@@ -1024 +1214 @@
   \resetmathfonts \setleading{15pt}}
 \let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf?
-\def\indexfonts{%
-  \let\tenrm=\indrm \let\tenit=\indit \let\tensl=\indsl
-  \let\tenbf=\indbf \let\tentt=\indtt \let\smallcaps=\indsc
-  \let\tensf=\indsf \let\teni=\indi \let\tensy=\indsy \let\tenttsl=\indttsl
-  \resetmathfonts \setleading{12pt}}
+\def\smallfonts{%
+  \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
+  \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
+  \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
+  \let\tenttsl=\smallttsl
+  \resetmathfonts \setleading{11pt}}
 
 % Set up the default fonts, so we can use them for creating boxes.
@@ -1077 +1268 @@
 \let\ttfont=\t
 \def\samp#1{`\tclose{#1}'\null}
-\setfont\smallrm\rmshape{8}{1000}
-\font\smallsy=cmsy9
-\def\key#1{{\smallrm\textfont2=\smallsy \leavevmode\hbox{%
+\setfont\keyrm\rmshape{8}{1000}
+\font\keysy=cmsy9
+\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
   \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
     \vbox{\hrule\kern-0.4pt
@@ -1190 +1381 @@
 %
 \def\uref#1{\douref #1,,,\finish}
-\def\douref#1,#2,#3,#4\finish{%
+\def\douref#1,#2,#3,#4\finish{\begingroup
+  \unsepspaces
+  \pdfurl{#1}%
   \setbox0 = \hbox{\ignorespaces #3}%
   \ifdim\wd0 > 0pt
@@ -1197 +1390 @@
     \setbox0 = \hbox{\ignorespaces #2}%
     \ifdim\wd0 > 0pt
-      \unhbox0\ (\code{#1})% second arg given, show both it and url
+      \ifpdf
+        \unhbox0             % PDF: 2nd arg given, show only it
+      \else
+        \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
+      \fi
     \else
       \code{#1}% only url given, so show it
     \fi
   \fi
-}
-
-% rms does not like the angle brackets --karl, 17may97.
-% So now @email is just like @uref.
+  \endlink
+\endgroup}
+
+% rms does not like angle brackets --karl, 17may97.
+% So now @email is just like @uref, unless we are pdf.
+% 
 %\def\email#1{\angleleft{\tt #1}\angleright}
-\let\email=\uref
+\ifpdf
+  \def\email#1{\doemail#1,,\finish}
+  \def\doemail#1,#2,#3\finish{\begingroup
+    \unsepspaces
+    \pdfurl{mailto:#1}%
+    \setbox0 = \hbox{\ignorespaces #2}%
+    \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
+    \endlink
+  \endgroup}
+\else
+  \let\email=\uref
+\fi
 
 % Check if we are currently using a typewriter font.  Since all the
@@ -1325 +1535 @@
      \global\let\shortcontents = \relax
    \fi
+   %
+   \ifpdf \pdfmakepagedesttrue \fi
    %
    \HEADINGSon
@@ -1891 +2103 @@
 }
 
-% multitable syntax
-\def\tab{&\hskip1sp\relax} % 2/2/96
-                           % tiny skip here makes sure this column space is
-                           % maintained, even if it is never used.
+% This used to have \hskip1sp.  But then the space in a template line is
+% not enough.  That is bad.  So let's go back to just & until we
+% encounter the problem it was intended to solve again.
+% --karl, nathan@acm.org, 20apr99.
+\def\tab{&}
 
 % @multitable ... @end multitable definitions:
@@ -1975 +2188 @@
 % current baselineskip.
 \ifdim\multitablelinespace=0pt
+\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
+\global\advance\multitablelinespace by-\ht0
 %% strut to put in table in case some entry doesn't have descenders,
 %% to keep lines equally spaced
 \let\multistrut = \strut
+\else
+%% FIXME: what is \box0 supposed to be?
+\gdef\multistrut{\vrule height\multitablelinespace depth\dp0
+width0pt\relax} \fi
 %% Test to see if parskip is larger than space between lines of
 %% table. If not, do nothing.
 %%        If so, set to same dimension as multitablelinespace.
-\else
-\gdef\multistrut{\vrule height\multitablelinespace depth\dp0
-width0pt\relax} \fi
 \ifdim\multitableparskip>\multitablelinespace
 \global\multitableparskip=\multitablelinespace
@@ -2045 +2261 @@
   \let\deftypefn = \relax
   \let\deftypefun = \relax
+  \let\deftypeivar = \relax
+  \let\deftypeop = \relax
   \let\deftypevar = \relax
   \let\deftypevr = \relax
@@ -2188 +2406 @@
     %
     \nullfont
-    \let\tenrm = \nullfont  \let\tenit = \nullfont  \let\tensl = \nullfont
-    \let\tenbf = \nullfont  \let\tentt = \nullfont  \let\smallcaps = \nullfont
-    \let\tensf = \nullfont
-    % Similarly for index fonts (mostly for their use in
-    % smallexample)
-    \let\indrm = \nullfont  \let\indit = \nullfont  \let\indsl = \nullfont
-    \let\indbf = \nullfont  \let\indtt = \nullfont  \let\indsc = \nullfont
-    \let\indsf = \nullfont
+    \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont
+    \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont
+    \let\tensf=\nullfont
+    % Similarly for index fonts (mostly for their use in smallexample).
+    \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont
+    \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont
+    \let\smallsf=\nullfont
     %
     % Don't complain when characters are missing from the fonts.
@@ -2459 +2676 @@
 % Need these in case \tex is in effect and \{ is a \delimiter again.
 % But can't use \lbracecmd and \rbracecmd because texindex assumes
-% braces and backslashes are used only as delimiters.
+% braces and backslashes are used only as delimiters.  
 \let\{ = \mylbrace
 \let\} = \myrbrace
@@ -2572 +2789 @@
 \let\uref=\indexdummyfont
 \let\env=\indexdummyfont
+\let\acronym=\indexdummyfont
 \let\command=\indexdummyfont
 \let\option=\indexdummyfont
@@ -2725 +2943 @@
   \dobreak \chapheadingskip{10000}%
   %
-  \indexfonts \rm
+  \smallfonts \rm
   \tolerance = 9500
   \indexbreaks
@@ -2852 +3070 @@
     % part of (the primitive) \par.  Without it, a spurious underfull
     % \hbox ensues.
-    \ #2% The page number ends the paragraph.
+    \ifpdf
+      \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
+    \else
+      \ #2% The page number ends the paragraph.
+    \fi
   \fi%
   \par
@@ -3011 +3233 @@
 
 \message{sectioning,}
-% Define chapters, sections, etc.
+% Chapters, sections, etc.
 
 \newcount\chapno
@@ -3020 +3242 @@
 % This counter is funny since it counts through charcodes of letters A, B, ...
 \newcount\appendixno  \appendixno = `\@
-\def\appendixletter{\char\the\appendixno}
+% \def\appendixletter{\char\the\appendixno}
+% We do the following for the sake of pdftex, which needs the actual
+% letter in the expansion, not just typeset.
+\def\appendixletter{%
+  \ifnum\appendixno=`A A%
+  \else\ifnum\appendixno=`B B%
+  \else\ifnum\appendixno=`C C%
+  \else\ifnum\appendixno=`D D%
+  \else\ifnum\appendixno=`E E%
+  \else\ifnum\appendixno=`F F%
+  \else\ifnum\appendixno=`G G%
+  \else\ifnum\appendixno=`H H%
+  \else\ifnum\appendixno=`I I%
+  \else\ifnum\appendixno=`J J%
+  \else\ifnum\appendixno=`K K%
+  \else\ifnum\appendixno=`L L%
+  \else\ifnum\appendixno=`M M%
+  \else\ifnum\appendixno=`N N%
+  \else\ifnum\appendixno=`O O%
+  \else\ifnum\appendixno=`P P%
+  \else\ifnum\appendixno=`Q Q%
+  \else\ifnum\appendixno=`R R%
+  \else\ifnum\appendixno=`S S%
+  \else\ifnum\appendixno=`T T%
+  \else\ifnum\appendixno=`U U%
+  \else\ifnum\appendixno=`V V%
+  \else\ifnum\appendixno=`W W%
+  \else\ifnum\appendixno=`X X%
+  \else\ifnum\appendixno=`Y Y%
+  \else\ifnum\appendixno=`Z Z%
+  % The \the is necessary, despite appearances, because \appendixletter is
+  % expanded while writing the .toc file.  \char\appendixno is not
+  % expandable, thus it is written literally, thus all appendixes come out
+  % with the same letter (or @) in the toc without it.
+  \else\char\the\appendixno
+  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
 
 % Each @chapter defines this as the name of the chapter.
@@ -3493 +3751 @@
 
 \message{toc,}
+% Table of contents.
 \newwrite\tocfile
 
@@ -3553 +3812 @@
      \vfill \eject
      \contentsalignmacro % in case @setchapternewpage odd is in effect
+     \pdfmakeoutlines
    \endgroup
    \lastnegativepageno = \pageno
@@ -3589 +3849 @@
 \let\shortcontents = \summarycontents
 
+\ifpdf
+  \pdfcatalog{/PageMode /UseOutlines}%
+\fi
+
 % These macros generate individual entries in the table of contents.
 % The first argument is the chapter or section name.
@@ -3599 +3863 @@
 % See comments in \dochapentry re vbox and related settings
 \def\shortchapentry#1#2#3{%
-  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno{#3}}%
+  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}%
 }
 
@@ -3607 +3871 @@
 % command in the toc file for appendices, instead of using \chapentry
 % for both, but it doesn't seem worth it.
-\setbox0 = \hbox{\shortcontrm \putwordAppendix }
-\newdimen\shortappendixwidth \shortappendixwidth = \wd0
-
+%
+\newdimen\shortappendixwidth
+%
 \def\shortchaplabel#1{%
+  % Compute width of word "Appendix", may change with language.
+  \setbox0 = \hbox{\shortcontrm \putwordAppendix}%
+  \shortappendixwidth = \wd0
+  %
   % We typeset #1 in a box of constant width, regardless of the text of
   % #1, so the chapter titles will come out aligned.
@@ -3625 +3893 @@
 
 \def\unnumbchapentry#1#2{\dochapentry{#1}{#2}}
-\def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno{#2}}}
+\def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno\bgroup#2\egroup}}
 
 % Sections.
@@ -3652 +3920 @@
    \begingroup
      \chapentryfonts
-     \tocentry{#1}{\dopageno{#2}}%
+     \tocentry{#1}{\dopageno\bgroup#2\egroup}%
    \endgroup
    \nobreak\vskip .25\baselineskip plus.1\baselineskip
@@ -3659 +3927 @@
 \def\dosecentry#1#2{\begingroup
   \secentryfonts \leftskip=\tocindent
-  \tocentry{#1}{\dopageno{#2}}%
+  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
 \endgroup}
 
 \def\dosubsecentry#1#2{\begingroup
   \subsecentryfonts \leftskip=2\tocindent
-  \tocentry{#1}{\dopageno{#2}}%
+  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
 \endgroup}
 
 \def\dosubsubsecentry#1#2{\begingroup
   \subsubsecentryfonts \leftskip=3\tocindent
-  \tocentry{#1}{\dopageno{#2}}%
+  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
 \endgroup}
 
@@ -3697 +3965 @@
 
 \message{environments,}
+% @foo ... @end foo.
 
 % Since these characters are used in examples, it should be an even number of
@@ -3946 +4215 @@
   \def\Esmalllisp{\nonfillfinish\endgroup}%
   \def\Esmallexample{\nonfillfinish\endgroup}%
-  \indexfonts
+  \smallfonts
   \lisp
 }
@@ -3962 +4231 @@
 \def\smalldisplayx{\begingroup
   \def\Esmalldisplay{\nonfillfinish\endgroup}%
-  \indexfonts \rm
+  \smallfonts \rm
   \display
 }
@@ -3979 +4248 @@
 \def\smallformatx{\begingroup
   \def\Esmallformat{\nonfillfinish\endgroup}%
-  \indexfonts \rm
+  \smallfonts \rm
   \format
 }
@@ -4020 +4289 @@
 
 \message{defuns,}
-% Define formatter for defuns
-% First, allow user to change definition object font (\df) internally
+% @defun etc.
+
+% Allow user to change definition object font (\df) internally
 \def\setdeffont #1 {\csname DEF#1\endcsname}
 
@@ -4075 +4345 @@
 \def\opnr{{\sf\char`\(}\global\advance\parencount by 1 }
 \def\clnr{{\sf\char`\)}\global\advance\parencount by -1 }
-\def\ampnr{\&}
+\let\ampnr = \&
 \def\lbrb{{\bf\char`\[}}
 \def\rbrb{{\bf\char`\]}}
+
+% Active &'s sneak into the index arguments, so make sure it's defined.
+{
+  \catcode`& = 13
+  \global\let& = \ampnr
+}
 
 % First, defname, which formats the header line itself.
@@ -4142 +4418 @@
 \begingroup\obeylines\activeparens\spacesplit{#3{#4}}}
 
-% @deftypemethod has an extra argument that nothing else does.  Sigh.
+% Used for @deftypemethod and @deftypeivar.
 % #1 is the \E... control sequence to end the definition (which we define).
 % #2 is the \...x control sequence for consecutive fns (which we define).
 % #3 is the control sequence to call to resume processing.
-% #4, delimited by the space, is the class name.
+% #4, delimited by a space, is the class name.
 % #5 is the method's return type.
 %
-\def\deftypemethparsebody#1#2#3#4 #5 {\begingroup\inENV %
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2##1 ##2 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}{##2}}}%
-\parindent=0in
-\advance\leftskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup\obeylines\activeparens\spacesplit{#3{#4}{#5}}}
+\def\deftypemethparsebody#1#2#3#4 #5 {\begingroup\inENV
+  \medbreak
+  \def#1{\endgraf\endgroup\medbreak}%
+  \def#2##1 ##2 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}{##2}}}%
+  \parindent=0in
+  \advance\leftskip by \defbodyindent
+  \exdentamount=\defbodyindent
+  \begingroup\obeylines\activeparens\spacesplit{#3{#4}{#5}}}
+
+% Used for @deftypeop.  The change from \deftypemethparsebody is an
+% extra argument at the beginning which is the `category', instead of it
+% being the hardwired string `Method' or `Instance Variable'.  We have
+% to account for this both in the \...x definition and in parsing the
+% input at hand.  Thus also need a control sequence (passed as #5) for
+% the \E... definition to assign the category name to.
+% 
+\def\deftypeopparsebody#1#2#3#4#5 #6 {\begingroup\inENV
+  \medbreak
+  \def#1{\endgraf\endgroup\medbreak}%
+  \def#2##1 ##2 ##3 {%
+    \def#4{##1}%
+    \begingroup\obeylines\activeparens\spacesplit{#3{##2}{##3}}}%
+  \parindent=0in
+  \advance\leftskip by \defbodyindent
+  \exdentamount=\defbodyindent
+  \begingroup\obeylines\activeparens\spacesplit{#3{#5}{#6}}}
 
 \def\defopparsebody #1#2#3#4#5 {\begingroup\inENV %
@@ -4269 +4561 @@
 % Use this to expand the args and terminate the paragraph they make up
 
-\def\defunargs #1{\functionparens \sl
+\def\defunargs#1{\functionparens \sl
 % Expand, preventing hyphenation at `-' chars.
 % Note that groups don't affect changes in \hyphenchar.
-\hyphenchar\tensl=0
+% Set the font temporarily and use \font in case \setfont made \tensl a macro.
+{\tensl\hyphenchar\font=0}%
 #1%
-\hyphenchar\tensl=45
+{\tensl\hyphenchar\font=45}%
 \ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi%
 \interlinepenalty=10000
@@ -4368 +4661 @@
 }
 
-% This definition is run if you use @defunx
-% anywhere other than immediately after a @defun or @defunx.
-
-\def\deffnx #1 {\errmessage{@deffnx in invalid context}}
-\def\defunx #1 {\errmessage{@defunx in invalid context}}
-\def\defmacx #1 {\errmessage{@defmacx in invalid context}}
-\def\defspecx #1 {\errmessage{@defspecx in invalid context}}
-\def\deftypefnx #1 {\errmessage{@deftypefnx in invalid context}}
-\def\deftypemethodx #1 {\errmessage{@deftypemethodx in invalid context}}
-\def\deftypefunx #1 {\errmessage{@deftypefunx in invalid context}}
-
-% @defmethod, and so on
-
 % @defop CATEGORY CLASS OPERATION ARG...
-
+%
 \def\defop #1 {\def\defoptype{#1}%
 \defopparsebody\Edefop\defopx\defopheader\defoptype}
-
-\def\defopheader #1#2#3{%
+%
+\def\defopheader#1#2#3{%
 \dosubind {fn}{\code{#2}}{\putwordon\ #1}% Make entry in function index
-\begingroup\defname {#2}{\defoptype{}\putwordon\ #1}%
+\begingroup\defname {#2}{\defoptype\ \putwordon\ #1}%
 \defunargs {#3}\endgroup %
 }
 
-% @deftypemethod CLASS RETURN-TYPE METHOD ARG...
+% @deftypeop CATEGORY CLASS TYPE OPERATION ARG...
+%
+\def\deftypeop #1 {\def\deftypeopcategory{#1}%
+  \deftypeopparsebody\Edeftypeop\deftypeopx\deftypeopheader
+                       \deftypeopcategory}
+%
+% #1 is the class name, #2 the data type, #3 the operation name, #4 the args.
+\def\deftypeopheader#1#2#3#4{%
+  \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
+  \begingroup
+    \defname{\defheaderxcond#2\relax$$$#3}
+            {\deftypeopcategory\ \putwordon\ \code{#1}}%
+    \deftypefunargs{#4}%
+  \endgroup
+}
+
+% @deftypemethod CLASS TYPE METHOD ARG...
 %
 \def\deftypemethod{%
@@ -4406 +4702 @@
 }
 
+% @deftypeivar CLASS TYPE VARNAME
+%
+\def\deftypeivar{%
+  \deftypemethparsebody\Edeftypeivar\deftypeivarx\deftypeivarheader}
+%
+% #1 is the class name, #2 the data type, #3 the variable name.
+\def\deftypeivarheader#1#2#3{%
+  \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index
+  \begingroup
+    \defname{#3}{\putwordInstanceVariableof\ \code{#1}}%
+    \defvarargs{#3}%
+  \endgroup
+}
+
 % @defmethod == @defop Method
 %
@@ -4430 +4740 @@
 }
 
-% @defivar == @defcv {Instance Variable}
-
+% @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME
+%
 \def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader}
-
-\def\defivarheader #1#2#3{%
-\dosubind {vr}{\code{#2}}{\putwordof\ #1}% Make entry in var index
-\begingroup\defname {#2}{\putwordDefivar\ \putwordof\ #1}%
-\defvarargs {#3}\endgroup %
-}
-
-% These definitions are run if you use @defmethodx, etc.,
-% anywhere other than immediately after a @defmethod, etc.
-
-\def\defopx #1 {\errmessage{@defopx in invalid context}}
-\def\defmethodx #1 {\errmessage{@defmethodx in invalid context}}
-\def\defcvx #1 {\errmessage{@defcvx in invalid context}}
-\def\defivarx #1 {\errmessage{@defivarx in invalid context}}
-
-% Now @defvar
-
+%
+\def\defivarheader#1#2#3{%
+  \dosubind {vr}{\code{#2}}{\putwordof\ #1}% entry in var index
+  \begingroup
+    \defname{#2}{\putwordInstanceVariableof\ #1}%
+    \defvarargs{#3}%
+  \endgroup
+}
+
+% @defvar
 % First, define the processing that is wanted for arguments of @defvar.
 % This is actually simple: just print them in roman.