### 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.
+config_options="$*"
while [ $# != 0 ]; do
arg="$1"; shift
case "${arg}" in
## If FOO is a boolean argument, --FOO is equivalent to
## --FOO=yes. Otherwise, the value comes from the next
## argument - see below.
- opt=`echo ${arg} | sed 's:^-*\(.*\)$:\1:'`
+ opt=`echo ${arg} | sed 's:^-*::'`
val="yes"
valomitted=yes
;;
* ) srcdir="`(cd ${srcdir}; pwd)`" ;;
esac
+### Remove trailing slashes.
+srcdir=`echo "${srcdir}" | sed 's,\([^/]\)/*$,\1,'`
+
#### Check if the source directory already has a configured system in it.
if [ `pwd` != `(cd ${srcdir} && pwd)` ] \
&& [ -f "${srcdir}/src/config.h" ] ; then
*-*-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.
+ i[345]86-*-netbsd*) machine=intel386 ;;
+ m68k-*-netbsd*)
+ # This is somewhat bogus.
machine=hp9000s300 ;;
- pc532-*-netbsd*) machine=ns32000 ;;
- pmax-*-netbsd*) machine=pmax ;;
+ mips-*-netbsd*) machine=pmax ;;
+ ns32k-*-netbsd*) machine=ns32000 ;;
+ sparc-*-netbsd*) machine=sparc ;;
esac
;;
+ ## Acorn RISCiX:
+ arm-acorn-riscix1.1* )
+ machine=acorn opsys=riscix1-1
+ ;;
+ arm-acorn-riscix1.2* | arm-acorn-riscix )
+ machine=acorn opsys=riscix1-2
+ ;;
+
## Alliant machines
## Strictly speaking, we need the version of the alliant operating
## system to choose the right machine file, but currently the
machine=alliant-2800 opsys=bsd4-3
;;
+ alpha-dec-osf* )
+ machine=alpha opsys=osf1
+ ;;
+
## Altos 3068
m68*-altos-sysv* )
machine=altos opsys=usg5-2
;;
## Cubix QBx/386
- i386-cubix-sysv* )
+ i[345]86-cubix-sysv* )
machine=intel386 opsys=usg5-3
;;
;;
## IBM machines
- i386-ibm-aix1.1* )
+ i[345]86-ibm-aix1.1* )
machine=ibmps2-aix opsys=usg5-2-2
;;
- i386-ibm-aix1.[23]* | i386-ibm-aix* )
+ i[345]86-ibm-aix1.[23]* | i[345]86-ibm-aix* )
machine=ibmps2-aix opsys=usg5-3
;;
i370-ibm-aix*)
machine=ibm370aix opsys=usg5-3
;;
- rs6000-ibm-aix3.1* )
+ rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1* )
machine=ibmrs6000 opsys=aix3-1
;;
- rs6000-ibm-aix3.2.5)
+ rs6000-ibm-aix3.2.5 | powerpc-ibm-aix3.2.5 )
machine=ibmrs6000 opsys=aix3-2-5
;;
- rs6000-ibm-aix3.2* | rs6000-ibm-aix* )
+ rs6000-ibm-aix* | powerpc-ibm-aix* )
machine=ibmrs6000 opsys=aix3-2
;;
romp-ibm-bsd4.3* )
;;
## Intel 386 machines where we do care about the manufacturer
- i[34]86-intsys-sysv* )
+ i[345]86-intsys-sysv* )
machine=is386 opsys=usg5-2-2
;;
## Prime EXL
- i386-prime-sysv* )
+ i[345]86-prime-sysv* )
machine=i386 opsys=usg5-3
;;
- ## Sequent Symmetry
- i386-sequent-bsd* )
+ ## Sequent Symmetry running Dynix
+ i[345]86-sequent-bsd* )
machine=symmetry opsys=bsd4-3
;;
+ ## Sequent Symmetry running DYNIX/ptx
+ ## Use the old cpp rather than the newer ANSI one.
+ i[345]86-sequent-ptx* )
+ machine=sequent-ptx opsys=ptx
+ NON_GNU_CPP="/lib/cpp"
+ ;;
+
## Unspecified sysv on an ncr machine defaults to svr4.2.
## (Plain usg5-4 doesn't turn on POSIX signals, which we need.)
- i[34]86-ncr-sysv* )
+ i[345]86-ncr-sysv* )
machine=intel386 opsys=usg5-4-2
;;
;;
## NeXT
- m68*-next-* | i[34]86-next-* )
+ m68*-next-* | i[345]86-next-* )
machine=next opsys=mach2
;;
;;
## Suns
- *-sun-sunos* | *-sun-bsd* | *-sun-solaris* | i[34]86-*-solaris2* | i[34]86-*-sunos5* )
+ *-sun-sunos* | *-sun-bsd* | *-sun-solaris* | i[345]86-*-solaris2* | i[345]86-*-sunos5* )
case "${canonical}" in
m68*-sunos1* ) machine=sun1 ;;
m68*-sunos2* ) machine=sun2 ;;
m68* ) machine=sun3 ;;
- i[34]86-sun-sunos[34]* ) machine=sun386 ;;
- i[34]86-*-* ) machine=intel386 ;;
+ i[345]86-sun-sunos[34]* ) machine=sun386 ;;
+ i[345]86-*-* ) machine=intel386 ;;
sparc* ) machine=sparc ;;
* ) unported=true ;;
esac
case "${canonical}" in
## The Sun386 didn't get past 4.0.
- i386-*-sunos4 ) opsys=sunos4-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
;;
## Intel 386 machines where we don't care about the manufacturer
- i[34]86-*-* )
+ i[345]86-*-* )
machine=intel386
case "${canonical}" in
*-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
AC_PROG_YACC
dnl checks for UNIX variants that set `DEFS'
+AC_AIX
dnl checks for header files
-AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h)
+AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h utime.h)
AC_STDC_HEADERS
AC_TIME_WITH_SYS_TIME
dnl In Autoconf 1.8 use AC_SYS_SIGLIST_DECLARED instead of this.
#include <unistd.h>
#endif], [char *msg = *(sys_siglist + 1);],
AC_DEFINE(SYS_SIGLIST_DECLARED))
+dnl Some systems have utime.h but don't declare the struct anyplace.
+AC_COMPILE_CHECK(struct utimbuf, [#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#endif], [static struct utimbuf x; x.actime = x.modtime;],
+ AC_DEFINE(HAVE_STRUCT_UTIMBUF))
dnl checks for typedefs
AC_RETSIGTYPE
+AC_COMPILE_CHECK(struct timeval, [#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif], [static struct timeval x; x.tv_sec = x.tv_usec;],
+ AC_DEFINE(HAVE_TIMEVAL))
dnl checks for structure members
AC_STRUCT_TM
# 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"/'`
# 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 rand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid strerror \
-fpathconf)
+random lrand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid \
+strerror fpathconf select)
ok_so_far=true
AC_FUNC_CHECK(socket, , ok_so_far=)
AC_SUBST(opsysfile)
AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "\"${configuration}\"")
+AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "\"${config_options}\"")
AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"")
AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
HCoop / bpt / emacs.git / blobdiff