X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/252c8b3bc05547c889eb926e19b64729612fa3de..c8cdcb16ad52a122fc28fa4ddc3a62e1e0654e22:/configure1.in

diff --git a/configure1.in b/configure1.in
index b949da92ab..57f0bd597c 100755
--- a/configure1.in
+++ b/configure1.in
@@ -33,7 +33,6 @@ dnl explaining how to rebuild it.
 ### along with GNU Emacs; see the file COPYING.  If not, write to
 ### the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
 ### Since Emacs has configuration requirements that autoconf can't
 ### meet, this file is an unholy marriage of custom-baked
 ### configuration code and autoconf macros.
@@ -48,7 +47,6 @@ dnl explaining how to rebuild it.
 ### If configure fails after disturbing the status quo,
 ### 	config.status is removed.
 
-
 ### Remove any more than one leading "." element from the path name.
 ### If we don't remove them, then another "./" will be prepended to
 ### the file name each time we use config.status, and the program name
@@ -64,6 +62,32 @@ dnl explaining how to rebuild it.
 progname="`echo $0 | sed 's:^\./\./:\./:'`"
 
 
+### Establish some default values.
+run_in_place=
+single_tree=
+prefix='/usr/local'
+exec_prefix='${prefix}'
+bindir='${exec_prefix}/bin'
+datadir='${prefix}/lib'
+statedir='${prefix}/lib'
+libdir='${exec_prefix}/lib'
+mandir='${prefix}/man/man1'
+infodir='${prefix}/info'
+lispdir='${datadir}/emacs/${version}/lisp'
+locallisppath='${datadir}/emacs/site-lisp'
+lisppath='${locallisppath}:${lispdir}'
+etcdir='${datadir}/emacs/${version}/etc'
+lockdir='${statedir}/emacs/lock'
+archlibdir='${libdir}/emacs/${version}/${configuration}'
+CC=
+
+# We cannot use this variable in the case statement below, because many
+# /bin/sh's have broken semantics for "case".  Unfortunately, you must
+# actually edit the clause itself.
+# path_options="prefix | exec_prefix | bindir | libdir | etcdir | datadir"
+# path_options="$path_options | archlibdir | statedir | mandir | infodir"
+# path_options="$path_options | lispdir | lockdir | lisppath | locallisppath"
+
 #### Usage messages.
 
 short_usage="Usage: ${progname} CONFIGURATION [-OPTION[=VALUE] ...]
@@ -78,8 +102,20 @@ CONFIGURATION specifies the machine and operating system to build for.
 --with-gcc=no		Don't use GCC to compile Emacs.
 --run-in-place		Use libraries and data files directly out of the 
 			source tree.
---srcdir=DIR		Look for source in DIR.
---prefix=DIR		Install files below dir.
+--single-tree=DIR	Has the effect of creating a directory tree at DIR
+			which looks like:
+			  .../DIR/bin/CONFIGNAME (emacs, etags, etc.)
+			  .../DIR/bin/CONFIGNAME/etc (movemail, etc.)
+			  .../DIR/common/lisp  (emacs' lisp files)
+			  .../DIR/common/site-lisp (local lisp files)
+			  .../DIR/common/lib (DOC, TUTORIAL, etc.)
+			  .../DIR/common/lock (lockfiles)
+--srcdir=DIR		Look for the Emacs source files in DIR.
+--prefix=DIR		Install files below DIR. Defaults to \`${prefix}'.
+
+You may also specify any of the \`path' variables found in Makefile.in,
+including --bindir, --libdir, --etcdir, --infodir, and so on.  This allows
+you to override a single default location when configuring.
 
 If successful, ${progname} leaves its status in config.status.  If
 unsuccessful after disturbing the status quo, it removes config.status."
@@ -90,23 +126,26 @@ unsuccessful after disturbing the status quo, it removes config.status."
 ### Record all the arguments, so we can save them in config.status.
 arguments="$@"
 
-### These values are used to comment and uncomment different values
-### for the path variables in the Makefile, to choose the installed
-### configuration or the run-in-place configuration.
-rip_paths='#disabled# '
-inst_paths=''
-
-### Establish some default values.
-prefix='/usr/local'
-exec_prefix='${prefix}'
+### Shell Magic: Quote the quoted arguments in ARGUMENTS.  At a later date,
+### in order to get the arguments back in $@, we have to do an
+###  `eval set x "$quoted_arguments"; shift'.
+quoted_arguments=
+for i in "$@"; do
+   quoted_arguments="$quoted_arguments '$i'"
+done
 
+### Don't use shift -- that destroys the argument list, which autoconf needs
+### to produce config.status.  It turns out that "set - ${arguments}" doesn't
+### work portably.
+### However, it also turns out that many shells cannot expand ${10} at all.
+### So using an index variable doesn't work either.  It is possible to use
+### some shell magic to make 'set x "$arguments"; shift' work portably.
 while [ $# != 0 ]; do
-  arg="$1"
+  arg="$1"; shift
   case "${arg}" in
 
     ## Anything starting with a hyphen we assume is an option.
     -* )
-
       ## Separate the switch name from the value it's being given.
       case "${arg}" in
         -*=*)
@@ -168,13 +207,13 @@ Set it to either \`yes' or \`no'."
 	  ## If the value was omitted, get it from the next argument.
 	  if [ "${valomitted}" = "yes" ]; then
 	    ## Get the next argument from the argument list, if there is one.
-            if [ $# = 1 ]; then
+            if [ $# = 0 ]; then
 	      (echo "${progname}: You must give a value for the \`--${optname}' option, as in
     \`--${optname}=FOO'."
 	       echo "${short_usage}") >&2
 	      exit 1
 	    fi
-	    shift; val="$1"
+	    val="$1"; shift
 	  fi
           srcdir="${val}"
 	;;
@@ -187,74 +226,76 @@ Set it to either \`yes' or \`no'."
 	  ## If the value was omitted, get it from the next argument.
 	  if [ "${valomitted}" = "yes" ]; then
 	    ## Get the next argument from the argument list, if there is one.
-            if [ $# = 1 ]; then
+            if [ $# = 0 ]; then
 	      (echo "${progname}: You must give a value for the \`--${optname}' option, as in
-    \`--${optname}=FOO'."
+    \`--${optname}=/usr/local/X11/include'."
 	       echo "${short_usage}") >&2
 	      exit 1
 	    fi
-	    shift; val="$1"
+            val="$1"; shift
 	  fi
 	  x_includes="${val}"
-	  C_SWITCH_X_SITE="-I${x_includes}"
         ;;
 	"x_libraries" )
 	  ## If the value was omitted, get it from the next argument.
 	  if [ "${valomitted}" = "yes" ]; then
 	    ## Get the next argument from the argument list, if there is one.
-            if [ $# = 1 ]; then
+            if [ $# = 0 ]; then
 	      (echo "${progname}: You must give a value for the \`--${optname}' option, as in
-    \`--${optname}=FOO'."
+    \`--${optname}=/usr/local/X11/lib'."
 	       echo "${short_usage}") >&2
 	      exit 1
 	    fi
-	    shift; val="$1"
+            val="$1"; shift
 	  fi
 	  x_libraries="${val}"
-	  LD_SWITCH_X_SITE="-L${x_libraries}"
         ;;
 
 	## Should this use the "development configuration"?
 	"run_in_place" )
-	  rip_paths=''
-	  inst_paths='#disabled# '
+	  single_tree=
+	  run_in_place=1
 	;;
 
-	## Has the user specifiec an installation prefix?
-	"prefix" )
-	  ## If the value was omitted, get it from the next argument.
-	  if [ "${valomitted}" = "yes" ]; then
-	    ## Get the next argument from the argument list, if there is one.
-            if [ $# = 1 ]; then
-	      (echo "${progname}: You must give a value for the \`--${optname}' option, as in
-    \`--${optname}=FOO'."
-	       echo "${short_usage}") >&2
-	      exit 1
-	    fi
-	    shift; val="$1"
-	  fi
-	  prefix="${val}"
-        ;;
+        ## Should this use the "single tree" configuration?
+	"single_tree" )
+	   run_in_place=
+	   single_tree=1
+	;;
 
-	## Has the user specifiec an installation prefix?
-	"exec_prefix" )
-	  ## If the value was omitted, get it from the next argument.
-	  if [ "${valomitted}" = "yes" ]; then
-	    ## Get the next argument from the argument list, if there is one.
-            if [ $# = 1 ]; then
-	      (echo "${progname}: You must give a value for the \`--${optname}' option, as in
-    \`--${optname}=FOO'."
-	       echo "${short_usage}") >&2
-	      exit 1
-	    fi
-	    shift; val="$1"
-	  fi
-	  exec_prefix="${val}"
-        ;;
+	## Has the user specified one of the path options?
+	prefix | exec_prefix | bindir | libdir | etcdir | datadir | \
+	archlibdir | statedir | mandir | infodir | lispdir | lockdir | \
+	lisppath | locallisppath )
+	   ## If the value was omitted, get it from the next argument.
+	   if [ "${valomitted}" = "yes" ]; then
+	      if [ $# = 0 ]; then
+		 (echo \
+"$progname: You must give a value for the \`--${optname}' option,";
+		  echo \
+"as in \`--${optname}=`eval echo '$'$optname`.'"
+		  echo "$short_usage") >&2
+		 exit 1
+	      fi
+	      val="$1"; shift
+	   fi
+	   eval "${opt}=\"${val}\""
+	   eval "${opt}_specified=1"
+	;;
+
+	## Verbose flag, tested by autoconf macros.
+	"verbose" )
+	  verbose=yes
+	;;
 
 	## Has the user asked for some help?
 	"usage" | "help" )
-	  echo "${short_usage}" | more
+	  if [ "x$PAGER" = x ]
+	  then
+	    echo "${short_usage}" | more
+	  else
+	    echo "${short_usage}" | $PAGER
+	  fi
 	  exit
 	;;
 
@@ -269,16 +310,24 @@ Set it to either \`yes' or \`no'."
     ;;
 
   esac
-  shift
 done
 
+### Get the arguments back.  See the diatribe on Shell Magic above.
+eval set x "$quoted_arguments"; shift
+
 if [ "${configuration}" = "" ]; then
-  (echo "${progname}: You must specify a configuration name as an argument."
-   echo "${short_usage}") >&2
-  exit 1
+  echo '- You did not tell me what kind of host system you want to configure.
+- I will attempt to guess the kind of system this is.' 1>&2
+  guesssys=`echo ${progname} | sed 's/configure$/config.guess/'`
+  if configuration=`${guesssys}` ; then
+    echo "- Looks like this is a ${configuration}" 1>&2
+  else
+    echo '- Failed to guess the system type.  You need to tell me.' 1>&2
+    echo "${short_usage}" >&2
+    exit 1
+  fi
 fi
 
-
 #### Decide where the source is.
 case "${srcdir}" in
 
@@ -286,13 +335,13 @@ case "${srcdir}" in
   "" )
     confdir=`echo $0 | sed 's|//|/|' | sed 's|/[^/]*$||'`
     if [ -f $confdir/src/lisp.h -a -f $confdir/lisp/version.el ]; then
-      srcdir=`(cd $confdir ; pwd)`
+      srcdir="${confdir}"
     else
       if [ -f "./src/lisp.h" -a -f "./lisp/version.el" ]; then
-        srcdir=`pwd`
+        srcdir='.'
       else
         if [ -f "../src/lisp.h" -a -f "../lisp/version.el" ]; then
-	  srcdir=`(cd .. ; pwd)`
+	  srcdir='..'
         else
 	  (echo "\
 ${progname}: Neither the current directory nor its parent seem to
@@ -309,7 +358,6 @@ sources may be found."
 
   ## Otherwise, check if the directory they specified is okay.
   * )
-    srcdir=`(cd ${srcdir}; pwd)`
     if [ ! -d "${srcdir}" -o ! -f "${srcdir}/src/lisp.h" -o ! -f "${srcdir}/lisp/version.el" ]; then
       (echo "\
 ${progname}: The directory specified with the \`--srcdir' option,
@@ -321,32 +369,56 @@ are."
       exit 1
     fi
   ;;
+esac
 
+#### Make srcdir absolute, if it isn't already.  It's important to
+#### avoid running the path through pwd unnecessary, since pwd can
+#### give you automounter prefixes, which can go away.
+case "${srcdir}" in
+  /* ) ;;
+  . )
+    ## We may be able to use the $PWD environment variable to make this
+    ## absolute.  But sometimes PWD is inaccurate.
+    if [ "${PWD}" != "" ] && [ "`(cd ${PWD} ; sh -c pwd)`" = "`pwd`" ] ; then
+      srcdir="$PWD"
+    else
+      srcdir="`(cd ${srcdir}; pwd)`"
+    fi
+  ;;
+  *  ) srcdir="`(cd ${srcdir}; pwd)`" ;;
 esac
 
-### Make the necessary directories, if they don't exist.
-if [ ! -d ./src ]; then
-  mkdir ./src
-fi
-if [ ! -d ./lib-src ]; then
-  mkdir ./lib-src
-fi
-if [ ! -d ./cpp ]; then
-  mkdir ./cpp
-fi
-if [ ! -d ./oldXMenu ]; then
-  mkdir ./oldXMenu
-fi
-if [ ! -d ./etc ]; then
-  mkdir ./etc
+#### Check if the source directory already has a configured system in it.
+if [ `pwd` != `(cd ${srcdir} && pwd)` ] \
+   && [ -f "${srcdir}/src/config.h" ] ; then
+  (echo "${progname}: WARNING: The directory tree \`${srcdir}' is being used"
+   echo "   as a build directory right now; it has been configured in its own"
+   echo "   right.  To configure in another directory as well, you MUST"
+   echo "   use GNU make.  If you do not have GNU make, then you must"
+   echo "   now do \`make distclean' in ${srcdir},"
+   echo "   and then run ${progname} again.") >&2
+  extrasub='/^VPATH[	 ]*=/c\
+vpath %.c $(srcdir)\
+vpath %.h $(srcdir)\
+vpath %.y $(srcdir)\
+vpath %.l $(srcdir)\
+vpath %.s $(srcdir)\
+vpath %.in $(srcdir)'
 fi
 
+### Make the necessary directories, if they don't exist.
+for dir in ./src ./lib-src ./cpp ./oldXMenu ./etc ; do
+  if [ ! -d ${dir} ]; then
+    mkdir ${dir}
+  fi
+done
+
 #### Given the configuration name, set machfile and opsysfile to the
 #### names of the m/*.h and s/*.h files we should use.
 
 ### Canonicalize the configuration name.
 echo "Checking the configuration name."
-if configuration=`${srcdir}/config.sub "${configuration}"` ; then : ; else
+if canonical=`${srcdir}/config.sub "${configuration}"` ; then : ; else
   exit $?
 fi
 
@@ -374,7 +446,7 @@ fi
 ### confusion between `system' and `release' levels'."
 
 machine='' opsys='' unported='false'
-case "${configuration}" in
+case "${canonical}" in
 
   ## Alliant machines
   ## Strictly speaking, we need the version of the alliant operating
@@ -414,8 +486,13 @@ case "${configuration}" in
     machine=7300 opsys=usg5-2-2
   ;;
 
+  ## Bull dpx2
+  m68*-bull-sysv3* )
+    machine=dpx2 opsys=usg5-3
+  ;;
+
   ## Bull sps7
-  m68*-bull-sysv* )
+  m68*-bull-sysv2* )
     machine=sps7 opsys=usg5-2
   ;;
 
@@ -453,8 +530,13 @@ case "${configuration}" in
     machine=cydra5 opsys=usg5-3
   ;;
 
+  ## Data General AViiON Machines
+  m88k-dg-dgux* )
+    machine=aviion opsys=dgux
+  ;;
+
   ## DECstations
-  mips-dec-ultrix[0-3].* | mips-dec-ultrix4.0 | mips-dec-bsd4.2 )
+  mips-dec-ultrix[0-3].* | mips-dec-ultrix4.0* | mips-dec-bsd4.2* )
     machine=pmax opsys=bsd4-2
   ;;
   mips-dec-ultrix* | mips-dec-bsd* )
@@ -468,6 +550,9 @@ case "${configuration}" in
   m68*-motorola-sysv* )
     machine=delta opsys=usg5-3
   ;;
+  m88k-motorola-sysv4* )
+    machine=delta88k opsys=usg5-4
+  ;;
   m88k-motorola-sysv* | m88k-motorola-m88kbcs* )
     machine=delta88k opsys=usg5-3
   ;;
@@ -493,10 +578,10 @@ case "${configuration}" in
   ## The GEC 93 - apparently, this port isn't really finished yet.
 
   ## Gould Power Node and NP1
-  pn-gould-bsd4.2 )
+  pn-gould-bsd4.2* )
     machine=gould opsys=bsd4-2
   ;;
-  pn-gould-bsd4.3 )
+  pn-gould-bsd4.3* )
     machine=gould opsys=bsd4-3
   ;;
   np1-gould-bsd* )
@@ -512,23 +597,41 @@ case "${configuration}" in
   m68*-hp-bsd* )
     machine=hp9000s300 opsys=bsd4-3
   ;;
-  ## HP/UX 8 doesn't run on these machines, so use HP/UX 7.
+  m68*-hp-netbsd* )
+    machine=hp9000s300 opsys=netbsd
+  ;;
+  ## HP/UX 7, 8 and 9 are supported on these machines.
   m68*-hp-hpux* )
-    machine=hp9000s300 opsys=hpux
+    case "`uname -r`" in
+      ## Someone's system reports A.B8.05 for this.
+      ## I wonder what other possibilities there are.
+      *.B8.* ) machine=hp9000s300 opsys=hpux8 ;;
+      *.08.* ) machine=hp9000s300 opsys=hpux8 ;;
+      *.09.* ) machine=hp9000s300 opsys=hpux9 ;;
+      *) machine=hp9000s300 opsys=hpux ;;
+    esac
   ;;
 
   ## HP 9000 series 700 and 800, running HP/UX
-  hppa1.0-hp-hpux* )
+  hppa*-hp-hpux7* )
     machine=hp9000s800 opsys=hpux
   ;;
-  hppa1.1-hp-hpux* )
+  hppa*-hp-hpux8* )
     machine=hp9000s800 opsys=hpux8
   ;;
+  hppa*-hp-hpux9* )
+    machine=hp9000s800 opsys=hpux9
+  ;;
+
+  ## HP 9000 series 700 and 800, running HP/UX
   hppa*-hp-hpux* )
     ## Cross-compilation?  Nah!
     case "`uname -r`" in
-      *.08.* ) machine=hp9000s800 opsys=hpux ;;
-      *.09.* ) machine=hp9000s800 opsys=hpux8 ;;
+      ## Someone's system reports A.B8.05 for this.
+      ## I wonder what other possibilities there are.
+      *.B8.* ) machine=hp9000s800 opsys=hpux8 ;;
+      *.08.* ) machine=hp9000s800 opsys=hpux8 ;;
+      *.09.* ) machine=hp9000s800 opsys=hpux9 ;;
       *) machine=hp9000s800 opsys=hpux ;;
     esac
   ;;
@@ -542,30 +645,48 @@ case "${configuration}" in
   ;;
 
   ## IBM machines
-  i386-ibm-aix1.1 )
+  i386-ibm-aix1.1* )
     machine=ibmps2-aix opsys=usg5-2-2
   ;;
-  i386-ibm-aix1.2 )
+  i386-ibm-aix1.[23]* | i386-ibm-aix* )
     machine=ibmps2-aix opsys=usg5-3
   ;;
-  rs6000-ibm-aix3.1 )
+  i370-ibm-aix*)
+    machine=ibm370aix opsys=usg5-3
+  ;;
+  rs6000-ibm-aix3.1* )
     machine=ibmrs6000 opsys=aix3-1
   ;;
-  rs6000-ibm-aix3.2 | rs6000-ibm-aix* )
+  rs6000-ibm-aix3.2* | rs6000-ibm-aix* )
     machine=ibmrs6000 opsys=aix3-2
   ;;
-  romp-ibm-bsd* )
+  romp-ibm-bsd4.3* )
+    machine=ibmrt opsys=bsd4-3
+  ;;	
+  romp-ibm-bsd4.2* )
     machine=ibmrt opsys=bsd4-2
   ;;
+  romp-ibm-aos4.3* )
+    machine=ibmrt opsys=bsd4-3
+  ;;	
+  romp-ibm-aos4.2* )
+    machine=ibmrt opsys=bsd4-2
+  ;;
+  romp-ibm-aos* )
+    machine=ibmrt opsys=bsd4-3
+  ;;
+  romp-ibm-bsd* )
+    machine=ibmrt opsys=bsd4-3
+  ;;
   romp-ibm-aix* )
     machine=ibmrt-aix opsys=usg5-2-2
   ;;
 
   ## Integrated Solutions `Optimum V'
-  m68*-isi-bsd4.2 )
+  m68*-isi-bsd4.2* )
     machine=isi-ov opsys=bsd4-2
   ;;
-  m68*-isi-bsd4.3 )
+  m68*-isi-bsd4.3* )
     machine=isi-ov opsys=bsd4-3
   ;;
 
@@ -573,45 +694,48 @@ case "${configuration}" in
   i[34]86-intsys-sysv* )
     machine=is386 opsys=usg5-2-2
   ;;
-  ## Intel 386 machines where we don't care about the manufacturer
-  i[34]86-unknown-* )
-    machine=intel386
-    case "${configuration}" in
-      *-isc1.* | *-isc2.[01]* )	opsys=386-ix ;;
-      *-isc2.2 )		opsys=isc2-2 ;;
-      *-isc* )			opsys=isc3-0 ;;
-      *-esix5* )		opsys=esix5r4 ;;
-      *-esix* )			opsys=esix ;;
-      *-xenix* )		opsys=xenix ;;
-      *-linux* )		opsys=linux ;;
-      *-sco3.2v4* )		opsys=sco4 ;;
-      ## Otherwise, we'll fall through to the generic opsys code at the bottom.
-    esac
+
+  ## Prime EXL
+  i386-prime-sysv* )
+    machine=i386 opsys=usg5-3
+  ;;
+
+  ## Sequent Symmetry
+  i386-sequent-bsd* )
+    machine=symmetry opsys=bsd4-3
+  ;;
+
+  ## Unspecified sysv on an ncr machine defaults to svr4.
+  i[34]86-ncr-sysv* )
+    machine=intel386 opsys=usg5-4
   ;;
 
   ## Intel 860
-  i860-*-sysvr4 )
+  i860-*-sysv4* )
     machine=i860 opsys=usg5-4
   ;;
 
   ## Silicon Graphics machines
   ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030)
-  m68*-sgi-iris3.5 )
+  m68*-sgi-iris3.5* )
     machine=irist opsys=iris3-5
   ;;
-  m68*-sgi-iris3.6 | m68*-sgi-iris*)
+  m68*-sgi-iris3.6* | m68*-sgi-iris*)
     machine=irist opsys=iris3-6
   ;;
   ## Iris 4D
   mips-sgi-irix3.* )
     machine=iris4d opsys=irix3-3
   ;;
+  mips-sgi-irix5.* )
+    machine=iris4d opsys=irix5-0
+  ;;
   mips-sgi-irix4.* | mips-sgi-irix* )
     machine=iris4d opsys=irix4-0
   ;;
 
   ## Masscomp machines
-  m68*-masscomp-rtu )
+  m68*-masscomp-rtu* )
     machine=masscomp opsys=rtu
   ;;
 
@@ -631,8 +755,13 @@ case "${configuration}" in
   ## the BSD world."  I'll assume that these are instructions for
   ## handling two odd situations, and that every other situation
   ## should use mips.h and usg5-2-2, they being listed first.
+  mips-mips-usg* )
+    machine=mips4
+    ## Fall through to the general code at the bottom to decide on the OS.
+  ;;
   mips-mips-riscos4* )
-    machine=mips4 opsys=usg5-2-2
+    machine=mips4 opsys=bsd4-3
+    NON_GNU_CC="cc -systype bsd43"
   ;;
   mips-mips-bsd* )
     machine=mips opsys=bsd4-3
@@ -642,7 +771,7 @@ case "${configuration}" in
   ;;
 
   ## NeXT
-  m68*-next-mach* | m68*-next-bsd* )
+  m68*-next-* )
     machine=next opsys=mach2
   ;;
 
@@ -674,11 +803,6 @@ case "${configuration}" in
     machine=plexus opsys=usg5-2
   ;;
 
-  ## Prime EXL
-  i386-prime-sysv* )
-    machine=i386 opsys=usg5-3
-  ;;
-
   ## Pyramid machines
   ## I don't really have any idea what sort of processor the Pyramid has,
   ## so I'm assuming it is its own architecture.
@@ -687,22 +811,21 @@ case "${configuration}" in
   ;;
 
   ## Sequent Balance
-  ns32k-sequent-bsd4.2 )
+  ns32k-sequent-bsd4.2* )
     machine=sequent opsys=bsd4-2
   ;;
-  ns32k-sequent-bsd4.3 )
+  ns32k-sequent-bsd4.3* )
     machine=sequent opsys=bsd4-3
   ;;
-  ## Sequent Symmetry
-  i386-sequent-bsd* )
-    machine=symmetry opsys=bsd4-3
-  ;;
 
   ## SONY machines
-  m68*-sony-bsd4.2 )
+  m68*-sony-bsd4.2* )
     machine=news opsys=bsd4-2
   ;;
-  m68*-sony-bsd4.3 )
+  m68*-sony-bsd4.3* )
+    machine=news opsys=bsd4-3
+  ;;
+  m68*-sony-newsos3*)
     machine=news opsys=bsd4-3
   ;;
   mips-sony-bsd* )
@@ -716,7 +839,7 @@ case "${configuration}" in
 
   ## Suns
   *-sun-sunos* | *-sun-bsd* | *-sun-solaris* )
-    case "${configuration}" in
+    case "${canonical}" in
       m68*-sunos1* )	machine=sun1 ;;
       m68*-sunos2* )	machine=sun2 ;;
       m68* )		machine=sun3 ;;
@@ -724,11 +847,20 @@ case "${configuration}" in
       sparc* )		machine=sparc ;;
       * )		unported=true ;;
     esac
-    case "${configuration}" in
+    case "${canonical}" in
+      ## The Sun386 didn't get past 4.0.
+      i386-*-sunos4	  ) opsys=sunos4-0 ;;
       *-sunos4.0*	  ) opsys=sunos4-0 ;;
       *-sunos4.1.3*	  ) opsys=sunos4-1-3 ;;
       *-sunos4* | *-sunos ) opsys=sunos4-1 ;;
-      *-sunos5* | *-solaris* ) opsys=sol2 ;;
+      *-sunos5.3* | *-solaris2.3* )
+		opsys=sol2-3
+		NON_GNU_CPP=/usr/ccs/lib/cpp
+		;;
+      *-sunos5* | *-solaris* )
+		opsys=sol2
+		NON_GNU_CPP=/usr/ccs/lib/cpp
+		;;
       *			  ) opsys=bsd4-2   ;;
     esac
   ;;
@@ -739,10 +871,10 @@ case "${configuration}" in
   ;;
 
   ## Tahoe machines
-  tahoe-tahoe-bsd4.2 )
+  tahoe-tahoe-bsd4.2* )
     machine=tahoe opsys=bsd4-2
   ;;
-  tahoe-tahoe-bsd4.3 )
+  tahoe-tahoe-bsd4.3* )
     machine=tahoe opsys=bsd4-3
   ;;
 
@@ -751,6 +883,11 @@ case "${configuration}" in
     machine=tandem-s2 opsys=usg5-3
   ;;
 
+  ## Tektronix XD88
+  m88k-tektronix-sysv3* )
+  machine=tekxd88 opsys=usg5-3
+  ;;
+
   ## Tektronix 16000 box (6130?)
   ns16k-tektronix-bsd* )
     machine=ns16000 opsys=bsd4-2
@@ -758,7 +895,7 @@ case "${configuration}" in
   ## Tektronix 4300
   ## src/m/tek4300.h hints that this is a m68k machine.
   m68*-tektronix-bsd* )
-    machine=tex4300 opsys=bsd4-3
+    machine=tek4300 opsys=bsd4-3
   ;;
 
   ## Titan P2 or P3
@@ -775,10 +912,11 @@ case "${configuration}" in
   ## Vaxen.
   vax-dec-* )
     machine=vax
-    case "${configuration}" in
-      *-bsd4.1 ) 					opsys=bsd4-1 ;;
-      *-bsd4.2 | *-ultrix[0-3].* | *-ultrix4.0 )	opsys=bsd4-2 ;;
-      *-bsd4.3 | *-ultrix* ) 				opsys=bsd4-3 ;;
+    case "${canonical}" in
+      *-bsd4.1* ) 					opsys=bsd4-1 ;;
+      *-bsd4.2* | *-ultrix[0-3].* | *-ultrix4.0* )	opsys=bsd4-2 ;;
+      *-bsd4.3* | *-ultrix* ) 				opsys=bsd4-3 ;;
+      *-bsd386* )					opsys=bsd386 ;;
       *-sysv[01]* | *-sysvr[01]* ) 			opsys=usg5-0 ;;
       *-sysv2* | *-sysvr2* )				opsys=usg5-2 ;;
       *-vms* ) 						opsys=vms ;;
@@ -798,6 +936,26 @@ case "${configuration}" in
     machine=wicat opsys=usg5-2
   ;;
 
+  ## Intel 386 machines where we don't care about the manufacturer
+  i[34]86-*-* )
+    machine=intel386
+    case "${canonical}" in
+      *-isc1.* | *-isc2.[01]* )	opsys=386-ix ;;
+      *-isc2.2* )		opsys=isc2-2 ;;
+      *-isc* )			opsys=isc3-0 ;;
+      *-esix5* )		opsys=esix5r4 ;;
+      *-esix* )			opsys=esix ;;
+      *-xenix* )		opsys=xenix ;;
+      *-linux* )		opsys=linux ;;
+      *-sco3.2v4* )		opsys=sco4 ;;
+      *-bsd386* )		opsys=bsd386 ;;
+      *-386bsd* )	        opsys=386bsd ;;
+      *-netbsd* )	        opsys=netbsd ;;
+      *-nextstep* )             opsys=mach2 ;;
+      ## Otherwise, we'll fall through to the generic opsys code at the bottom.
+    esac
+  ;;
+
   * )
     unported=true
   ;;
@@ -809,8 +967,8 @@ esac
 ### operating system is; if you know what operating systems a machine
 ### runs, it's cleaner to make it explicit in the case statement
 ### above.
-if [ ! "${opsys}" ]; then
-  case "${configuration}" in
+if [ x"${opsys}" = x ]; then
+  case "${canonical}" in
     *-bsd4.[01] )	opsys=bsd4-1 ;;
     *-bsd4.2 )		opsys=bsd4-2 ;;
     *-bsd4.3 )		opsys=bsd4-3 ;;
@@ -819,6 +977,7 @@ if [ ! "${opsys}" ]; then
     *-sysv2.2 | *-sysvr2.2 )		opsys=usg5-2-2 ;;
     *-sysv3 | *-sysvr3 )		opsys=usg5-3 ;;
     *-sysv4 | *-sysvr4 )		opsys=usg5-4 ;;
+    *-sysv4.2 | *-sysvr4.2 )		opsys=usg5-4-2 ;;
     * )
       unported=true
     ;;
@@ -826,7 +985,7 @@ if [ ! "${opsys}" ]; then
 fi
 
 if $unported ; then
-  (echo "${progname}: Emacs hasn't been ported to \`${configuration}' systems."
+  (echo "${progname}: Emacs hasn't been ported to \`${canonical}' systems."
    echo "${progname}: Check \`etc/MACHINES' for recognized configuration names."
   ) >&2
   exit 1
@@ -843,14 +1002,27 @@ AC_CONFIG_HEADER(src/config.h)
 #### Choose a compiler.
 case ${with_gcc} in
   "yes" ) CC="gcc" GCC=1 ;;
-  "no"  ) CC="cc"        ;;
+  "no"  ) CC=${CC:-"cc"} ;;
   * )
     ] AC_PROG_CC [
 esac
 
-CFLAGS='-g'
-if test -n "${GCC}"; then
-  CFLAGS='-g -O'
+#### Some systems specify a CPP to use unless we are using GCC.
+#### Now that we know whether we are using GCC, we can decide whether
+#### to use that one.
+if [ x$NON_GNU_CPP = x ] || [ x$GCC = x1 ]
+then true
+else
+  CPP=$NON_GNU_CPP
+fi
+
+#### Some systems specify a CC to use unless we are using GCC.
+#### Now that we know whether we are using GCC, we can decide whether
+#### to use that one.
+if [ x$NON_GNU_CC = x ] || [ x$GCC = x1 ]
+then true
+else
+  CC=$NON_GNU_CC
 fi
 
 #### Some other nice autoconf tests.  If you add a test here which
@@ -861,21 +1033,18 @@ dnl checks for programs
 AC_LN_S
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_PROG_YACC
 
 dnl checks for UNIX variants that set `DEFS'
 
 dnl checks for header files
-AC_HAVE_HEADERS(sys/timeb.h sys/time.h)
+AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h)
 AC_STDC_HEADERS
 AC_TIME_WITH_SYS_TIME
 
 dnl checks for typedefs
 AC_RETSIGTYPE
 
-dnl checks for functions
-AC_ALLOCA
-AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename)
-
 dnl checks for structure members
 AC_STRUCT_TM
 AC_TIMEZONE
@@ -884,11 +1053,11 @@ dnl checks for compiler characteristics
 AC_CONST
 
 dnl checks for operating system services
+AC_LONG_FILE_NAMES
 
 dnl other checks for UNIX variants
 [
 
-
 #### Choose a window system.
 echo "Checking window system."
 
@@ -914,21 +1083,51 @@ esac
 case "${window_system}" in
   "none" | "x11" | "x10" ) ;;
   "" )
-    echo "  No window system specifed.  Looking for X window system."
-    window_system=none
-    if [ -r /usr/lib/libX11.a \
+    # --x-includes or --x-libraries implies --with-x11.
+    if [ -n "${x_includes}" ] || [ -n "${x_libraries}" ]; then
+      window_system=x11
+    else
+      echo "  No window system specified.  Looking for X11."
+      # If the user didn't specify a window system and we found X11, use it.
+      if [ -r /usr/lib/libX11.a \
 	 -o -d /usr/include/X11 \
          -o -d /usr/X386/include \
 	 -o -d ${x_includes}/X11 ]; then
-      window_system=x11
+        window_system=x11
+      fi
     fi
   ;;
   * )
-    echo "Don't specify the window system more than once." >&2
+    echo "Don't specify a window system more than once." >&2
     exit 1
   ;;
 esac
 
+case "${window_system}" in
+  "" | "x11" )
+    ### If the user hasn't specified where we should find X, try
+    ### letting autoconf figure that out.
+    if [ -z "${x_includes}" ] && [ -z "${x_libraries}" ]; then
+      ]
+      AC_FIND_X
+      [
+    fi
+    if [ -n "${x_includes}" ] || [ -n "${x_libraries}" ]; then
+      window_system=x11
+    fi
+  ;;
+esac
+
+[ -z "${window_system}" ] && window_system=none
+
+[ -n "${x_libraries}" ] && LD_SWITCH_X_SITE="-L${x_libraries}"
+[ -n "${x_includes}" ] && C_SWITCH_X_SITE="-I${x_includes}"
+
+# Avoid forcing the search of /usr/include before fixed include files.
+if [ "$C_SWITCH_X_SITE" = "-I/usr/include" ]; then
+   C_SWITCH_X_SITE=" "
+fi
+
 case "${window_system}" in
   x11 )
     HAVE_X_WINDOWS=yes
@@ -955,26 +1154,6 @@ case ${HAVE_X11} in
   ;;
 esac
 
-### Check for XFree386.  It needs special hacks.
-lib_havexbsd=no
-]
-AC_HAVE_LIBRARY( Xbsd , have_libxbsd=yes , have_libxbsd=no )
-[
-if [ -n "${x_libraries}" ] && [ -f ${x_libraries}/libXbsd.a ]; then
-  have_libxbsd=yes
-fi
-
-case ${window_system} in
-  x11 )
-    if [ -d /usr/X386/include ] && [ "${have_libxbsd}" = "yes" ]; then
-      HAVE_XFREE386=yes
-      if [ "${C_SWITCH_X_SITE}" = "" ]; then
-	C_SWITCH_X_SITE="-I/usr/X386/include"
-      fi
-    fi
-  ;;
-esac
-
 #### Extract some information from the operating system and machine files.
 
 echo "Examining the machine- and system-dependent files to find out"
@@ -998,22 +1177,58 @@ echo '
 #ifndef C_SWITCH_SYSTEM
 #define C_SWITCH_SYSTEM
 #endif
-@configure@ libsrc_libs=LIBS_MACHINE LIBS_SYSTEM
-@configure@ c_switch_system=C_SWITCH_SYSTEM
+configure___ libsrc_libs=LIBS_MACHINE LIBS_SYSTEM
+configure___ c_switch_system=C_SWITCH_SYSTEM
+
+#ifndef LIB_X11_LIB
+#define LIB_X11_LIB -lX11
+#endif
+
+#ifndef LIBX11_MACHINE
+#define LIBX11_MACHINE
+#endif
+
+#ifndef LIBX11_SYSTEM
+#define LIBX11_SYSTEM
+#endif
+configure___ LIBX=LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
+
+#ifdef UNEXEC
+configure___ unexec=UNEXEC
+#else
+configure___ unexec=unexec.o
+#endif
+
 #ifdef SYSTEM_MALLOC
-@configure@ system_malloc=yes
+configure___ system_malloc=yes
+#else
+configure___ system_malloc=no
+#endif
+
+#ifndef C_DEBUG_SWITCH
+#define C_DEBUG_SWITCH -g
+#endif
+
+#ifndef C_OPTIMIZE_SWITCH
+#define C_OPTIMIZE_SWITCH -O
+#endif
+
+#ifdef __GNUC__
+configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH
 #else
-@configure@ system_malloc=no
+configure___ CFLAGS=C_DEBUG_SWITCH
 #endif
 ' > ${tempcname}
 # The value of CPP is a quoted variable reference, so we need to do this
 # to get its actual value...
-foo=`eval "echo $CPP"`
-eval `${foo} ${tempcname} \
-       | grep '@configure@' \
-       | sed -e 's/^@configure@ \([^=]*=\)\(.*\)$/\1"\2"/'`
+CPP=`eval "echo $CPP"`
+eval `${CPP} -Isrc ${tempcname} \
+       | grep 'configure___' \
+       | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'`
 rm ${tempcname}
 
+### Compute the unexec source name from the object name.
+UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
 
 # Do the opsystem or machine files prohibit the use of the GNU malloc?
 # Assume not, until told otherwise.
@@ -1024,42 +1239,102 @@ if [ "${system_malloc}" = "yes" ]; then
   (The GNU allocators don't work with this system configuration.)"
 fi
 
-if [ ! "${REL_ALLOC}" ]; then
+if [ x"${REL_ALLOC}" = x ]; then
   REL_ALLOC=${GNU_MALLOC}
 fi
 
 LISP_FLOAT_TYPE=yes
 
 
+#### Add the libraries to LIBS and check for some functions.
+
+]
+DEFS="$c_switch_system $DEFS"
+LIBS="$libsrc_libs"
+
+dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks,
+dnl and also adds -ldnet to LIBS, which Autoconf uses for checks.
+AC_HAVE_LIBRARY(-ldnet)
+
+AC_HAVE_LIBRARY(-lXbsd, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
+
+echo checking for XFree86
+if test -d /usr/X386/include; then
+  HAVE_XFREE386=yes
+  test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include"
+fi
+
+if test "${HAVE_X11}" = "yes"; then
+  DEFS="$C_SWITCH_X_SITE $DEFS"
+  LIBS="$LD_SWITCH_X_SITE $LIBX $LIBS"
+  AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString XScreenNumberOfScreen XSetWMProtocols)
+fi
+
+AC_ALLOCA
+
+# logb and frexp are found in -lm on most systems.
+AC_HAVE_LIBRARY(-lm)
+AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir random bcopy logb frexp ftime res_init setsid)
+
+ok_so_far=true
+AC_FUNC_CHECK(socket, , ok_so_far=)
+if test -n "$ok_so_far"; then
+  AC_HEADER_CHECK(netinet/in.h, , ok_so_far=)
+fi
+if test -n "$ok_so_far"; then
+  AC_HEADER_CHECK(arpa/inet.h, , ok_so_far=)
+fi
+if test -n "$ok_so_far"; then
+  AC_DEFINE(HAVE_INET_SOCKETS)
+fi
+[
 #### Find out which version of Emacs this is.
 version=`grep 'defconst[	 ]*emacs-version' ${srcdir}/lisp/version.el \
 	 | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*$/\1/'`
-if [ ! "${version}" ]; then
+if [ x"${version}" = x ]; then
   echo "${progname}: can't find current emacs version in
 	\`${srcdir}/lisp/version.el'." >&2
   exit 1
 fi
 
+if [ -f /usr/lpp/X11/bin/smt.exp ]; then
+  ]
+  AC_DEFINE(HAVE_AIX_SMT_EXP)
+  [
+fi
+
 
 #### Specify what sort of things we'll be editing into Makefile and config.h.
+### Use configuration here uncanonicalized to avoid exceeding size limits.
 ]
 AC_SUBST(configuration)
 AC_SUBST(version)
 AC_SUBST(srcdir)
+AC_SUBST(prefix)
+AC_SUBST(exec_prefix)
+AC_SUBST(bindir)
+AC_SUBST(datadir)
+AC_SUBST(statedir)
+AC_SUBST(libdir)
+AC_SUBST(mandir)
+AC_SUBST(infodir)
+AC_SUBST(lispdir)
+AC_SUBST(locallisppath)
+AC_SUBST(lisppath)
+AC_SUBST(etcdir)
+AC_SUBST(lockdir)
+AC_SUBST(archlibdir)
 AC_SUBST(c_switch_system)
 AC_SUBST(libsrc_libs)
-AC_SUBST(rip_paths)
-AC_SUBST(inst_paths)
 AC_SUBST(LD_SWITCH_X_SITE)
 AC_SUBST(C_SWITCH_X_SITE)
 AC_SUBST(CFLAGS)
-AC_SUBST(prefix)
-AC_SUBST(exec_prefix)
 
 AC_DEFINE_UNQUOTED(config_machfile,  "\"${machfile}\"")
 AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
 AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
 AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE,  ${C_SWITCH_X_SITE})
+AC_DEFINE_UNQUOTED(UNEXEC_SRC,       ${UNEXEC_SRC})
 
 [
 if [ "${HAVE_X_WINDOWS}" = "yes" ] ; then
@@ -1084,12 +1359,60 @@ if [ "${LISP_FLOAT_TYPE}" = "yes" ] ; then
   ] AC_DEFINE(LISP_FLOAT_TYPE) [
 fi
 
+# ====================== Developer's configuration =======================
+
+# The following assignments make sense if you're running Emacs on a single
+# machine, one version at a time, and  you want changes to the lisp and etc
+# directories in the source tree to show up immediately in your working
+# environment.  It saves a great deal of disk space by not duplicating the
+# lisp and etc directories.
+
+if [ "$run_in_place" = "1" ]; then
+   lispdir='${srcdir}/lisp'
+   locallisppath='${srcdir}/site-lisp'
+   etcdir='${srcdir}/etc'
+   lockdir='${srcdir}/lock'
+   archlibdir='${srcdir}/lib-src'
+   infodir='${srcdir}/info'
+elif [ "$single_tree" = "1" ]; then
+   if [ "$exec_prefix_specified" = "" ]; then
+      exec_prefix='${prefix}'
+   fi
+   if [ "$bindir_specified" = "" ]; then
+      bindir='${exec_prefix}/bin/${configuration}'
+   fi
+   if [ "$datadir_specified" = "" ]; then
+      datadir='${prefix}/common'
+   fi
+   if [ "$statedir_specified" = "" ]; then
+      statedir='${prefix}/common'
+   fi
+   if [ "$libdir_specified" = "" ]; then
+      libdir='${bindir}'
+   fi
+   if [ "$lispdir_specified" = "" ]; then
+      lispdir='${prefix}/common/lisp'
+   fi
+   if [ "$locallisppath_specified" = "" ]; then
+      locallisppath='${prefix}/common/site-lisp'
+   fi
+   if [ "$lockdir_specified" = "" ]; then
+      lockdir='${prefix}/common/lock'
+   fi
+   if [ "$archlibdir_specified" = "" ]; then
+      archlibdir='${libdir}/etc'
+   fi
+   if [ "$etcdir_specified" = "" ]; then
+      etcdir='${prefix}/common/data'
+   fi
+fi
 
 #### Report on what we decided to do.
 echo "
 
-Configured for \`${configuration}'.
+Configured for \`${canonical}'.
 
+  Where should the build process find the source code?    ${srcdir}
   What operating system and machine description files should Emacs use?
         \`${opsysfile}' and \`${machfile}'
   What compiler should emacs be built with?               ${CC} ${CFLAGS}
@@ -1101,8 +1424,56 @@ Configured for \`${configuration}'.
 
 "
 
-### Restore the arguments to this script, so autoconf can record them
-### in the config.status file.
-set -- ${arguments}
+# Remove any trailing slashes in these variables.
+test -n "${prefix}" &&
+  prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`
+test -n "${exec_prefix}" &&
+  exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
+]
+AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile src/Makefile.in) [
+# Build src/Makefile from ${srcdir}/src/Makefile.in.  This must be done
+# after src/config.h is built, since we rely on that file.  Only do the
+# build if "config.status" is present, since it's non-presence indicates
+# an error occured.
+status=$?
+if [ ! -f ./config.status ]; then
+   exit $status
+fi
+topsrcdir=${srcdir}
+  # We discard all lines in Makefile.in that start with `# Generated' or /**/#
+  # because some cpps get confused by them.
+  # Really we should preserve them somehow into Makefile,
+  # but that is beyond my level of shell programming.
+makefile_command='echo "creating src/Makefile";
+  topsrcdir='"${topsrcdir}"';
+( cd ./src;
+  rm -f junk.c;
+  sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
+  eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
+  < junk.cpp							'\
+'    sed -e '\''s/^#.*//'\''					'\
+'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
+'	-e '\''s/^ /	/'\'' 					'\
+'	| sed -n -e '\''/^..*$/p'\''				'\
+'	> Makefile.new;
+    chmod 444 Makefile.new;
+    mv -f Makefile.new Makefile;
+    rm -f junk.c junk.cpp;
+)'
+eval `echo $makefile_command`
+# AC-OUTPUT has created `config.status' already.  We need to add the above
+# commands to re-create `src/Makefile', and we need to insert them before
+# the final "exit 0" which appears at the end of `config.status'.
+<config.status sed -e 's/^exit 0$//' >config.new
+echo $makefile_command >>config.new
+echo exit 0 >>config.new
+mv -f config.new config.status
+chmod +x config.status
+# Don't let the fact that we just rewrote config.status make Makefile think
+# that it is now newer.  We have just rewritten all of the Makefiles as well.
+MFS="Makefile src/Makefile src/Makefile.in lib-src/Makefile oldXMenu/Makefile"
+for file in $MFS; do
+   chmod a+w $file; touch $file; chmod 444 $file
+done
+exit 0
 ]
-AC_OUTPUT(Makefile)