dnl To rebuild the `configure' script from this, execute the command
dnl autoconf
dnl in the directory containing this script. You must have autoconf
-dnl version 1.7 or later.
+dnl version 1.8 or later.
dnl
dnl The following text appears in the resulting `configure' script,
dnl explaining how to rebuild it.
#echo "${progname}: the \`--${optname}' option is supposed to have a value
#which is \`yes', \`no', \`lucid', \`athena', \`motif' or \`open-look'."
echo "${progname}: the \`--${optname}' option is supposed to have a value
-which is \`yes', \`no', \`lucid', or \`athena'."
+which is \`yes', \`no', \`lucid', or \`athena'.
+Currently, \`yes', \`athena' and \`lucid' are synonyms."
echo "${short_usage}") >&2
exit 1
;;
;;
## Data General AViiON Machines
+ m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* )
+ machine=aviion opsys=dgux5-4r3
+ ;;
+ m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* )
+ machine=aviion opsys=dgux5-4r2
+ ;;
m88k-dg-dgux* )
machine=aviion opsys=dgux
;;
## HP 9000 series 700 and 800, running HP/UX
hppa*-hp-hpux7* )
- machine=hp9000s800 opsys=hpux
+ machine=hp800 opsys=hpux
;;
hppa*-hp-hpux8* )
- machine=hp9000s800 opsys=hpux8
+ machine=hp800 opsys=hpux8
;;
hppa*-hp-hpux9* )
- machine=hp9000s800 opsys=hpux9
+ machine=hp800 opsys=hpux9
;;
## HP 9000 series 700 and 800, running HP/UX
case "`uname -r`" in
## Someone's system reports A.B8.05 for this.
## I wonder what other possibilities there are.
- *.B8.* ) machine=hp9000s800 opsys=hpux8 ;;
- *.08.* ) machine=hp9000s800 opsys=hpux8 ;;
- *.09.* ) machine=hp9000s800 opsys=hpux9 ;;
- *) machine=hp9000s800 opsys=hpux ;;
+ *.B8.* ) machine=hp800 opsys=hpux8 ;;
+ *.08.* ) machine=hp800 opsys=hpux8 ;;
+ *.09.* ) machine=hp800 opsys=hpux9 ;;
+ *) machine=hp800 opsys=hpux ;;
esac
;;
machine=symmetry opsys=bsd4-3
;;
- ## Unspecified sysv on an ncr machine defaults to svr4.
+ ## 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* )
- machine=intel386 opsys=usg5-4
+ machine=intel386 opsys=usg5-4-2
;;
## Intel 860
machine=i860 opsys=usg5-4
;;
- ## Silicon Graphics machines
- ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030)
- m68*-sgi-iris3.5* )
- machine=irist opsys=iris3-5
- ;;
- m68*-sgi-iris3.6* | m68*-sgi-iris*)
- machine=irist opsys=iris3-6
- ;;
- ## Iris 4D
- mips-sgi-irix3.* )
- machine=iris4d opsys=irix3-3
- ;;
- mips-sgi-irix5.* )
- machine=iris4d opsys=irix5-0
- ;;
- mips-sgi-irix4.* | mips-sgi-irix* )
- machine=iris4d opsys=irix4-0
- ;;
-
## Masscomp machines
m68*-masscomp-rtu* )
machine=masscomp opsys=rtu
machine=sequent opsys=bsd4-3
;;
+ ## Siemens Nixdorf
+ mips-siemens-sysv* )
+ machine=mips-siemens opsys=usg5-4
+ NON_GNU_CC=/usr/ccs/bin/cc
+ NON_GNU_CPP=/usr/ccs/bin/cc -E
+ ;;
+
+ ## Silicon Graphics machines
+ ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030)
+ m68*-sgi-iris3.5* )
+ machine=irist opsys=iris3-5
+ ;;
+ m68*-sgi-iris3.6* | m68*-sgi-iris*)
+ machine=irist opsys=iris3-6
+ ;;
+ ## Iris 4D
+ mips-sgi-irix3.* )
+ machine=iris4d opsys=irix3-3
+ ;;
+ mips-sgi-irix5.* )
+ machine=iris4d opsys=irix5-0
+ ;;
+ mips-sgi-irix4.* | mips-sgi-irix* )
+ machine=iris4d opsys=irix4-0
+ ;;
+
## SONY machines
m68*-sony-bsd4.2* )
machine=news opsys=bsd4-2
]
AC_PREPARE(lisp)
+ifdef([AC_LANG_C], AC_LANG_C)dnl
AC_CONFIG_HEADER(src/config.h)
[
dnl checks for compiler characteristics
AC_CONST
+dnl check for Make feature
+AC_SET_MAKE
+
dnl checks for operating system services
AC_LONG_FILE_NAMES
;;
no )
window_system=${window_system}none
-esac
-case "${with_x11}" in
- yes )
- window_system=${window_system}x11
;;
esac
-case "${with_x10}" in
- yes )
- window_system=${window_system}x10
+case "${window_system}" in
+ .* )
+ ;;
+ * )
+ case "${with_x11}" in
+ yes )
+ window_system=x11
+ ;;
+ no )
+ window_system=none
+ ;;
+ esac
+ case "${with_x10}" in
+ yes )
+ window_system=x10
+ ;;
+ no )
+ window_system=none
+ ;;
+ esac
;;
esac
;;
esac
+case "${window_system}" in
+ "" | "x11" )
+ ### If the user hasn't specified where we should find X, try
+ ### letting autoconf figure that out.
+ if [ -z "${x_includes}" ] && [ -z "${x_libraries}" ]; then
+ ]
+ AC_FIND_X
+ [
+ fi
+ if [ -n "${x_includes}" ] || [ -n "${x_libraries}" ]; then
+ window_system=x11
+ fi
+ ;;
+esac
+
[ -z "${window_system}" ] && window_system=none
[ -n "${x_libraries}" ] && LD_SWITCH_X_SITE="-L${x_libraries}"
dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks,
dnl and also adds -ldnet to LIBS, which Autoconf uses for checks.
AC_HAVE_LIBRARY(-ldnet)
+dnl This causes -lresolv to get used in subsequent tests,
+dnl which causes failures on some systems such as HPUX 9.
+dnl AC_HAVE_LIBRARY(-lresolv)
AC_HAVE_LIBRARY(-lXbsd, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
[
#### Find out which version of Emacs this is.
version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \
- | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)[."].*$/\1/'`
+ | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
if [ x"${version}" = x ]; then
echo "${progname}: can't find current emacs version in
\`${srcdir}/lisp/version.el'." >&2
#### 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)
+AC_SUBST(configuration)
AC_SUBST(srcdir)
AC_SUBST(prefix)
AC_SUBST(exec_prefix)
AC_SUBST(C_SWITCH_X_SITE)
AC_SUBST(CFLAGS)
AC_SUBST(X_TOOLKIT_TYPE)
+AC_SUBST(machfile)
+AC_SUBST(opsysfile)
+AC_DEFINE_UNQUOTED(CONFIGURATION, "\"${configuration}\"")
AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"")
AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
locallisppath='${srcdir}/site-lisp'
etcdir='${srcdir}/etc'
lockdir='${srcdir}/lock'
- archlibdir=`(cd lib-src && pwd)`
- docdir=`(cd etc && pwd)`
+ # We used to make archlibdir and docdir absolute,
+ # but that caused trouble with automounters.
+ archlibdir='${srcdir}/lib-src'
+ docdir='${srcdir}/etc'
infodir='${srcdir}/info'
elif [ "$single_tree" = "1" ]; then
if [ "$exec_prefix_specified" = "" ]; then
test -n "${exec_prefix}" &&
exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
]
-AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile lwlib/Makefile src/Makefile.in, [
+AC_OUTPUT(Makefile lib-src/Makefile.in oldXMenu/Makefile lwlib/Makefile src/Makefile.in, [
# Build src/Makefile from ${srcdir}/src/Makefile.in. This must be done
# after src/config.h is built, since we rely on that file.
# the C preprocessor to some helpful value like 1, or maybe the empty
# string. Needless to say consequent macro substitutions are less
# than conducive to the makefile finding the correct directory.
-undefs="`echo $top_srcdir $configuration |
-sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/ */ -U/g' \
- -e 's/ -U$//' -e 's/^[^ ]/-U/' \
- -e 's/-U[0-9][^ ]*//g' \
+undefs="`echo $top_srcdir $configuration $canonical |
+sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
+ -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g' \
`"
changequote([,])dnl
+echo creating lib-src/Makefile
+( cd lib-src
+ rm -f junk.c junk1.c junk2.c
+ sed -e '/start of cpp stuff/q' \
+ < Makefile.in > junk1.c
+ sed -e '1,/start of cpp stuff/d'\
+ -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
+ < Makefile.in > junk.c
+ $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+ sed -e 's/^ / /' -e '/^#/d' -e '/^[ \f]*$/d' > junk2.c
+ cat junk1.c junk2.c > Makefile.new
+ rm -f junk.c junk1.c junk2.c
+ chmod 444 Makefile.new
+ mv -f Makefile.new Makefile
+)
+
echo creating src/Makefile
( cd src
- rm -f junk.c
- sed -e 's@^# \(Generated.*\)$@/* \1 */@' \
+ rm -f junk.c junk1.c junk2.c
+ sed -e '/start of cpp stuff/q' \
+ < Makefile.in > junk1.c
+ sed -e '1,/start of cpp stuff/d'\
-e 's@/\*\*/#\(.*\)$@/* \1 */@' \
< Makefile.in > junk.c
- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c |
- sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > Makefile.new
- rm -f junk.c
- chmod 444 Makefile.new;
- mv -f Makefile.new Makefile;
+ $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+ sed -e 's/^ / /' -e '/^#/d' -e '/^[ \f]*$/d' > junk2.c
+ cat junk1.c junk2.c > Makefile.new
+ rm -f junk.c junk1.c junk2.c
+ chmod 444 Makefile.new
+ mv -f Makefile.new Makefile
)])
-
-# Now recalculate libsrc_libs based on the new decisions made above,
-# and substitute it into lib-src/Makefile.
-# This is necessary in case the m/ or s/ file contains conditionals
-# that test macros defined by config.h.
-
-[
-echo '
-#include "config.h"
-#ifndef LIBS_MACHINE
-#define LIBS_MACHINE
-#endif
-#ifndef LIBS_SYSTEM
-#define LIBS_SYSTEM
-#endif
-configure___ libsrc_libs=LIBS_MACHINE LIBS_SYSTEM
-' > ${tempcname}
-eval `${CPP} -Isrc -I${srcdir}/src ${tempcname} \
- | grep 'configure___' \
- | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'`
-rm ${tempcname}
-
-cat lib-src/Makefile | sed -e "s/@libsrc_libs@/$libsrc_libs/" > lib-src/Makefoo
-mv lib-src/Makefoo lib-src/Makefile
-]