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

diff --git a/configure1.in b/configure1.in
index 9ec184ec44..6c9e3baf5d 100755
--- a/configure1.in
+++ b/configure1.in
@@ -449,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
@@ -480,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
@@ -664,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
@@ -787,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
@@ -928,7 +941,7 @@ case "${canonical}" in
       m68*-sunos1* )	machine=sun1 ;;
       m68*-sunos2* )	machine=sun2 ;;
       m68* )		machine=sun3 ;;
-      i[34]86-sun-* )	machine=sun386 ;;
+      i[34]86-sun-sunos[34]* )	machine=sun386 ;;
       i[34]86-*-* )     machine=intel386 ;;
       sparc* )		machine=sparc ;;
       * )		unported=true ;;
@@ -950,6 +963,10 @@ case "${canonical}" in
 		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
@@ -1041,11 +1058,10 @@ case "${canonical}" in
       *-esix* )			opsys=esix ;;
       *-xenix* )		opsys=xenix ;;
       *-linux* )		opsys=linux ;;
-      *-sco3.2v4* )		opsys=sco4 ;;
+      *-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
@@ -1189,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
@@ -1321,9 +1337,9 @@ 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).
@@ -1332,6 +1348,9 @@ echo " - whether the GNU malloc routines are usable."
 ### 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
 ### anyway.
@@ -1412,12 +1431,16 @@ configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${CFLAGS}'
 # 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"/'`
-eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${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.
@@ -1482,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