X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/1df16e382080b46408162f61a16fafc06be52a42..4394c854e0bf0a5c90d4d7538b79416afef87144:/configure1.in

diff --git a/configure1.in b/configure1.in
index 3144bdd324..6c9e3baf5d 100755
--- a/configure1.in
+++ b/configure1.in
@@ -1,21 +1,18 @@
 dnl This is an autoconf script.
 dnl To rebuild the `configure' script from this, execute the command
 dnl 	autoconf
-dnl in the directory containing this script.  You must have autoconf
-dnl version 1.9 or later.
-dnl
-dnl The following text appears in the resulting `configure' script,
-dnl explaining how to rebuild it.
+dnl in the directory containing this script.
 [#!/bin/sh
 #### Configuration script for GNU Emacs
 #### Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+#### This script requires autoconf version 1.9 or later.
 
 ### Don't edit this script!
 ### This script was automatically generated by the `autoconf' program
 ### from the file `./configure.in'.
 ### To rebuild it, execute the command
 ###	autoconf
-### in the this directory.  You must have autoconf version 1.7 or later.
+### in the this directory.
 
 ### This file is part of GNU Emacs.
 
@@ -452,7 +449,7 @@ done
 #### names of the m/*.h and s/*.h files we should use.
 
 ### Canonicalize the configuration name.
-echo "Checking the configuration name."
+echo "Checking the configuration name"
 if canonical=`${srcdir}/config.sub "${configuration}"` ; then : ; else
   exit $?
 fi
@@ -483,6 +480,20 @@ fi
 machine='' opsys='' unported='false'
 case "${canonical}" in
 
+  ## NetBSD ports
+  *-*-netbsd* )
+    opsys=netbsd
+    case "${canonical}" in
+      sparc-*-netbsd*)	machine=sparc ;;
+      i386-*-netbsd*)	machine=intel386 ;;
+      hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd*)
+			# Yes, this is somewhat bogus.
+			machine=hp9000s300 ;;
+      pc532-*-netbsd*)	machine=ns32000 ;;
+      pmax-*-netbsd*)	machine=pmax ;;
+    esac
+  ;;
+
   ## Alliant machines
   ## Strictly speaking, we need the version of the alliant operating
   ## system to choose the right machine file, but currently the
@@ -556,8 +567,10 @@ case "${canonical}" in
   ;;
 
   ## Convex
-  *-convex-bsd* )
+  *-convex-bsd* | *-convex-convexos* )
     machine=convex opsys=bsd4-3
+    ## Prevents suprious white space in makefiles - d.m.cooke@larc.nasa.gov
+    NON_GNU_CPP="cc -E -P"
   ;;
 
   ## Cubix QBx/386
@@ -665,9 +678,6 @@ case "${canonical}" in
   m68*-hp-bsd* )
     machine=hp9000s300 opsys=bsd4-3
   ;;
-  m68*-hp-netbsd* )
-    machine=hp9000s300 opsys=netbsd
-  ;;
   ## HP/UX 7, 8 and 9 are supported on these machines.
   m68*-hp-hpux* )
     case "`uname -r`" in
@@ -687,12 +697,12 @@ case "${canonical}" in
   hppa*-hp-hpux8* )
     machine=hp800 opsys=hpux8
   ;;
-  hppa*-hp-hpux9* )
-    machine=hp800 opsys=hpux9
-  ;;
   hppa*-hp-hpux9shr* )
     machine=hp800 opsys=hpux9shr
   ;;
+  hppa*-hp-hpux9* )
+    machine=hp800 opsys=hpux9
+  ;;
 
   ## HP 9000 series 700 and 800, running HP/UX
   hppa*-hp-hpux* )
@@ -788,6 +798,8 @@ case "${canonical}" in
   ## Intel 860
   i860-*-sysv4* )
     machine=i860 opsys=usg5-4
+    NON_GNU_CC="/bin/cc" # Ie, not the one in /usr/ucb/cc.
+    NON_GNU_CPP="/usr/ccs/lib/cpp" # cc -E tokenizes macro expansion.
   ;;
 
   ## Masscomp machines
@@ -879,7 +891,7 @@ case "${canonical}" in
   mips-siemens-sysv* )
     machine=mips-siemens opsys=usg5-4
     NON_GNU_CC=/usr/ccs/bin/cc
-    NON_GNU_CPP="/usr/ccs/bin/cc -E"
+    NON_GNU_CPP=/usr/ccs/lib/cpp
   ;;
 
   ## Silicon Graphics machines
@@ -891,13 +903,13 @@ case "${canonical}" in
     machine=irist opsys=iris3-6
   ;;
   ## Iris 4D
-  mips-sgi-irix3.* )
+  mips-sgi-irix3* )
     machine=iris4d opsys=irix3-3
   ;;
-  mips-sgi-irix5.* )
+  mips-sgi-irix5* )
     machine=iris4d opsys=irix5-0
   ;;
-  mips-sgi-irix4.* | mips-sgi-irix* )
+  mips-sgi-irix4* | mips-sgi-irix* )
     machine=iris4d opsys=irix4-0
   ;;
 
@@ -911,11 +923,11 @@ case "${canonical}" in
   m68*-sony-newsos3*)
     machine=news opsys=bsd4-3
   ;;
-  mips-sony-bsd* )
+  mips-sony-bsd* | mips-sony-newsos4* )
     machine=news-risc opsys=bsd4-3
   ;;
   mips-sony-newsos* )
-    machine=mips opsys=newsos5
+    machine=news-risc opsys=newsos5
   ;;
 
   ## Stride
@@ -924,12 +936,13 @@ case "${canonical}" in
   ;;
 
   ## Suns
-  *-sun-sunos* | *-sun-bsd* | *-sun-solaris* )
+  *-sun-sunos* | *-sun-bsd* | *-sun-solaris* | i[34]86-*-solaris2* | i[34]86-*-sunos5* )
     case "${canonical}" in
       m68*-sunos1* )	machine=sun1 ;;
       m68*-sunos2* )	machine=sun2 ;;
       m68* )		machine=sun3 ;;
-      i[34]86* )	machine=sun386 ;;
+      i[34]86-sun-sunos[34]* )	machine=sun386 ;;
+      i[34]86-*-* )     machine=intel386 ;;
       sparc* )		machine=sparc ;;
       * )		unported=true ;;
     esac
@@ -942,11 +955,18 @@ case "${canonical}" in
 		GCC_TEST_OPTIONS=-static
 		;;
       *-sunos4shr*	  ) opsys=sunos4shr ;;
-      *-sunos4* | *-sunos ) opsys=sunos4-1 ;;
+      *-sunos4* | *-sunos ) opsys=sunos4-1
+		NON_GCC_TEST_OPTIONS=-Bstatic
+		GCC_TEST_OPTIONS=-static
+		;;
       *-sunos5.3* | *-solaris2.3* )
 		opsys=sol2-3
 		NON_GNU_CPP=/usr/ccs/lib/cpp
 		;;
+      *-sunos5.4* | *-solaris2.4* )
+		opsys=sol2-4
+		NON_GNU_CPP=/usr/ccs/lib/cpp
+		;;
       *-sunos5* | *-solaris* )
 		opsys=sol2
 		NON_GNU_CPP=/usr/ccs/lib/cpp
@@ -1006,7 +1026,7 @@ 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 ;;
+      *-bsd386* | *-bsdi* )				opsys=bsd386 ;;
       *-sysv[01]* | *-sysvr[01]* ) 			opsys=usg5-0 ;;
       *-sysv2* | *-sysvr2* )				opsys=usg5-2 ;;
       *-vms* ) 						opsys=vms ;;
@@ -1038,11 +1058,10 @@ case "${canonical}" in
       *-esix* )			opsys=esix ;;
       *-xenix* )		opsys=xenix ;;
       *-linux* )		opsys=linux ;;
-      *-sco3.2v4* )		opsys=sco4 ;;
-      *-bsd386* )		opsys=bsd386 ;;
+      *-sco3.2v4* )		opsys=sco4 ; NON_GNU_CPP=/lib/cpp  ;;
+      *-bsd386* | *-bsdi* )	opsys=bsd386 ;;
       *-386bsd* )	        opsys=386bsd ;;
       *-freebsd* )	        opsys=freebsd ;;
-      *-netbsd* )	        opsys=netbsd ;;
       *-nextstep* )             opsys=mach2 ;;
       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
     esac
@@ -1186,7 +1205,7 @@ dnl other checks for UNIX variants
 [
 
 #### Choose a window system.
-echo "Checking window system."
+echo "checking for specified window system"
 
 window_system=''
 case "${with_x}" in
@@ -1318,9 +1337,19 @@ esac
 
 #### Extract some information from the operating system and machine files.
 
-echo "Examining the machine- and system-dependent files to find out"
+echo "examining the machine- and system-dependent files to find out"
 echo " - which libraries the lib-src programs will want, and"
-echo " - whether the GNU malloc routines are usable."
+echo " - whether the GNU malloc routines are usable"
+
+### First figure out CFLAGS (which we use for running the compiler here)
+### and REAL_CFLAGS (which we use for real compilation).
+### The two are the same except on a few systems, where they are made
+### different to work around various lossages.  For example,
+### GCC 2.5 on Linux needs them to be different because it treats -g
+### as implying static linking.
+
+### If the CFLAGS env var is specified, we use that value
+### instead of the default.
 
 ### It's not important that this name contain the PID; you can't run
 ### two configures in the same directory and have anything work
@@ -1379,18 +1408,39 @@ configure___ system_malloc=no
 #define C_OPTIMIZE_SWITCH -O
 #endif
 
+#ifdef THIS_IS_CONFIGURE
+
+/* Get the CFLAGS for tests in configure.  */
 #ifdef __GNUC__
 configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${CFLAGS}'
 #else
 configure___ CFLAGS=C_DEBUG_SWITCH '${CFLAGS}'
 #endif
+
+#else /* not THIS_IS_CONFIGURE */
+
+/* Get the CFLAGS for real compilation.  */
+#ifdef __GNUC__
+configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${CFLAGS}'
+#else
+configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${CFLAGS}'
+#endif
+
+#endif /* not THIS_IS_CONFIGURE */
 ' > ${tempcname}
 # The value of CPP is a quoted variable reference, so we need to do this
 # to get its actual value...
 CPP=`eval "echo $CPP"`
-eval `${CPP} -Isrc ${tempcname} \
-       | grep 'configure___' \
-       | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'`
+if [ "x$CFLAGS" = x ]; then
+  eval `${CPP} -Isrc ${tempcname} \
+	 | grep 'configure___' \
+	 | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'`
+  eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${tempcname} \
+	 | grep 'configure___' \
+	 | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'`
+else
+  REAL_CFLAGS="$CFLAGS"
+fi
 rm ${tempcname}
 
 ### Compute the unexec source name from the object name.
@@ -1435,7 +1485,6 @@ fi
 
 # We change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
 # for the tests that follow.
-orig_cflags="$CFLAGS"
 
 if test "${HAVE_X11}" = "yes"; then
   DEFS="$C_SWITCH_X_SITE $DEFS"
@@ -1456,12 +1505,24 @@ fail;
 		   AC_DEFINE(HAVE_X11XTR6))
 fi
 
+# If netdb.h doesn't declare h_errno, we must declare it by hand.
+AC_COMPILE_CHECK(declaration of h_errno in netdb.h,
+		 [#include <netdb.h>],
+		 [
+int
+foo ()
+{
+  return h_errno;
+}
+],
+		 AC_DEFINE(HAVE_H_ERRNO))
+
 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 bcmp logb frexp fmod drem ftime res_init setsid strerror \
+random rand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid strerror \
 fpathconf)
 
 ok_so_far=true
@@ -1476,8 +1537,8 @@ if test -n "$ok_so_far"; then
   AC_DEFINE(HAVE_INET_SOCKETS)
 fi
 
-# Restore the original CFLAGS value.
-CFLAGS="$orig_cflags"
+# Set up the CFLAGS for real compilation, so we can substitute it.
+CFLAGS="$REAL_CFLAGS"
 
 [
 #### Find out which version of Emacs this is.