--- a/configure.in	Mon Apr 10 00:30:48 1995 +0000
+++ b/configure.in	Mon Apr 10 00:34:21 1995 +0000
@@ -21,7 +21,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_REVISION($Revision: 1.108 $)
+AC_REVISION($Revision: 1.109 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -210,25 +210,25 @@
 
 AC_MSG_CHECKING([for npsol])
 if test -f $srcdir/libcruft/npsol/npsol.f; then
-  AC_MSG_RESULT([yes])
+  AC_MSG_RESULT(yes)
 else
-  AC_MSG_RESULT([no])
+  AC_MSG_RESULT(no)
   AC_DEFINE(NPSOL_MISSING, 1)
 fi
 
 AC_MSG_CHECKING([for qpsol])
 if test -f $srcdir/libcruft/qpsol/qpsol.f; then
-  AC_MSG_RESULT([yes])
+  AC_MSG_RESULT(yes)
 else
-  AC_MSG_RESULT([no])
+  AC_MSG_RESULT(no)
   AC_DEFINE(QPSOL_MISSING, 1)
 fi
 
 AC_MSG_CHECKING([for fsqp])
 if test -f $srcdir/libcruft/fsqp/fsqpd.f; then
-  AC_MSG_RESULT([yes])
+  AC_MSG_RESULT(yes)
 else
-  AC_MSG_RESULT([no])
+  AC_MSG_RESULT(no)
   AC_DEFINE(FSQP_MISSING, 1)
 fi
 
@@ -277,18 +277,20 @@
 esac
 
 AC_SUBST(HOST_CXXFLAGS)
+AC_SUBST(CXXFLAGS)
+AC_SUBST(NO_IMPLICIT_TEMPLATES)
 
 ### See what libraries are used by the C++ compiler.  Need this for
 ### dynamic linking.
 
-if test -n "$CXX"; then
+AC_MSG_CHECKING([for C++ libraries])
+AC_CACHE_VAL(octave_cv_cxxlibs,
+[if test -n "$CXX"; then
   export CXX
 fi
-CXXLIBS=`sh $srcdir/cxxlibs.sh`
-AC_MSG_RESULT([defining CXXLIBS to be $CXXLIBS])
-
-AC_SUBST(CXXFLAGS)
-AC_SUBST(NO_IMPLICIT_TEMPLATES)
+octave_cv_cxxlibs=`sh $srcdir/cxxlibs.sh`])
+AC_MSG_RESULT([$octave_cv_cxxlibs])
+CXXLIBS="$octave_cv_cxxlibs"
 AC_SUBST(CXXLIBS)
 
 ### See which C compiler to use (we expect to find gcc).
@@ -351,38 +353,6 @@
 AC_CHECK_SIZEOF(long)
 AC_C_BIGENDIAN
 
-### Try to determine the floating point format.  This could probably
-### be eliminated in favor of run-time checks.
-
-AC_MSG_CHECKING([floating point format])
-changequote(,)dnl
-XCFLAGS=`echo $CFLAGS | sed 's/-O[^ \t]*//'`
-changequote([,])dnl
-${CC-cc} -DDP $XCFLAGS $LDFLAGS $srcdir/float-type.c -o conftest >/dev/null 2>&1
-FLOAT_FORMAT=`./conftest`
-case "$FLOAT_FORMAT" in
-  IEEE_BIG_ENDIAN)
-    AC_MSG_RESULT([IEEE big endian])
-    AC_DEFINE(IEEE_BIG_ENDIAN, 1)
-  ;;
-  IEEE_LITTLE_ENDIAN)
-    AC_MSG_RESULT([IEEE little endian])
-    AC_DEFINE(IEEE_LITTLE_ENDIAN, 1)
-  ;;
-  VAX_D_FLOAT)
-    AC_MSG_RESULT([VAX D floating])
-    AC_DEFINE(VAX_D_FLOAT, 1)
-  ;;
-  VAX_G_FLOAT)
-    AC_MSG_RESULT([VAX G floating])
-    AC_DEFINE(VAX_G_FLOAT, 1)
-  ;;
-  *)
-    AC_MSG_RESULT()
-    AC_MSG_WARN("unrecognized floating point format!")
-  ;;
-esac
-
 ### Does the C compiler handle alloca() and const correctly?
 
 AC_ALLOCA
@@ -422,13 +392,16 @@
     export CC
     tmpdef=`sh $srcdir/f2c-compat.sh $srcdir/flibs.sh`
     status=$?
+    octave_f77_f2c_compat=no
     if test $status -eq 0; then
-      AC_MSG_RESULT([yes])
+      octave_f77_f2c_compat=yes
+    fi
+    AC_MSG_RESULT([$octave_f77_f2c_compat])
+    if test "$octave_f77_f2c_compat" = yes; then
       if test "$tmpdef" = '-DF77_APPEND_UNDERSCORE=1'; then
         AC_DEFINE(F77_APPEND_UNDERSCORE, 1)
       fi
     else
-      AC_MSG_RESULT([no])
       F77=
     fi
   fi
@@ -455,9 +428,12 @@
     FUGLY=-fugly
     AC_MSG_RESULT([defining FUGLY to be $FUGLY])
   fi
-  export F77
-  FLIBS=`sh $srcdir/flibs.sh`
-  AC_MSG_RESULT([defining FLIBS to be $FLIBS])
+  AC_MSG_CHECKING([for Fortran librarires])
+  AC_CACHE_VAL(octave_cv_flibs,
+  [export F77
+  octave_cv_flibs=`sh $srcdir/flibs.sh`])
+  FLIBS="$octave_cv_flibs"
+  AC_MSG_RESULT([$FLIBS])
   DOT_C_FROM_DOT_F_CMD=
   DOT_O_FROM_DOT_F_PAT='.f.o:'
   DOT_O_FROM_DOT_F_CMD='	$(FC) -c $(ALL_FFLAGS) $<'
@@ -642,6 +618,7 @@
 AC_STRUCT_TM
 AC_STRUCT_TIMEZONE
 AC_FUNC_SETVBUF_REVERSED
+
 TERMLIBS=""
 for termlib in termcap terminfo curses termlib ; do
   AC_CHECK_LIB(${termlib}, main, [TERMLIBS="${TERMLIBS} -l${termlib}"])
@@ -652,6 +629,7 @@
     ;;
   esac
 done
+AC_SUBST(TERMLIBS)
 
 AC_MSG_CHECKING([for struct exception in math.h])
 AC_TRY_LINK([#include <math.h>],
@@ -660,8 +638,6 @@
   AC_DEFINE(EXCEPTION_IN_MATH, 1),
   AC_MSG_RESULT(no))
 
-AC_SUBST(TERMLIBS)
-
 ### Signal stuff.
 
 AC_TYPE_SIGNAL
@@ -831,3 +807,30 @@
 define([mdirs], [tmpSA tmpSB tmpSC tmpSD tmpSE tmpSF tmpSG tmpSH tmpSI])dnl
 
 AC_OUTPUT([srcdirs cruftdirs mdirs])
+
+### Print a summary so that important information isn't missed.
+
+CXX_EXTRAS="$HOST_CXXFLAGS $NO_IMPLICIT_TEMPLATES $GCC_IEEE_FP_FLAG"
+
+if test -z "$F77"; then
+  FORT="$F2C $F2CFLAGS"
+else
+  FORT="$F77 $FFLAGS $FUGLY"
+fi
+
+AC_MSG_RESULT([
+
+Octave is now configured for $canonical_host_type
+
+  Source directory:       $srcdir
+  Installation prefix:    $prefix
+  C compiler:             $CC $GCC_IEEE_FP_FLAG $CFLAGS
+  C++ compiler:           $CXX $CXX_EXTRAS $CXXFLAGS
+  Fortran compiler:       $FORT
+  Dynamic Linking:        $use_dld
+  Minimal kernel option:  $lite_kernel
+  Use GNU readline:       $USE_READLINE
+  Use GNU info reader:    $USE_GNU_INFO
+  Default pager:          $DEFAULT_PAGER
+  gnuplot:                $GNUPLOT_BINARY
+])