etcdir='${datadir}/emacs/${version}/etc'
lockdir='${statedir}/emacs/lock'
archlibdir='${libdir}/emacs/${version}/${configuration}'
-CC=
+docdir='${datadir}/emacs/${version}/etc'
# On Sun systems, people sometimes set up the variable CPP
# with a value that is a directory, not an executable at all.
## Has the user specified which toolkit they want to support?
"with_x_toolkit" )
- ## Make sure the value given was either "yes" or "no".
case "${val}" in
y | ye | yes ) val=athena ;;
n | no ) val=no ;;
l | lu | luc | luci | lucid ) val=lucid ;;
a | at | ath | athe | athena ) val=athena ;;
- m | mo | mot | moti | motif ) val=motif ;;
- o | op | ope | open | open- | open-l | open-lo \
- | open-loo | open-look ) val=open-look ;;
+# These don't currently work.
+# m | mo | mot | moti | motif ) val=motif ;;
+# o | op | ope | open | open- | open-l | open-lo \
+# | open-loo | open-look ) val=open-look ;;
* )
- (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', \`athena', \`motif' or \`open-look'."
+echo "${progname}: the \`--${optname}' option is supposed to have a value
+which is \`yes', \`no', \`lucid', or \`athena'."
echo "${short_usage}") >&2
exit 1
;;
## Has the user specified one of the path options?
prefix | exec_prefix | bindir | libdir | etcdir | datadir | \
archlibdir | statedir | mandir | infodir | lispdir | lockdir | \
- lisppath | locallisppath )
+ lisppath | locallisppath | docdir )
## If the value was omitted, get it from the next argument.
if [ "${valomitted}" = "yes" ]; then
if [ $# = 0 ]; then
machine=7300 opsys=usg5-2-2
;;
+ ## Bull dpx20
+ rs6000-bull-bosx* )
+ machine=ibmrs6000 opsys=aix3-2
+ ;;
+
## Bull dpx2
m68*-bull-sysv3* )
machine=dpx2 opsys=usg5-3
;;
## Motorola Delta machines
- m68*-motorola-sysv* )
+ m68k-motorola-sysv* | m68000-motorola-sysv* )
machine=delta opsys=usg5-3
+ if [ -z "`type gnucc | grep 'not found'`" ]
+ then CC=gnucc
+ else
+ if [ -z "`type gcc | grep 'not found'`" ]
+ then CC=gcc
+ else CC=cc
+ fi
+ fi
;;
m88k-motorola-sysv4* )
machine=delta88k opsys=usg5-4
rs6000-ibm-aix3.1* )
machine=ibmrs6000 opsys=aix3-1
;;
+ rs6000-ibm-aix3.2.5)
+ machine=ibmrs6000 opsys=aix3-2-5
+ ;;
rs6000-ibm-aix3.2* | rs6000-ibm-aix* )
machine=ibmrs6000 opsys=aix3-2
;;
mips-sony-bsd* )
machine=news-risc opsys=bsd4-3
;;
+ mips-sony-newsos* )
+ machine=mips opsys=newsos5
+ ;;
## Stride
m68*-stride-sysv* )
*-sco3.2v4* ) opsys=sco4 ;;
*-bsd386* ) opsys=bsd386 ;;
*-386bsd* ) opsys=386bsd ;;
+ *-freebsd* ) opsys=freebsd ;;
*-netbsd* ) opsys=netbsd ;;
*-nextstep* ) opsys=mach2 ;;
## Otherwise, we'll fall through to the generic opsys code at the bottom.
*-sysv2.2 | *-sysvr2.2 ) opsys=usg5-2-2 ;;
*-sysv3 | *-sysvr3 ) opsys=usg5-3 ;;
*-sysv4 | *-sysvr4 ) opsys=usg5-4 ;;
+ *-sysv4.1 | *-sysvr4.1 )
+ NON_GNU_CPP=/usr/lib/cpp
+ opsys=usg5-4 ;;
*-sysv4.2 | *-sysvr4.2 ) opsys=usg5-4-2 ;;
* )
unported=true
[
#### Choose a compiler.
+if [ "x$CC" = x ]
+then cc_specified=1
+fi
+
case ${with_gcc} in
"yes" ) CC="gcc" GCC=1 ;;
- "no" ) CC=${CC:-"cc"} ;;
+ "no" )
+ if [ "x$CC" = x ]
+ then true;
+ else CC=cc;
+ fi
+ ;;
* )
] AC_PROG_CC [
esac
#### Some systems specify a CPP to use unless we are using GCC.
#### Now that we know whether we are using GCC, we can decide whether
#### to use that one.
-if [ x$NON_GNU_CPP = x ] || [ x$GCC = x1 ]
+if [ "x$NON_GNU_CPP" = x ] || [ x$GCC = x1 ] || [ "x$CPP" = x ]
then true
else
- CPP=$NON_GNU_CPP
+ CPP="$NON_GNU_CPP"
fi
#### Some systems specify a CC to use unless we are using GCC.
#### Now that we know whether we are using GCC, we can decide whether
#### to use that one.
-if [ x$NON_GNU_CC = x ] || [ x$GCC = x1 ]
+if [ "x$NON_GNU_CC" = x ] || [ x$GCC = x1 ] || [ x$cc_specified = x1 ]
then true
else
- CC=$NON_GNU_CC
+ CC="$NON_GNU_CC"
fi
#### Some other nice autoconf tests. If you add a test here which
AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h)
AC_STDC_HEADERS
AC_TIME_WITH_SYS_TIME
+dnl In Autoconf 1.8 use AC_SYS_SIGLIST_DECLARED instead of this.
+AC_COMPILE_CHECK(sys_siglist declaration in signal.h or unistd.h,
+ [#include <signal.h>
+/* NetBSD declares sys_siglist in <unistd.h>. */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif], [char *msg = *(sys_siglist + 1);],
+ AC_DEFINE(SYS_SIGLIST_DECLARED))
dnl checks for typedefs
AC_RETSIGTYPE
#ifndef C_SWITCH_SYSTEM
#define C_SWITCH_SYSTEM
#endif
+#ifndef C_SWITCH_MACHINE
+#define C_SWITCH_MACHINE
+#endif
configure___ libsrc_libs=LIBS_MACHINE LIBS_SYSTEM
configure___ c_switch_system=C_SWITCH_SYSTEM
+configure___ c_switch_machine=C_SWITCH_MACHINE
#ifndef LIB_X11_LIB
#define LIB_X11_LIB -lX11
#### Add the libraries to LIBS and check for some functions.
]
-DEFS="$c_switch_system $DEFS"
+DEFS="$c_switch_system $c_switch_machine $DEFS"
LIBS="$libsrc_libs"
dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks,
if test "${HAVE_X11}" = "yes"; then
DEFS="$C_SWITCH_X_SITE $DEFS"
LIBS="$LD_SWITCH_X_SITE $LIBX $LIBS"
- AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString XScreenNumberOfScreen XSetWMProtocols)
+ AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString \
+XScreenNumberOfScreen XSetWMProtocols)
fi
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 ftime res_init setsid strerror)
+random bcopy bcmp logb frexp fmod drem ftime res_init setsid strerror \
+fpathconf)
ok_so_far=true
AC_FUNC_CHECK(socket, , ok_so_far=)
AC_SUBST(etcdir)
AC_SUBST(lockdir)
AC_SUBST(archlibdir)
+AC_SUBST(docdir)
AC_SUBST(c_switch_system)
+AC_SUBST(c_switch_machine)
AC_SUBST(libsrc_libs)
AC_SUBST(LD_SWITCH_X_SITE)
AC_SUBST(LD_SWITCH_X_SITE_AUX)
AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"")
AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
-AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE_AUX})
+AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE_AUX, ${LD_SWITCH_X_SITE_AUX})
AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE})
AC_DEFINE_UNQUOTED(UNEXEC_SRC, ${UNEXEC_SRC})
locallisppath='${srcdir}/site-lisp'
etcdir='${srcdir}/etc'
lockdir='${srcdir}/lock'
- archlibdir='${srcdir}/lib-src'
+ archlibdir=`(cd lib-src && pwd)`
+ docdir=`(cd etc && pwd)`
infodir='${srcdir}/info'
elif [ "$single_tree" = "1" ]; then
if [ "$exec_prefix_specified" = "" ]; then
if [ "$etcdir_specified" = "" ]; then
etcdir='${prefix}/common/data'
fi
+ if [ "$docdir_specified" = "" ]; then
+ docdir='${prefix}/common/data'
+ fi
fi
#### Report on what we decided to do.
# after src/config.h is built, since we rely on that file.
changequote(,)dnl The horror, the horror.
-# Now get this: Some word that is part of the ${srcdir} directory name might,
-# just might, happen to be an identifier like `sun4' or `i386' or something,
-# and be predefined by 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.
-srcdir_undefs="`echo $top_srcdir |
+# Now get this: Some word that is part of the ${srcdir} directory name
+# or the ${configuration} value might, just might, happen to be an
+# identifier like `sun4' or `i386' or something, and be predefined by
+# 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' \
sed -e 's@^# \(Generated.*\)$@/* \1 */@' \
-e 's@/\*\*/#\(.*\)$@/* \1 */@' \
< Makefile.in > junk.c
- $CPP $srcdir_undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c |
- sed -e 's/^ / /' -e '/^#/d' -e '/^[ ][ ]*$/d' > Makefile.new
+ $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;
HCoop / bpt / emacs.git / blobdiff