(edt-lk201-revision): Deleted.

[bpt/emacs.git] / configure.in

diff --git a/configure.in b/configure.in
index 450093c..06c8ebe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -283,7 +283,11 @@ case "${canonical}" in
     fi
   ;;
   m88k-motorola-sysv4* )
-    machine=delta88k opsys=usg5-4
+    # jbotte@bnr.ca says that UNIX_System_V <hostName> 4.0 R40V4.3 m88k mc88110
+    # needs POSIX_SIGNALS and therefore needs usg5-4-2.
+    # I hope there are not other 4.0 versions for this machine
+    # which really need usg5-4 instead.
+    machine=delta88k opsys=usg5-4-2
   ;;
   m88k-motorola-sysv* | m88k-motorola-m88kbcs* )
     machine=delta88k opsys=usg5-3
@@ -470,7 +474,7 @@ case "${canonical}" in
   ## Unspecified sysv on an ncr machine defaults to svr4.2.
   ## (Plain usg5-4 doesn't turn on POSIX signals, which we need.)
   i[345]86-ncr-sysv* )
-    machine=intel386 opsys=usg5-4-2
+    machine=ncr386 opsys=usg5-4-2
   ;;
 
   ## Intel Paragon OSF/1
@@ -592,6 +596,9 @@ case "${canonical}" in
   mips-sgi-irix4* )
     machine=iris4d opsys=irix4-0
   ;;
+  mips-sgi-irix6* )
+    machine=iris4d opsys=irix6-0
+  ;;
   mips-sgi-irix5.[01]* )
     machine=iris4d opsys=irix5-0
   ;;
@@ -1213,7 +1220,7 @@ AC_SUBST(machfile)
 AC_SUBST(opsysfile)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}")
-AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${config_options}")
+AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}")
 AC_DEFINE_UNQUOTED(config_machfile,  "${machfile}")
 AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}")
 AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
@@ -1327,4 +1334,10 @@ echo creating src/Makefile
   chmod 444 Makefile.new
   mv -f Makefile.new Makefile
 )
+
+if test ! -f src/.gdbinit && test -f $top_srcdir/src/.gdbinit; then
+  echo creating src/.gdbinit
+  echo source $top_srcdir/src/.gdbinit > src/.gdbinit
+fi
+
 ], [CPP="$CPP" CPPFLAGS="$CPPFLAGS"])