X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/f21fadcce44ed1a4bd6b143a77267692867e6f7c..3e0b7b44a8ab678c575f840cf1b51376183e42df:/configure.in diff --git a/configure.in b/configure.in index c1d324fab3..9e9321a3fe 100644 --- a/configure.in +++ b/configure.in @@ -23,7 +23,7 @@ dnl along with GNU Emacs; see the file COPYING. If not, write to the dnl Free Software Foundation, Inc., 59 Temple Place - Suite 330, dnl Boston, MA 02111-1307, USA. -AC_PREREQ(2.51)dnl +AC_PREREQ(2.54)dnl AC_INIT(src/lisp.h) AC_CONFIG_HEADER(src/config.h:src/config.in) @@ -38,6 +38,9 @@ lisppath='${locallisppath}:${lispdir}' etcdir='${datadir}/emacs/${version}/etc' archlibdir='${libexecdir}/emacs/${version}/${configuration}' docdir='${datadir}/emacs/${version}/etc' +gamedir='${localstatedir}/games/emacs' + +gameuser=games AC_ARG_WITH(gcc, [ --without-gcc don't use GCC to compile Emacs if GCC is found]) @@ -48,9 +51,12 @@ AC_ARG_WITH(pop, else : fi], AC_DEFINE(MAIL_USE_POP)) +AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl AC_ARG_WITH(kerberos, [ --with-kerberos support Kerberos-authenticated POP], [AC_DEFINE(KERBEROS)]) +AH_TEMPLATE(KERBEROS, + [Define to support Kerberos-authenticated POP mail retrieval.])dnl AC_ARG_WITH(kerberos5, [ --with-kerberos5 support Kerberos version 5 authenticated POP], [if test "${with_kerberos5+set}" = set; then @@ -59,10 +65,14 @@ AC_ARG_WITH(kerberos5, AC_DEFINE(KERBEROS) fi fi -AC_DEFINE(KERBEROS5)]) +AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.])]) AC_ARG_WITH(hesiod, [ --with-hesiod support Hesiod to get the POP server host], -[AC_DEFINE(HESIOD)]) +[AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])]) + +AC_ARG_WITH(sound, +[ --without-sound don't compile with sound support]) + dnl This should be the last --with option, because --with-x is dnl added later on when we find the path of X, and it's best to dnl keep them together visually. @@ -78,11 +88,11 @@ dnl These don't currently work. dnl o | op | ope | open | open- | open-l | open-lo \ dnl | open-loo | open-look ) val=open-look ;; * ) -dnl AC_MSG_ERROR([the \`--with-x-toolkit' option is supposed to have a value -dnl which is \`yes', \`no', \`lucid', \`athena', \`motif' or \`open-look'.]) -AC_MSG_ERROR([\`--with-x-toolkit=$withval' is invalid\; -this option's value should be \`yes', \`no', \`lucid', \`athena', or \`motif'. -Currently, \`yes', \`athena' and \`lucid' are synonyms.]) +dnl AC_MSG_ERROR([the `--with-x-toolkit' option is supposed to have a value +dnl which is `yes', `no', `lucid', `athena', `motif' or `open-look'.]) +AC_MSG_ERROR([`--with-x-toolkit=$withval' is invalid\; +this option's value should be `yes', `no', `lucid', `athena', or `motif'. +Currently, `yes', `athena' and `lucid' are synonyms.]) ;; esac with_x_toolkit=$val @@ -102,6 +112,8 @@ AC_ARG_WITH(toolkit-scroll-bars, don't use Motif or Xaw3d scroll bars]) AC_ARG_WITH(xim, [ --without-xim don't use X11 XIM]) +AC_ARG_WITH(carbon, +[ --without-carbon don't use Carbon GUI on Mac OS X]) #### Make srcdir absolute, if it isn't already. It's important to #### avoid running the path through pwd unnecessarily, since pwd can @@ -130,23 +142,21 @@ esac #### Check if the source directory already has a configured system in it. if test `pwd` != `(cd ${srcdir} && pwd)` \ && test -f "${srcdir}/src/config.h" ; then - AC_MSG_WARN([The directory tree \`${srcdir}' is being used + AC_MSG_WARN([[The directory tree `${srcdir}' is being used as a build directory right now; it has been configured in its own right. To configure in another directory as well, you MUST use GNU make. If you do not have GNU make, then you must - now do \`make distclean' in ${srcdir}, - and then run $0 again.]) + now do `make distclean' in ${srcdir}, + and then run $0 again.]]) -changequote(, )dnl - extrasub='/^VPATH[ ]*=/c\ -changequote([, ])dnl +[extrasub='/^VPATH[ ]*=/c\ vpath %.c $(srcdir)\ vpath %.h $(srcdir)\ vpath %.y $(srcdir)\ vpath %.l $(srcdir)\ vpath %.s $(srcdir)\ vpath %.in $(srcdir)\ -vpath %.texi $(srcdir)' +vpath %.texi $(srcdir)'] fi #### Given the configuration name, set machfile and opsysfile to the @@ -158,7 +168,11 @@ AC_CANONICAL_HOST canonical=$host configuration=${host_alias-$host} -changequote(, )dnl +dnl This used to use changequote, but, apart from `changequote is evil' +dnl per the autoconf manual, we can speed up autoconf somewhat by quoting +dnl the great gob of text. Thus it's not processed for possible expansion. +dnl Just make sure the brackets remain balanced. +[ ### If you add support for a new configuration, add code to this ### switch statement to recognize your configuration name and select @@ -207,6 +221,7 @@ case "${canonical}" in powerpc-apple-netbsd*) machine=macppc ;; mips-*-netbsd*) machine=pmax ;; mipsel-*-netbsd*) machine=pmax ;; + mipseb-*-netbsd*) machine=pmax ;; ns32k-*-netbsd*) machine=ns32000 ;; powerpc-*-netbsd*) machine=macppc ;; sparc*-*-netbsd*) machine=sparc ;; @@ -605,6 +620,9 @@ case "${canonical}" in rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2* ) machine=ibmrs6000 opsys=aix4-2 ;; + rs6000-ibm-aix5.1* | powerpc-ibm-aix5.1* ) + machine=ibmrs6000 opsys=aix4-2 + ;; rs6000-ibm-aix4.0* | powerpc-ibm-aix4.0* ) machine=ibmrs6000 opsys=aix4 ;; @@ -780,12 +798,6 @@ case "${canonical}" in machine=plexus opsys=usg5-2 ;; - ## PowerPC reference platform - powerpcle-*-solaris2* ) - machine=prep - opsys=sol2-5 - ;; - ## Pyramid machines ## I don't really have any idea what sort of processor the Pyramid has, ## so I'm assuming it is its own architecture. @@ -925,8 +937,13 @@ case "${canonical}" in NON_GNU_CPP=/usr/ccs/lib/cpp RANLIB="ar -ts" ;; + *-sunos5.6* | *-solaris2.6* ) + opsys=sol2-6 + NON_GNU_CPP=/usr/ccs/lib/cpp + RANLIB="ar -ts" + ;; *-sunos5* | *-solaris* ) - opsys=sol2-5 + opsys=sol2-6 NON_GNU_CPP=/usr/ccs/lib/cpp ;; * ) opsys=bsd4-2 ;; @@ -1059,7 +1076,7 @@ case "${canonical}" in ;; ## Mips Linux-based GNU system - mips-*-linux-gnu* ) + mips-*-linux-gnu* | mipsel-*-linux-gnu* ) machine=mips opsys=gnu-linux ;; @@ -1075,6 +1092,18 @@ case "${canonical}" in machine=f301 opsys=uxpv ;; + ## Darwin / Mac OS X + powerpc-apple-darwin* ) + machine=powermac opsys=darwin + # Define CPP as follows to make autoconf work correctly. + CPP="cc -E -traditional-cpp" + ;; + + ## AMD x86-64 Linux-based GNU system + x86_64-*-linux-gnu* ) + machine=amdx86-64 opsys=gnu-linux + ;; + * ) unported=yes ;; @@ -1116,11 +1145,11 @@ if test x"${opsys}" = x; then esac fi -changequote([, ])dnl +] if test $unported = yes; then - AC_MSG_ERROR([Emacs hasn't been ported to \`${canonical}' systems. -Check \`etc/MACHINES' for recognized configuration names.]) + AC_MSG_ERROR([Emacs hasn't been ported to `${canonical}' systems. +Check `etc/MACHINES' for recognized configuration names.]) fi machfile="m/${machine}.h" @@ -1172,16 +1201,6 @@ then CC="$CC $NON_GCC_TEST_OPTIONS" fi -if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x -then - ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" -fi - -if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x -then - ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS" -fi - #### Some other nice autoconf tests. If you add a test here which #### should make an entry in src/config.h, don't forget to add an #### #undef clause to src/config.h.in for autoconf to modify. @@ -1190,10 +1209,24 @@ dnl checks for programs AC_PROG_LN_S AC_PROG_CPP AC_PROG_INSTALL -AC_PROG_YACC if test "x$RANLIB" = x; then AC_PROG_RANLIB fi +AC_PATH_PROG(INSTALL_INFO, install-info) +AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin) +AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin) + +dnl Add our options to ac_link now, after it is set up. + +if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x +then + ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" +fi + +if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x +then + ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS" +fi dnl checks for Unix variants AC_AIX @@ -1320,16 +1353,14 @@ configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}' # The value of CPP is a quoted variable reference, so we need to do this # to get its actual value... CPP=`eval "echo $CPP"` -changequote(, )dnl -eval `${CPP} -Isrc ${tempcname} \ +[eval `${CPP} -Isrc ${tempcname} \ | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'` if test "x$SPECIFIED_CFLAGS" = x; then eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${tempcname} \ | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'` else REAL_CFLAGS="$CFLAGS" -fi -changequote([, ])dnl +fi] rm ${tempcname} ac_link="$ac_link $ld_switch_machine $ld_switch_system" @@ -1342,22 +1373,41 @@ else CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS" fi +dnl For AC_FUNC_GETLOADAVG, at least: +AC_CONFIG_LIBOBJ_DIR(src) + +AC_GNU_SOURCE + dnl Do this early because it can frob feature test macros for Unix-98 &c. AC_SYS_LARGEFILE -# Sound support for GNU/Linux and the free BSDs. -AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h) -# Emulation library used on NetBSD. -AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) -AC_SUBST(LIBSOUND) +if test "${with_sound}" != "no"; then + # Sound support for GNU/Linux and the free BSDs. + AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h) + # Emulation library used on NetBSD. + AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) + AC_SUBST(LIBSOUND) +fi dnl checks for header files AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ - termcap.h stdio_ext.h fcntl.h term.h strings.h coff.h) + termcap.h stdio_ext.h fcntl.h term.h strings.h coff.h pty.h sys/mman.h \ + sys/param.h sys/vlimit.h sys/resource.h) +dnl On Solaris 8 there's a compilation warning for term.h because +dnl it doesn't define `bool'. +AC_CHECK_HEADERS(term.h, , , -) AC_HEADER_STDC AC_HEADER_TIME -AC_DECL_SYS_SIGLIST +AC_CHECK_DECLS([sys_siglist]) +if test $ac_cv_have_decl_sys_siglist != yes; then + # For Tru64, at least: + AC_CHECK_DECLS([__sys_siglist]) + if test $ac_cv_have_decl___sys_siglist = yes; then + AC_DEFINE(sys_siglist, __sys_siglist, + [Define to any substitute for sys_siglist.]) + fi +fi AC_HEADER_SYS_WAIT dnl Some systems have utime.h but don't declare the struct anyplace. @@ -1377,7 +1427,7 @@ AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME #endif], [static struct utimbuf x; x.actime = x.modtime;], emacs_cv_struct_utimbuf=yes, emacs_cv_struct_utimbuf=no)) if test $emacs_cv_struct_utimbuf = yes; then - AC_DEFINE(HAVE_STRUCT_UTIMBUF) + AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [Define to 1 if `struct utimbuf' is declared by .]) fi dnl checks for typedefs @@ -1385,10 +1435,11 @@ AC_TYPE_SIGNAL dnl Check for speed_t typedef. AC_CACHE_CHECK(for speed_t, emacs_cv_speed_t, -AC_TRY_COMPILE([#include ], [speed_t x = 1;], - emacs_cv_speed_t=yes, emacs_cv_speed_t=no)) + [AC_TRY_COMPILE([#include ], [speed_t x = 1;], + emacs_cv_speed_t=yes, emacs_cv_speed_t=no)]) if test $emacs_cv_speed_t = yes; then - AC_DEFINE(HAVE_SPEED_T) + AC_DEFINE(HAVE_SPEED_T, 1, + [Define to 1 if `speed_t' is declared by .]) fi AC_CACHE_CHECK(for struct timeval, emacs_cv_struct_timeval, @@ -1405,7 +1456,7 @@ AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME emacs_cv_struct_timeval=yes, emacs_cv_struct_timeval=no)) HAVE_TIMEVAL=$emacs_cv_struct_timeval if test $emacs_cv_struct_timeval = yes; then - AC_DEFINE(HAVE_TIMEVAL) + AC_DEFINE(HAVE_TIMEVAL, 1, [Define to 1 if `struct timeval' is declared by .]) fi AC_CACHE_CHECK(for struct exception, emacs_cv_struct_exception, @@ -1414,19 +1465,16 @@ AC_TRY_COMPILE([#include ], emacs_cv_struct_exception=yes, emacs_cv_struct_exception=no)) HAVE_EXCEPTION=$emacs_cv_struct_exception if test $emacs_cv_struct_exception != yes; then - AC_DEFINE(NO_MATHERR) + AC_DEFINE(NO_MATHERR, 1, [Define to 1 if you don't have struct exception in math.h.]) fi dnl checks for structure members AC_STRUCT_TM AC_STRUCT_TIMEZONE -AC_CACHE_CHECK(for tm_gmtoff in struct tm, emacs_cv_tm_gmtoff, -AC_TRY_LINK([#include ], [struct tm t; t.tm_gmtoff = 0], - emacs_cv_tm_gmtoff=yes, - emacs_cv_tm_gmtoff=no)) -if test $emacs_cv_tm_gmtoff = yes; then - AC_DEFINE(HAVE_TM_GMTOFF) -fi +AC_CHECK_MEMBER(struct tm.tm_gmtoff, + [AC_DEFINE(HAVE_TM_GMTOFF, 1, + [Define to 1 if `tm_gmtoff' is member of `struct tm'.])],, + [#include ]) dnl checks for compiler characteristics @@ -1448,6 +1496,13 @@ if test $emacs_cv_void_star = yes; then else AC_DEFINE(POINTER_TYPE, char) fi +AH_TEMPLATE(POINTER_TYPE, + [Define as `void' if your compiler accepts `void *'; otherwise + define as `char'.])dnl + +dnl This could be used for targets which can have both byte sexes. +dnl We could presumably replace the hardwired WORDS_BIG_ENDIAN generally. +dnl AC_C_BIGENDIAN dnl check for Make feature AC_PROG_MAKE_SET @@ -1575,7 +1630,8 @@ if test "$doug_lea_malloc" = "yes" ; then GNU_MALLOC_reason=" (Using Doug Lea's new malloc from the GNU C Library.)" fi - AC_DEFINE(DOUG_LEA_MALLOC) + AC_DEFINE(DOUG_LEA_MALLOC, 1, + [Define to 1 if you are using the GNU C Library.]) fi if test x"${REL_ALLOC}" = x; then @@ -1614,8 +1670,9 @@ else fi AC_MSG_RESULT($HAVE_XFREE386) -# Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used -# for the tests that follow. We set it back to REAL_CFLAGS later on. +# Change CFLAGS and CPPFLAGS temporarily so that C_SWITCH_X_SITE gets +# used for the tests that follow. We set them back to REAL_CFLAGS and +# REAL_CPPFLAGS later on. REAL_CPPFLAGS="$CPPFLAGS" @@ -1679,7 +1736,7 @@ if test "${HAVE_X11}" = "yes"; then emacs_xkb=yes, emacs_xkb=no) AC_MSG_RESULT($emacs_xkb) if test $emacs_xkb = yes; then - AC_DEFINE(HAVE_XKBGETKEYBOARD) + AC_DEFINE(HAVE_XKBGETKEYBOARD, 1, [Define to 1 if you have the XkbGetKeyboard function.]) fi AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \ @@ -1696,7 +1753,8 @@ fail; ], emacs_cv_x11_version_6=yes, emacs_cv_x11_version_6=no)]) if test $emacs_cv_x11_version_6 = yes; then AC_MSG_RESULT(6 or newer) - AC_DEFINE(HAVE_X11R6) + AC_DEFINE(HAVE_X11R6, 1, + [Define to 1 if you have the X11R6 or newer version of Xlib.]) else AC_MSG_RESULT(before 6) fi @@ -1713,7 +1771,8 @@ fail; if test $emacs_cv_x11_version_5 = yes; then AC_MSG_RESULT(5 or newer) HAVE_X11R5=yes - AC_DEFINE(HAVE_X11R5) + AC_DEFINE(HAVE_X11R5, 1, + [Define to 1 if you have the X11R5 or newer version of Xlib.]) else HAVE_X11R5=no AC_MSG_RESULT(before 5) @@ -1757,7 +1816,8 @@ fail; HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6 if test $emacs_cv_x11_toolkit_version_6 = yes; then AC_MSG_RESULT(6 or newer) - AC_DEFINE(HAVE_X11XTR6) + AC_DEFINE(HAVE_X11XTR6, 1, + [Define to 1 if you have the X11R6 or newer version of Xt.]) else AC_MSG_RESULT(before 6) fi @@ -1782,6 +1842,29 @@ if test "${HAVE_X11}" = "yes"; then fi if test "${USE_X_TOOLKIT}" = "MOTIF"; then + AC_CACHE_CHECK(for LessTif where some systems put it, emacs_cv_lesstif, + # We put this in CFLAGS temporarily to precede other -I options + # that might be in CFLAGS temporarily. + # We put this in CPPFLAGS where it precedes the other -I options. + OLD_CPPFLAGS=$CPPFLAGS + OLD_CFLAGS=$CFLAGS + CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS" + CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS" + [AC_TRY_COMPILE([#include ], + [int x = 5;], + emacs_cv_lesstif=yes, emacs_cv_lesstif=no)]) + if test $emacs_cv_lesstif = yes; then + # Make sure this -I option remains in CPPFLAGS after it is set + # back to REAL_CPPFLAGS. + # There is no need to change REAL_CFLAGS, because REAL_CFLAGS does not + # have those other -I options anyway. Ultimately, having this + # directory ultimately in CPPFLAGS will be enough. + REAL_CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $REAL_CPPFLAGS" + LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS" + else + CFLAGS=$OLD_CFLAGS + CPPFLAGS=$OLD_CPPFLAGS + fi AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1, [AC_TRY_COMPILE([#include ], [#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1) @@ -1793,10 +1876,12 @@ Motif version prior to 2.1. HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1 if test $emacs_cv_motif_version_2_1 = yes; then HAVE_LIBXP=no - AC_DEFINE(HAVE_MOTIF_2_1) + AC_DEFINE(HAVE_MOTIF_2_1, 1, + [Define to 1 if you have Motif 2.1 or newer.]) AC_CHECK_LIB(Xp, XpCreateContext, HAVE_LIBXP=yes) if test ${HAVE_LIBXP} = yes; then - AC_DEFINE(HAVE_LIBXP) + AC_DEFINE(HAVE_LIBXP, 1, + [Define to 1 if you have the Xp library (-lXp).]) fi fi fi @@ -1805,10 +1890,13 @@ fi HAVE_XAW3D=no if test "${HAVE_X11}" = "yes"; then if test "${USE_X_TOOLKIT}" != "none"; then + dnl Fixme: determine what Scrollbar.h needs to avoid compilation + dnl errors from the test without the `-'. AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h, - AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes)) + [AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes)], , -) if test "${HAVE_XAW3D}" = "yes"; then - AC_DEFINE(HAVE_XAW3D) + AC_DEFINE(HAVE_XAW3D, 1, + [Define to 1 if you have the Xaw3d library (-lXaw3d).]) fi fi fi @@ -1817,6 +1905,8 @@ dnl Use toolkit scroll bars if configured for X toolkit and either dnl using Motif or Xaw3d is available, and unless dnl --with-toolkit-scroll-bars=no was specified. +AH_TEMPLATE(USE_TOOLKIT_SCROLL_BARS, + [Define to 1 if we should use toolkit scroll bars.])dnl USE_TOOLKIT_SCROLL_BARS=no if test "${with_toolkit_scroll_bars}" != "no"; then if test "${USE_X_TOOLKIT}" != "none"; then @@ -1835,7 +1925,8 @@ dnl Don't use X11 input methods if user specifies he doesn't want it dnl with `--with-xim=no'. if test "${with_xim}" != "no"; then - AC_DEFINE(USE_XIM) + AC_DEFINE(USE_XIM, 1, + [Define to 1 if we should use XIM, if it is available.]) fi ### Use -lXpm if available, unless `--with-xpm=no'. @@ -1862,7 +1953,7 @@ no_return_alloc_pixels fi if test "${HAVE_XPM}" = "yes"; then - AC_DEFINE(HAVE_XPM) + AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).]) fi fi @@ -1870,18 +1961,16 @@ fi HAVE_JPEG=no if test "${HAVE_X11}" = "yes"; then if test "${with_jpeg}" != "no"; then - dnl Checking for jpeglib.h can lose becsue of a redefinition of + dnl Checking for jpeglib.h can lose because of a redefinition of dnl HAVE_STDLIB_H. AC_CHECK_HEADER(jerror.h, AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)) fi + AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl if test "${HAVE_JPEG}" = "yes"; then AC_DEFINE(HAVE_JPEG) - AC_EGREP_CPP( -changequote({, })dnl avoid leadingspace on the next line -{version= *(6[2-9]|[7-9][0-9])}, -changequote([, ])dnl + AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])], [#include version=JPEG_LIB_VERSION ], @@ -1900,7 +1989,7 @@ if test "${HAVE_X11}" = "yes"; then fi if test "${HAVE_PNG}" = "yes"; then - AC_DEFINE(HAVE_PNG) + AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).]) fi fi @@ -1916,7 +2005,7 @@ if test "${HAVE_X11}" = "yes"; then fi if test "${HAVE_TIFF}" = "yes"; then - AC_DEFINE(HAVE_TIFF) + AC_DEFINE(HAVE_TIFF, 1, [Define to 1 if you have the tiff library (-ltiff).]) fi fi @@ -1931,10 +2020,20 @@ if test "${HAVE_X11}" = "yes"; then fi if test "${HAVE_GIF}" = "yes"; then - AC_DEFINE(HAVE_GIF) + AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have the ungif library (-lungif).]) fi fi +### Use Mac OS X Carbon API to implement GUI. +HAVE_CARBON=no +if test "${with_carbon}" != "no"; then + AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes) +fi + +if test "${HAVE_CARBON}" = "yes"; then + AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.]) +fi + ### Use session management (-lSM -lICE) if available HAVE_X_SM=no if test "${HAVE_X11}" = "yes"; then @@ -1942,7 +2041,7 @@ if test "${HAVE_X11}" = "yes"; then AC_CHECK_LIB(SM, SmcOpenConnection, HAVE_X_SM=yes, -lICE)) if test "${HAVE_X_SM}" = "yes"; then - AC_DEFINE(HAVE_X_SM) + AC_DEFINE(HAVE_X_SM, 1, [Define to 1 if you have the SM library (-lSM).]) case "$LIBS" in *-lSM*) ;; *) LIBS="-lSM -lICE $LIBS" ;; @@ -1957,7 +2056,7 @@ AC_CACHE_CHECK(whether netdb declares h_errno, [return h_errno;], emacs_cv_netdb_declares_h_errno=yes, emacs_cv_netdb_declares_h_errno=no)]) if test $emacs_cv_netdb_declares_h_errno = yes; then - AC_DEFINE(HAVE_H_ERRNO) + AC_DEFINE(HAVE_H_ERRNO, 1, [Define to 1 if netdb.h declares h_errno.]) fi AC_FUNC_ALLOCA @@ -1982,31 +2081,36 @@ if test "$ac_cv_lib_lockfile_maillock" = no; then if test $ac_cv_prog_liblockfile = yes; then AC_MSG_ERROR([Shared liblockfile found but can't link against it. This probably means that movemail could lose mail. -There may be a \`development' package to install containing liblockfile.]) - else AC_DEFINE(LIBMAIL, -llockfile) +There may be a `development' package to install containing liblockfile.]) + else AC_DEFINE(LIBMAIL, -llockfile, [Define to -llockfile if it is usable.]) fi else : fi AC_CHECK_FUNCS(touchlock) AC_CHECK_HEADERS(maillock.h) -AC_CHECK_FUNCS(gethostname getdomainname getpeername dup2 \ +AC_CHECK_FUNCS(gethostname getdomainname dup2 \ rename closedir mkdir rmdir sysinfo \ random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \ strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \ utimes setrlimit setpgid getcwd getwd shutdown strftime getaddrinfo \ __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \ -gai_strerror mkstemp) +sendto recvfrom getsockopt setsockopt getsockname getpeername \ +gai_strerror mkstemp getline getdelim mremap memmove fsync bzero memset) + +AC_CHECK_HEADERS(sys/un.h) AC_FUNC_MKTIME if test "$ac_cv_func_working_mktime" = no; then - AC_DEFINE(BROKEN_MKTIME) + AC_DEFINE(BROKEN_MKTIME, 1, [Define to 1 if the mktime function is broken.]) fi AC_FUNC_GETLOADAVG AC_FUNC_FSEEKO +AC_FUNC_GETPGRP + # UNIX98 PTYs. AC_CHECK_FUNCS(grantpt) @@ -2028,12 +2132,15 @@ if test "$with_hesiod" = yes ; then [AC_CHECK_LIB(resolv, __res_send, resolv=yes)])])]) if test "$resolv" = yes ; then RESOLVLIB=-lresolv - AC_DEFINE(HAVE_LIBRESOLV) + AC_DEFINE(HAVE_LIBRESOLV, 1, + [Define to 1 if you have the resolv library (-lresolv).]) else RESOLVLIB= fi AC_CHECK_FUNC(hes_getmailhost, , [AC_CHECK_LIB(hesiod, hes_getmailhost, - AC_DEFINE(HAVE_LIBHESIOD), :, $RESOLVLIB)]) + AC_DEFINE(HAVE_LIBHESIOD, 1, + [Define to 1 if you have the hesiod library (-lhesiod).]), + :, $RESOLVLIB)]) fi # These tell us which Kerberos-related libraries to use. @@ -2107,14 +2214,16 @@ else fi])dnl AC_MSG_RESULT($emacs_cv_localtime_cache) if test $emacs_cv_localtime_cache = yes; then - AC_DEFINE(LOCALTIME_CACHE) + AC_DEFINE(LOCALTIME_CACHE, 1, + [Define to 1 if localtime caches TZ.]) fi if test "x$HAVE_TIMEVAL" = xyes; then AC_CHECK_FUNCS(gettimeofday) - AC_CACHE_CHECK(whether gettimeofday can accept two arguments, - emacs_cv_gettimeofday_two_arguments, - [AC_TRY_COMPILE([ + if test $ac_cv_func_gettimeofday = yes; then + AC_CACHE_CHECK(whether gettimeofday can accept two arguments, + emacs_cv_gettimeofday_two_arguments, + [AC_TRY_COMPILE([ #ifdef TIME_WITH_SYS_TIME #include #include @@ -2125,12 +2234,14 @@ if test "x$HAVE_TIMEVAL" = xyes; then #include #endif #endif], - [struct timeval time; - gettimeofday (&time, 0);], - emacs_cv_gettimeofday_two_arguments=yes, - emacs_cv_gettimeofday_two_arguments=no)]) - if test $emacs_cv_gettimeofday_two_arguments = no; then - AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT) + [struct timeval time; + gettimeofday (&time, 0);], + emacs_cv_gettimeofday_two_arguments=yes, + emacs_cv_gettimeofday_two_arguments=no)]) + if test $emacs_cv_gettimeofday_two_arguments = no; then + AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT, 1, + [Define to 1 if gettimeofday accepts only one argument.]) + fi fi fi @@ -2172,37 +2283,72 @@ if test $ok_so_far = yes; then AC_CHECK_HEADER(arpa/inet.h, , ok_so_far=no) fi if test $ok_so_far = yes; then - AC_DEFINE(HAVE_INET_SOCKETS) +dnl Fixme: Not used. Should this be HAVE_SOCKETS? + AC_DEFINE(HAVE_INET_SOCKETS, 1, + [Define to 1 if you have inet sockets.]) fi if test -f /usr/lpp/X11/bin/smt.exp; then - AC_DEFINE(HAVE_AIX_SMT_EXP) + AC_DEFINE(HAVE_AIX_SMT_EXP, 1, + [Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists.]) fi AC_MSG_CHECKING(whether system supports dynamic ptys) if test -d /dev/pts && ls -d /dev/ptmx > /dev/null 2>&1 ; then AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DEV_PTMX) + AC_DEFINE(HAVE_DEV_PTMX, 1, [Define to 1 if dynamic ptys are supported.]) else AC_MSG_RESULT(no) fi AC_FUNC_FORK -# Fixme: This should be replaced when we have autoconf 2.14. -AC_SIZE_T +AC_CHECK_TYPES(size_t) + +dnl Restrict could probably be used effectively other than in regex.c. +AC_CACHE_CHECK([for C restrict keyword], emacs_cv_c_restrict, + [AC_TRY_COMPILE([void fred (int *restrict x);], [], + emacs_cv_c_restrict=yes, + [AC_TRY_COMPILE([void fred (int *__restrict x);], [], + emacs_cv_c_restrict=__restrict, + emacs_cv_c_restrict=no)])]) +case "$emacs_cv_c_restrict" in + yes) emacs_restrict=restrict;; + no) emacs_restrict="";; + *) emacs_restrict="$emacs_cv_c_restrict";; +esac +if test "$emacs_restrict" != __restrict; then + AC_DEFINE_UNQUOTED(__restrict, $emacs_restrict, + [Define to compiler's equivalent of C99 restrict keyword. + Don't define if equivalent is `__restrict'.]) +fi + +AC_CACHE_CHECK([for C restricted array declarations], emacs_cv_c_restrict_arr, + [AC_TRY_COMPILE([void fred (int x[__restrict]);], [], + emacs_cv_c_restrict_arr=yes, emacs_cv_c_restrict_arr=no)]) +if test "$emacs_cv_c_restrict_arr" = yes; then + AC_DEFINE(__restrict_arr, __restrict, + [Define to compiler's equivalent of C99 restrict keyword in array + declarations. Define as empty for no equivalent.]) +fi + +AC_CHECK_HEADERS(nlist.h, [AC_DEFINE(NLIST_STRUCT, 1, + [Define to 1 if you have .])]) + +dnl Fixme: AC_SYS_POSIX_TERMIOS should probably be used, but it's not clear +dnl how the tty code is related to POSIX and/or other versions of termios. + +dnl Fixme: Use AC_FUNC_MEMCMP since memcmp is used. (Needs libobj replacement.) # Set up the CFLAGS for real compilation, so we can substitute it. CFLAGS="$REAL_CFLAGS" CPPFLAGS="$REAL_CPPFLAGS" -changequote(, )dnl #### Find out which version of Emacs this is. -version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` -changequote([, ])dnl +[version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \ + | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`] if test x"${version}" = x; then - AC_MSG_ERROR(can't find current emacs version in \`${srcdir}/lisp/version.el'.) + AC_MSG_ERROR([can't find current emacs version in `${srcdir}/lisp/version.el'.]) fi ### Specify what sort of things we'll be editing into Makefile and config.h. @@ -2227,6 +2373,8 @@ AC_SUBST(etcdir) AC_SUBST(archlibdir) AC_SUBST(docdir) AC_SUBST(bitmapdir) +AC_SUBST(gamedir) +AC_SUBST(gameuser) AC_SUBST(c_switch_system) AC_SUBST(c_switch_machine) AC_SUBST(LD_SWITCH_X_SITE) @@ -2238,39 +2386,339 @@ AC_SUBST(machfile) AC_SUBST(opsysfile) AC_SUBST(GETLOADAVG_LIBS) -AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}") -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}) -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}) +AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", + [Define to the canonical Emacs configuration name.]) +AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}", + [Define to the options passed to configure.]) +AC_DEFINE_UNQUOTED(config_machfile, "${machfile}", + [Define to the used machine dependent file.]) +AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", + [Define to the used os dependent file.]) +AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE}, +[Define LD_SWITCH_X_SITE to contain any special flags your loader + may need to deal with X Windows. For instance, if you've defined + HAVE_X_WINDOWS above and your X libraries aren't in a place that + your loader can find on its own, you might want to add "-L/..." or + something similar.]) +AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE_AUX, ${LD_SWITCH_X_SITE_AUX}, + [Define LD_SWITCH_X_SITE_AUX with an -R option + in case it's needed (for Solaris, for example).]) +AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE}, +[Define C_SWITCH_X_SITE to contain any special flags your compiler + may need to deal with X Windows. For instance, if you've defined + HAVE_X_WINDOWS above and your X include files aren't in a place + that your compiler can find on its own, you might want to add + "-I/..." or something similar.]) +AC_DEFINE_UNQUOTED(UNEXEC_SRC, ${UNEXEC_SRC}, + [Define to the unexec source file name.]) if test "${HAVE_X_WINDOWS}" = "yes" ; then - AC_DEFINE(HAVE_X_WINDOWS) + AC_DEFINE(HAVE_X_WINDOWS, 1, + [Define to 1 if you want to use the X window system.]) fi if test "${USE_X_TOOLKIT}" != "none" ; then - AC_DEFINE(USE_X_TOOLKIT) + AC_DEFINE(USE_X_TOOLKIT, 1, [Define to 1 if using an X toolkit.]) fi if test "${HAVE_X11}" = "yes" ; then - AC_DEFINE(HAVE_X11) + AC_DEFINE(HAVE_X11, 1, + [Define to 1 if you want to use version 11 of X windows. + Otherwise, Emacs expects to use version 10.]) fi if test "${HAVE_XFREE386}" = "yes" ; then - AC_DEFINE(HAVE_XFREE386) + AC_DEFINE(HAVE_XFREE386, 1, [Define to 1 if you're using XFree386.]) fi if test "${HAVE_MENUS}" = "yes" ; then - AC_DEFINE(HAVE_MENUS) + AC_DEFINE(HAVE_MENUS, 1, + [Define to 1 if you have mouse menus. + (This is automatic if you use X, but the option to specify it remains.) + It is also defined with other window systems that support xmenu.c.]) fi if test "${GNU_MALLOC}" = "yes" ; then - AC_DEFINE(GNU_MALLOC) + AC_DEFINE(GNU_MALLOC, 1, + [Define to 1 if you want to use the GNU memory allocator.]) fi if test "${REL_ALLOC}" = "yes" ; then - AC_DEFINE(REL_ALLOC) + AC_DEFINE(REL_ALLOC, 1, + [Define REL_ALLOC if you want to use the relocating allocator for + buffer space.]) fi -AC_CHECK_HEADERS(nlist.h, [AC_DEFINE(NLIST_STRUCT, 1, - [Define if you have .])]) +AH_TOP([/* GNU Emacs site configuration template file. + Copyright (C) 1988, 93, 94, 99, 2000, 2002 Free Software Foundation, Inc. + +This file is part of GNU Emacs. + +GNU Emacs is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + + +/* No code in Emacs #includes config.h twice, but some bits of code + intended to work with other packages as well (like gmalloc.c) + think they can include it as many times as they like. */ +#ifndef EMACS_CONFIG_H +#define EMACS_CONFIG_H +])dnl + +AH_BOTTOM([ +/* If we're using any sort of window system, define some consequences. */ +#ifdef HAVE_X_WINDOWS +#define HAVE_WINDOW_SYSTEM +#define MULTI_KBOARD +#define HAVE_MOUSE +#endif + +/* If we're using the Carbon API on Mac OS X, define a few more + variables as well. */ +#ifdef HAVE_CARBON +#define HAVE_WINDOW_SYSTEM +#define HAVE_MOUSE +#define HAVE_MENUS +#endif + +/* Define USER_FULL_NAME to return a string + that is the user's full name. + It can assume that the variable `pw' + points to the password file entry for this user. + + At some sites, the pw_gecos field contains + the user's full name. If neither this nor any other + field contains the right thing, use pw_name, + giving the user's login name, since that is better than nothing. */ +#define USER_FULL_NAME pw->pw_gecos + +/* Define AMPERSAND_FULL_NAME if you use the convention + that & in the full name stands for the login id. */ +/* Turned on June 1996 supposing nobody will mind it. */ +#define AMPERSAND_FULL_NAME + +/* Define HAVE_SOUND if we have sound support. We know it works + and compiles only on the specified platforms. For others, + it probably doesn't make sense to try. */ + +#if defined __FreeBSD__ || defined __NetBSD__ || defined __linux__ +#ifdef HAVE_MACHINE_SOUNDCARD_H +#define HAVE_SOUND 1 +#endif +#ifdef HAVE_SYS_SOUNDCARD_H +#define HAVE_SOUND 1 +#endif +#ifdef HAVE_SOUNDCARD_H +#define HAVE_SOUND 1 +#endif +#endif /* __FreeBSD__ || __NetBSD__ || __linux__ */ + +/* If using GNU, then support inline function declarations. */ +/* Don't try to switch on inline handling as detected by AC_C_INLINE + generally, because even if non-gcc compilers accept `inline', they + may reject `extern inline'. */ +#ifdef __GNUC__ +#define INLINE __inline__ +#else +#define INLINE +#endif + +/* Include the os and machine dependent files. */ +#include config_opsysfile +#include config_machfile + +/* Load in the conversion definitions if this system + needs them and the source file being compiled has not + said to inhibit this. There should be no need for you + to alter these lines. */ + +#ifdef SHORTNAMES +#ifndef NO_SHORTNAMES +#include "../shortnames/remap.h" +#endif /* not NO_SHORTNAMES */ +#endif /* SHORTNAMES */ + +/* If no remapping takes place, static variables cannot be dumped as + pure, so don't worry about the `static' keyword. */ +#ifdef NO_REMAP +#undef static +#endif + +/* Define `subprocesses' should be defined if you want to + have code for asynchronous subprocesses + (as used in M-x compile and M-x shell). + These do not work for some USG systems yet; + for the ones where they work, the s/SYSTEM.h file defines this flag. */ + +#ifndef VMS +#ifndef USG +/* #define subprocesses */ +#endif +#endif + +/* SIGTYPE is the macro we actually use. */ +#ifndef SIGTYPE +#define SIGTYPE RETSIGTYPE +#endif + +#ifdef emacs /* Don't do this for lib-src. */ +/* Tell regex.c to use a type compatible with Emacs. */ +#define RE_TRANSLATE_TYPE Lisp_Object +#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C) +#define RE_TRANSLATE_P(TBL) (XFASTINT (TBL) != 0) +#endif + +/* Avoid link-time collision with system mktime if we will use our own. */ +#if ! HAVE_MKTIME || BROKEN_MKTIME +#define mktime emacs_mktime +#endif + +/* The rest of the code currently tests the CPP symbol BSTRING. + Override any claims made by the system-description files. + Note that on some SCO version it is possible to have bcopy and not bcmp. */ +#undef BSTRING +#if defined (HAVE_BCOPY) && defined (HAVE_BCMP) +#define BSTRING +#endif + +/* Some of the files of Emacs which are intended for use with other + programs assume that if you have a config.h file, you must declare + the type of getenv. + + This declaration shouldn't appear when alloca.s or Makefile.in + includes config.h. */ +#ifndef NOT_C_CODE +extern char *getenv (); +#endif + +/* These default definitions are good for almost all machines. + The exceptions override them in m/MACHINE.h. */ + +#ifndef BITS_PER_CHAR +#define BITS_PER_CHAR 8 +#endif + +#ifndef BITS_PER_SHORT +#define BITS_PER_SHORT 16 +#endif + +/* Note that lisp.h uses this in a preprocessor conditional, so it + would not work to use sizeof. That being so, we do all of them + without sizeof, for uniformity's sake. */ +#ifndef BITS_PER_INT +#define BITS_PER_INT 32 +#endif + +#ifndef BITS_PER_LONG +#ifdef _LP64 +#define BITS_PER_LONG 64 +#else +#define BITS_PER_LONG 32 +#endif +#endif + +/* Define if the compiler supports function prototypes. It may do so + but not define __STDC__ (e.g. DEC C by default) or may define it as + zero. */ +#undef PROTOTYPES +/* For mktime.c: */ +#ifndef __P +# if defined PROTOTYPES +# define __P(args) args +# else +# define __P(args) () +# endif /* GCC. */ +#endif /* __P */ + +/* Don't include "string.h" or in non-C code. */ +#ifndef NOT_C_CODE +#ifdef HAVE_STRING_H +#include "string.h" +#endif +#ifdef HAVE_STRINGS_H +#include "strings.h" /* May be needed for bcopy & al. */ +#endif +#ifdef HAVE_STDLIB_H +#include +#endif +#ifndef __GNUC__ +# ifdef HAVE_ALLOCA_H +# include +# else /* AIX files deal with #pragma. */ +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif /* HAVE_ALLOCA_H */ +#endif /* __GNUC__ */ +#ifndef HAVE_SIZE_T +typedef size_t unsigned +#endif +#endif /* NOT_C_CODE */ + +/* Define HAVE_X_I18N if we have usable i18n support. */ + +#ifdef HAVE_X11R6 +#define HAVE_X_I18N +#elif defined HAVE_X11R5 && !defined X11R5_INHIBIT_I18N +#define HAVE_X_I18N +#endif + +/* Define HAVE_X11R6_XIM if we have usable X11R6-style XIM support. */ + +#if defined HAVE_X11R6 && !defined INHIBIT_X11R6_XIM +#define HAVE_X11R6_XIM +#endif + +/* Should we enable expensive run-time checking of data types? */ +#undef ENABLE_CHECKING + +#if defined __GNUC__ && (__GNUC__ > 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) +#define NO_RETURN __attribute__ ((__noreturn__)) +#else +#define NO_RETURN /* nothing */ +#endif + +/* These won't be used automatically yet. We also need to know, at least, + that the stack is continuous. */ +#ifdef __GNUC__ +# ifndef GC_SETJMP_WORKS + /* GC_SETJMP_WORKS is nearly always appropriate for GCC -- + see NON_SAVING_SETJMP in the target descriptions. */ + /* Exceptions (see NON_SAVING_SETJMP in target description) are ns32k, + SCO5 non-ELF (but Emacs specifies ELF) and SVR3 on x86. + Fixme: Deal with ns32k, SVR3. */ +# define GC_SETJMP_WORKS 1 +# endif +# ifndef GC_LISP_OBJECT_ALIGNMENT +# define GC_LISP_OBJECT_ALIGNMENT (__alignof__ (Lisp_Object)) +# endif +#endif + +#ifndef HAVE_BCOPY +#define bcopy(a,b,s) memcpy (b,a,s) +#endif +#ifndef HAVE_BZERO +#define bzero(a,s) memset (a,0,s) +#endif +#ifndef HAVE_BCMP +#define BCMP memcmp +#endif + +#endif /* EMACS_CONFIG_H */ + +/* +Local Variables: +mode: c +End: +*/ +])dnl #### Report on what we decided to do. echo " @@ -2307,12 +2755,10 @@ echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SC echo # Remove any trailing slashes in these variables. -changequote(, )dnl -test "${prefix}" != NONE && +[test "${prefix}" != NONE && prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'` test "${exec_prefix}" != NONE && - exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` -changequote([, ])dnl + exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`] ## Check if the C preprocessor will convert `..' to `. .'. If so, set ## CPP_NEED_TRADITIONAL to `yes' so that the code to generate Makefile @@ -2337,18 +2783,16 @@ done # and lib-src/Makefile from ${srcdir}/lib-src/Makefile.c # This must be done 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 # 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 $canonical | +[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 src/epaths.h ${MAKE-make} epaths-force