. )
## We may be able to use the $PWD environment variable to make this
## absolute. But sometimes PWD is inaccurate.
+ ## Make sure CDPATH doesn't affect cd (in case PWD is relative).
+ CDPATH=
if test "${PWD}" != "" && test "`(cd ${PWD} ; sh -c pwd)`" = "`pwd`" ;
then
srcdir="$PWD"
machine=amdahl opsys=usg5-2-2
;;
- ## Appallings - I mean, Apollos - running Domain
- m68*-apollo* )
- machine=apollo opsys=domain NON_GNU_CPP=/usr/lib/cpp
+ ## Apollo, Domain/OS
+ m68*-apollo-* )
+ machine=apollo opsys=bsd4-3
;;
## AT&T 3b2, 3b5, 3b15, 3b20
m68k-motorola-sysv* | m68000-motorola-sysv* )
machine=delta opsys=usg5-3
if test -z "`type gnucc | grep 'not found'`"
- then CC=gnucc
+ then
+ if test -s /etc/167config
+ then CC="gnucc -m68040"
+ else CC="gnucc -m68881"
+ fi
else
if test -z "`type gcc | grep 'not found'`"
then CC=gcc
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
m68*-hp-bsd* )
machine=hp9000s300 opsys=bsd4-3
;;
- ## HP/UX 7, 8 and 9 are supported on these machines.
+ ## HP/UX 7, 8, 9, and 10 are supported on these machines.
m68*-hp-hpux* )
case "`uname -r`" in
## Someone's system reports A.B8.05 for this.
*.B8.* ) machine=hp9000s300 opsys=hpux8 ;;
*.08.* ) machine=hp9000s300 opsys=hpux8 ;;
*.09.* ) machine=hp9000s300 opsys=hpux9 ;;
+ *.10.* ) machine=hp9000s300 opsys=hpux9shr ;;
*) machine=hp9000s300 opsys=hpux ;;
esac
;;
hppa*-hp-hpux9* )
machine=hp800 opsys=hpux9
;;
+ hppa*-hp-hpux10* )
+ machine=hp800 opsys=hpux9shr
+ ;;
## HP 9000 series 700 and 800, running HP/UX
hppa*-hp-hpux* )
## 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
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
;;
## The Sun386 didn't get past 4.0.
i[345]86-*-sunos4 ) opsys=sunos4-0 ;;
*-sunos4.0* ) opsys=sunos4-0 ;;
- *-sunos4.1.3* ) opsys=sunos4-1-3
- NON_GCC_TEST_OPTIONS=-Bstatic
- GCC_TEST_OPTIONS=-static
- NON_GNU_CPP=/usr/lib/cpp
- ;;
- *-sunos4shr* ) opsys=sunos4shr
+ *-sunos4.1.3* | *-sunos4shr* ) opsys=sunos4shr
NON_GNU_CPP=/usr/lib/cpp
;;
*-sunos4* | *-sunos ) opsys=sunos4-1
opsys=sol2-4
NON_GNU_CPP=/usr/ccs/lib/cpp
;;
+ *-sunos5.5* | *-solaris2.5* )
+ opsys=sol2-5
+ NON_GNU_CPP=/usr/ccs/lib/cpp
+ ;;
*-sunos5* | *-solaris* )
opsys=sol2
NON_GNU_CPP=/usr/ccs/lib/cpp
*-bsd4.1* ) opsys=bsd4-1 ;;
*-bsd4.2* | *-ultrix[0-3].* | *-ultrix4.0* ) opsys=bsd4-2 ;;
*-bsd4.3* | *-ultrix* ) opsys=bsd4-3 ;;
- *-bsd386* | *-bsdi* ) opsys=bsd386 ;;
*-sysv[01]* | *-sysvr[01]* ) opsys=usg5-0 ;;
*-sysv2* | *-sysvr2* ) opsys=usg5-2 ;;
*-vms* ) opsys=vms ;;
*-xenix* ) opsys=xenix ;;
*-linux* ) opsys=linux ;;
*-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;;
- *-bsd386* | *-bsdi* ) opsys=bsd386 ;;
+ *-bsd386* | *-bsdi1* ) opsys=bsd386 ;;
+ *-bsdi2* ) opsys=bsdos2 ;;
*-386bsd* ) opsys=386bsd ;;
*-freebsd* ) opsys=freebsd ;;
*-nextstep* ) opsys=mach2 ;;
AC_AIX
dnl checks for header files
-AC_CHECK_HEADERS(sys/timeb.h sys/time.h unistd.h utime.h)
+AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h)
AC_HEADER_STDC
AC_HEADER_TIME
AC_DECL_SYS_SIGLIST
fi
if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
- LD_SWITCH_X_SITE="-L${x_libraries}"
- LD_SWITCH_X_SITE_AUX="-R${x_libraries}"
+ LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
+ LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
fi
if test "${x_includes}" != NONE && test -n "${x_includes}"; then
- C_SWITCH_X_SITE="-I${x_includes}"
+ C_SWITCH_X_SITE=-I`echo ${x_includes} | sed -e "s/:/ -I/g"`
fi
if test x"${x_includes}" = x; then
bitmapdir=/usr/include/X11/bitmaps
else
- bitmapdir="${x_includes}/bitmaps"
+ # accumulate include directories that have X11 bitmap sudirectories
+ bmd_acc="dummyval"
+ for bmd in `echo ${x_includes} | sed -e "s/:/ /g"`; do
+ if test -d "${bmd}/X11/bitmaps"; then
+ bmd_acc="${bmd_acc}:${bmd}/X11/bitmaps"
+ elif test -d "${bmd}/bitmaps"; then
+ bmd_acc="${bmd_acc}:${bmd}/bitmaps"
+ fi
+ done
+ if test ${bmd_acc} != "dummyval"; then
+ bitmapdir=`echo ${bmd_acc} | sed -e "s/^dummyval://"`
+ fi
fi
case "${window_system}" in
dnl FIXME replace main with a function we actually want from this library.
AC_CHECK_LIB(Xbsd, main, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
+AC_CHECK_LIB(pthread, cma_open)
+
AC_MSG_CHECKING(for XFree86)
if test -d /usr/X386/include; then
HAVE_XFREE386=yes
fi
# If netdb.h doesn't declare h_errno, we must declare it by hand.
-AC_MSG_CHECKING(whether netdb declarares h_errno)
+AC_MSG_CHECKING(whether netdb declares h_errno)
AC_TRY_LINK([#include <netdb.h>],
[return h_errno;],
[AC_MSG_RESULT(yes)
AC_FUNC_ALLOCA
-# logb and frexp are found in -lm on most systems.
-AC_CHECK_LIB(m, logb)
+# fmod, logb, and frexp are found in -lm on most systems.
+# On HPUX 9.01, -lm does not contain logb, so check for sqrt.
+AC_CHECK_LIB(m, sqrt(0.0) + t)
AC_CHECK_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \
random lrand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid \
strerror fpathconf select mktime eaccess getpagesize)
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})
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"])