--- a/Makeconf.in	Tue Nov 30 20:21:19 1993 +0000
+++ b/Makeconf.in	Tue Nov 30 20:21:44 1993 +0000
@@ -10,6 +10,9 @@
 
 #### Start of system configuration section. ####
 
+# The top of the directory tree where the sources live.
+root_srcdir = @root_srcdir@
+
 LEX = @LEX@
 LFLAGS = @LFLAGS@
 LEXLIB = @LEXLIB@
@@ -38,17 +41,35 @@
 
 # cc and associated flags.
 
-INCFLAGS = -I. -I$(srcdir)
+# Clean up INCFLAGS a bit if we are not compiling in a separate
+# directory.
+ifeq ($(srcdir),.)
+  TMP_IF_1 = -I.
+else
+  TMP_IF_1 = -I. -I$(srcdir)
+endif
+ifeq ($(TOPDIR),$(root_srcdir))
+  TMP_IF_2 = -I$(TOPDIR) -I$(TOPDIR)/liboctave
+else
+  TMP_IF_2 = -I$(TOPDIR) -I$(TOPDIR)/liboctave \
+	-I$(root_srcdir) -I$(root_srcdir)/liboctave 
+endif
+INCFLAGS = $(TMP_IF_1) $(TMP_IF_2)
+
 LIBFLAGS = -L$(TOPDIR)
+
 DEFS = @DEFS@
+UGLY_DEFS = @UGLY_DEFS@
 
 CC = @CC@
 CFLAGS = @CFLAGS@
 ALL_CFLAGS = $(INCFLAGS) $(DEFS) $(CFLAGS)
+UGLY_ALL_CFLAGS = $(INCFLAGS) $(UGLY_DEFS) $(CFLAGS)
 
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 ALL_CXXFLAGS = $(INCFLAGS) $(DEFS) $(CXXFLAGS)
+UGLY_ALL_CXXFLAGS = $(INCFLAGS) $(UGLY_DEFS) $(CXXFLAGS)
 
 LDFLAGS = @LDFLAGS@
 ALL_LDFLAGS = $(LIBFLAGS) $(LDFLAGS)

--- a/configure.in	Tue Nov 30 20:21:19 1993 +0000
+++ b/configure.in	Tue Nov 30 20:21:44 1993 +0000
@@ -1,6 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_INIT([[src]]/octave.cc)dnl
+AC_CONFIG_HEADER(config.h)dnl
+
+root_srcdir=$srcdir
+AC_SUBST(root_srcdir)dnl
+
+AC_DEFINE(OCTAVE_SOURCE, 1)dnl
 
 # See if we were given the target host type.  If not, guess.
 
@@ -45,7 +51,7 @@
   DLD_DIR=dld
   LIBDLD='../libdld.a'
   DLD_OBJECTS= : # don't link them in if doing dynamic linking
-  DEFS="$DEFS -DWITH_DLD=1"
+  AC_DEFINE(WITH_DLD, 1)dnl
   LD_STATIC_FLAG=-static
 fi
 AC_SUBST(DYNAMIC_LD_OBJ)dnl
@@ -58,21 +64,21 @@
 if test -f $srcdir/libcruft/npsol/npsol.f; then
   :
 else
-  DEFS="$DEFS -DNPSOL_MISSING=1"
+  AC_DEFINE(NPSOL_MISSING, 1)dnl
 fi
 
 echo "checking for qpsol"
 if test -f $srcdir/libcruft/qpsol/qpsol.f; then
   :
 else
-  DEFS="$DEFS -DQPSOL_MISSING=1"
+  AC_DEFINE(QPSOL_MISSING, 1)dnl
 fi
 
 echo "checking for fsqp"
 if test -f $srcdir/libcruft/fsqp/fsqpd.f; then
   :
 else
-  DEFS="$DEFS -DFSQP_MISSING=1"
+  AC_DEFINE(FSQP_MISSING, 1)dnl
 fi
 
 AC_PROG_CC
@@ -124,6 +130,10 @@
          you should probably consider getting version 2.x
 EOF
       ;;
+    2.5.*|2.6.*|2.7.*|2.8.*|2.9.*)
+      CXXFLAGS="$CXXFLAGS -fexternal-templates"
+      AC_DEFINE(USE_EXTERNAL_TEMPLATES, 1)dnl
+      ;;
     esac
 else
   cat << EOF
@@ -162,7 +172,7 @@
     status=$?
     if test $status -eq 0; then
       if test "$tmpdef" = '-DF77_APPEND_UNDERSCORE=1'; then
-        DEFS="$DEFS $tmpdef"
+        AC_DEFINE(F77_APPEND_UNDERSCORE, 1)dnl
       fi
     else
       F77=
@@ -210,7 +220,7 @@
 \%.c : \%.f\
 	cat $< | $(F2C) $(F2CFLAGS) > $(@F)'
   DEFAULT_DOT_O_FROM_DOT_F='\%.o : \%.f'
-  DEFS="$DEFS -DF77_APPEND_UNDERSCORE=1"
+  AC_DEFINE(F77_APPEND_UNDERSCORE, 1)dnl
 else
   cat << EOF
 warning: in order to build octave, you must have a compatible
@@ -293,9 +303,9 @@
 esac
 AC_SUBST(VOID_SIGHANDLER)dnl
 
-AC_HEADER_CHECK(termios.h, DEFS="$DEFS -DHAVE_TERMIOS_H=1",
-  AC_HEADER_CHECK(termio.h, DEFS="$DEFS -DHAVE_TERMIO_H=1",
-    AC_HEADER_CHECK(sgtty.h, DEFS="$DEFS -DHAVE_SGTTY_H=1", [])))dnl
+AC_HEADER_CHECK(termios.h, AC_DEFINE(HAVE_TERMIOS_H, 1),
+  AC_HEADER_CHECK(termio.h, AC_DEFINE(HAVE_TERMIO_H, 1),
+    AC_HEADER_CHECK(sgtty.h, AC_DEFINE(HAVE_SGTTY_H, 1), [])))dnl
 case "$DEFS" in
   *HAVE_TERMIOS_H* | *HAVE_TERMIO_H* | *HAVE_SGTTY_H*)
   ;;
@@ -335,13 +345,13 @@
   do
     case "$func" in
       *acosh.o*)
-	DEFS="$DEFS -DACOSH_MISSING=1"
+	AC_DEFINE(ACOSH_MISSING, 1)dnl
 	;;
       *asinh.o*)
-	DEFS="$DEFS -DASINH_MISSING=1"
+	AC_DEFINE(ASINH_MISSING, 1)dnl
 	;;
       *atanh.o*)
-	DEFS="$DEFS -DATANH_MISSING=1"
+	AC_DEFINE(ATANH_MISSING, 1)dnl
 	;;
     esac
   done
@@ -407,6 +417,9 @@
 fi
 AC_SUBST(RUNTEST)dnl
 
+UGLY_DEFS="$DEFS"
+AC_SUBST(UGLY_DEFS)dnl
+
 define([tmpa], [libcruft/blas/Makefile libcruft/balgen/Makefile])dnl
 define([tmpb], [libcruft/dassl/Makefile libcruft/eispack/Makefile])dnl
 define([tmpc], [libcruft/fftpack/Makefile libcruft/fsqp/Makefile])dnl

--- a/octMakefile.in	Tue Nov 30 20:21:19 1993 +0000
+++ b/octMakefile.in	Tue Nov 30 20:21:44 1993 +0000
@@ -16,7 +16,8 @@
 DISTFILES = COPYING ChangeLog Makefile.in Makeconf.in NEWS README \
 	README.NLP THANKS INSTALL INSTALL.OCTAVE BUGS PLOTTING \
 	PROJECTS f2c-compat.sh flibs.sh configure configure.in \
-	config.guess octave.sh octave-mode.el doinstall.sh mkpath.c
+	config.guess octave.sh octave-mode.el doinstall.sh mkpath.c \
+	config.h.in acconfig.h
 
 # Complete directory trees to distribute.
 DISTDIRS = bsd-math dld