HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(i[34]86-*-*): For SCO 3.2v4, fix NON_GNU_CPP value.
[bpt/emacs.git]
/
configure1.in
diff --git
a/configure1.in
b/configure1.in
index
0abf70e
..
6c9e3ba
100755
(executable)
--- 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.
#### 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
if canonical=`${srcdir}/config.sub "${configuration}"` ; then : ; else
exit $?
fi
@@
-798,6
+798,8
@@
case "${canonical}" in
## Intel 860
i860-*-sysv4* )
machine=i860 opsys=usg5-4
## 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
;;
## Masscomp machines
@@
-939,7
+941,7
@@
case "${canonical}" in
m68*-sunos1* ) machine=sun1 ;;
m68*-sunos2* ) machine=sun2 ;;
m68* ) machine=sun3 ;;
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 ;;
i[34]86-*-* ) machine=intel386 ;;
sparc* ) machine=sparc ;;
* ) unported=true ;;
@@
-961,6
+963,10
@@
case "${canonical}" in
opsys=sol2-3
NON_GNU_CPP=/usr/ccs/lib/cpp
;;
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
*-sunos5* | *-solaris* )
opsys=sol2
NON_GNU_CPP=/usr/ccs/lib/cpp
@@
-1052,7
+1058,7
@@
case "${canonical}" in
*-esix* ) opsys=esix ;;
*-xenix* ) opsys=xenix ;;
*-linux* ) opsys=linux ;;
*-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 ;;
*-bsd386* | *-bsdi* ) opsys=bsd386 ;;
*-386bsd* ) opsys=386bsd ;;
*-freebsd* ) opsys=freebsd ;;
@@
-1199,7
+1205,7
@@
dnl other checks for UNIX variants
[
#### Choose a window system.
[
#### Choose a window system.
-echo "
Checking window system.
"
+echo "
checking for specified window system
"
window_system=''
case "${with_x}" in
window_system=''
case "${with_x}" in
@@
-1331,9
+1337,9
@@
esac
#### Extract some information from the operating system and machine files.
#### Extract some information from the operating system and machine files.
-echo "
E
xamining the machine- and system-dependent files to find out"
+echo "
e
xamining the machine- and system-dependent files to find out"
echo " - which libraries the lib-src programs will want, and"
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).
### First figure out CFLAGS (which we use for running the compiler here)
### and REAL_CFLAGS (which we use for real compilation).
@@
-1499,12
+1505,24
@@
fail;
AC_DEFINE(HAVE_X11XTR6))
fi
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 \
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
fpathconf)
ok_so_far=true