exec_prefix="${val}"
;;
+ ## Verbose flag, tested by autoconf macros.
+ "verbose" )
+ verbose=yes
+ ;;
+
## Has the user asked for some help?
"usage" | "help" )
echo "${short_usage}" | more
### Canonicalize the configuration name.
echo "Checking the configuration name."
-if configuration=`${srcdir}/config.sub "${configuration}"` ; then : ; else
+if canonical=`${srcdir}/config.sub "${configuration}"` ; then : ; else
exit $?
fi
### confusion between `system' and `release' levels'."
machine='' opsys='' unported='false'
-case "${configuration}" in
+case "${canonical}" in
## Alliant machines
## Strictly speaking, we need the version of the alliant operating
machine=7300 opsys=usg5-2-2
;;
+ ## Bull dpx2
+ m68*-bull-sysv3* )
+ machine=dpx2 opsys=usg5-3
+ ;;
+
## Bull sps7
- m68*-bull-sysv* )
+ m68*-bull-sysv2* )
machine=sps7 opsys=usg5-2
;;
## Suns
*-sun-sunos* | *-sun-bsd* | *-sun-solaris* )
- case "${configuration}" in
+ case "${canonical}" in
m68*-sunos1* ) machine=sun1 ;;
m68*-sunos2* ) machine=sun2 ;;
m68* ) machine=sun3 ;;
sparc* ) machine=sparc ;;
* ) unported=true ;;
esac
- case "${configuration}" in
+ case "${canonical}" in
*-sunos4.0* ) opsys=sunos4-0 ;;
*-sunos4.1.3* ) opsys=sunos4-1-3 ;;
*-sunos4* | *-sunos ) opsys=sunos4-1 ;;
## Vaxen.
vax-dec-* )
machine=vax
- case "${configuration}" in
+ case "${canonical}" in
*-bsd4.1 ) opsys=bsd4-1 ;;
*-bsd4.2 | *-ultrix[0-3].* | *-ultrix4.0 ) opsys=bsd4-2 ;;
*-bsd4.3 | *-ultrix* ) opsys=bsd4-3 ;;
## Intel 386 machines where we don't care about the manufacturer
i[34]86-*-* )
machine=intel386
- case "${configuration}" in
+ case "${canonical}" in
*-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
*-isc2.2 ) opsys=isc2-2 ;;
*-isc* ) opsys=isc3-0 ;;
### runs, it's cleaner to make it explicit in the case statement
### above.
if [ x"${opsys}" = x ]; then
- case "${configuration}" in
+ case "${canonical}" in
*-bsd4.[01] ) opsys=bsd4-1 ;;
*-bsd4.2 ) opsys=bsd4-2 ;;
*-bsd4.3 ) opsys=bsd4-3 ;;
fi
if $unported ; then
- (echo "${progname}: Emacs hasn't been ported to \`${configuration}' systems."
+ (echo "${progname}: Emacs hasn't been ported to \`${canonical}' systems."
echo "${progname}: Check \`etc/MACHINES' for recognized configuration names."
) >&2
exit 1
dnl checks for functions
AC_ALLOCA
-AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename)
+AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename closedir)
dnl checks for structure members
AC_STRUCT_TM
;;
esac
+### If the user hasn't specified where we should find X, try
+### letting autoconf figure that out.
+if [ "0${x_includes}" = 0 ] && [ "0${x_libraries}" = 0 ]; then
+ ]
+ AC_FIND_X
+ [
+ if [ "0${x_includes}" != 0 ]; then
+ C_SWITCH_X_SITE="-I\"${x_includes}\""
+ fi
+ if [ "0${x_libraries}" != 0 ]; then
+ LD_SWITCH_X_SITE="-L\"${x_libraries}\""
+ fi
+fi
+
case "${window_system}" in
"none" | "x11" | "x10" ) ;;
"" )
;;
esac
-### Check for XFree386. It needs special hacks.
-lib_havexbsd=no
-]
-AC_HAVE_LIBRARY( Xbsd , have_libxbsd=yes , have_libxbsd=no )
-[
-if [ -n "${x_libraries}" ] && [ -f ${x_libraries}/libXbsd.a ]; then
- have_libxbsd=yes
-fi
-
-case ${window_system} in
- x11 )
- if [ -d /usr/X386/include ] && [ "${have_libxbsd}" = "yes" ]; then
- HAVE_XFREE386=yes
- if [ "${C_SWITCH_X_SITE}" = "" ]; then
- C_SWITCH_X_SITE="-I/usr/X386/include"
- fi
- fi
- ;;
-esac
-
#### Extract some information from the operating system and machine files.
echo "Examining the machine- and system-dependent files to find out"
CFLAGS="$CFLAGS_save"
LIBS="$LIBS_save"
+case "${window_system}:${LIBS}" in
+ x11:*-lXbsd* )
+ if [ -d /usr/X386/include ]; then
+ HAVE_XFREE386=yes
+ if [ "${C_SWITCH_X_SITE}" = "" ]; then
+ C_SWITCH_X_SITE="-I/usr/X386/include"
+ fi
+ fi
+ ;;
+esac
#### Find out which version of Emacs this is.
version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \
#### Specify what sort of things we'll be editing into Makefile and config.h.
+### Use configuration here uncanonicalized to avoid exceeding size limits.
]
AC_SUBST(configuration)
AC_SUBST(version)
#### Report on what we decided to do.
echo "
-Configured for \`${configuration}'.
+Configured for \`${canonical}'.
Where should the build process find the source code? ${srcdir}
What operating system and machine description files should Emacs use?