diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 172 |
1 files changed, 47 insertions, 125 deletions
diff --git a/configure.ac b/configure.ac index d42b42e0cae..940a1e23b3c 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.65) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT(GNU Emacs, 25.0.92, bug-gnu-emacs@gnu.org) +AC_INIT(GNU Emacs, 25.1.50, bug-gnu-emacs@gnu.org) dnl Set emacs_config_options to the options of 'configure', quoted for the shell, dnl and then quoted again for a C string. Separate options with spaces. @@ -546,6 +546,14 @@ AC_ARG_ENABLE(gtk-deprecation-warnings, [Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])], [ac_enable_gtk_deprecation_warnings="${enableval}"],[]) +BUILD_DETAILS= +AC_ARG_ENABLE([build-details], + [AS_HELP_STRING([--disable-build-details], + [Make the build more deterministic by omitting host + names, time stamps, etc. from the output.])], + [test "$enableval" = no && BUILD_DETAILS=--no-build-details]) +AC_SUBST([BUILD_DETAILS]) + 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. @@ -607,12 +615,7 @@ case "${canonical}" in * ) unported=yes ;; esac opsys=darwin - ## Use fink packages if available. - ## FIXME find a better way to do this: http://debbugs.gnu.org/11507 -## if test -d /sw/include && test -d /sw/lib; then -## GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib" -## NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS} -## fi + ## FIXME: Find a way to use Fink if available (Bug#11507). ;; ## Chromium Native Client @@ -648,16 +651,6 @@ case "${canonical}" in opsys=aix4-2 ;; - ## Silicon Graphics machines - ## Iris 4D - mips-sgi-irix6.5 ) - opsys=irix6-5 - # Without defining _LANGUAGE_C, things get masked out in the headers - # so that, for instance, grepping for 'free' in stdlib.h fails and - # AC_HEADER_STD_C fails. (MIPSPro 7.2.1.2m compilers, Irix 6.5.3m). - NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C" - ;; - ## Suns *-sun-solaris* \ | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \ @@ -774,8 +767,6 @@ AM_PROG_CC_C_O if test x$GCC = xyes; then test "x$GCC_TEST_OPTIONS" != x && CC="$CC $GCC_TEST_OPTIONS" -else - test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" fi dnl This is used in lib/Makefile.am to use nt/gnulib.mk, the @@ -911,7 +902,6 @@ else nw="$nw -Wvla" # Emacs uses <vla.h>. nw="$nw -Wswitch-default" # Too many warnings for now nw="$nw -Winline" # OK to ignore 'inline' - nw="$nw -Wjump-misses-init" # We sometimes safely jump over init. nw="$nw -Wstrict-overflow" # OK to optimize assuming that # signed overflow has undefined behavior nw="$nw -Wsync-nand" # irrelevant here, and provokes ObjC warning @@ -1226,7 +1216,6 @@ fi dnl We need -znocombreloc if we're using a relatively recent GNU ld. dnl If we can link with the flag, it shouldn't do any harm anyhow. -dnl (Don't use '-z nocombreloc' as -z takes no arg on Irix.) dnl Treat GCC specially since it just gives a non-fatal 'unrecognized option' dnl if not built to support GNU ld. @@ -1455,7 +1444,7 @@ LIBS=$OLD_LIBS dnl Current possibilities handled by sed (aix4-2 -> aix, dnl gnu-linux -> gnu/linux, etc.): -dnl gnu, gnu/linux, gnu/kfreebsd, aix, cygwin, darwin, hpux, irix. +dnl gnu, gnu/linux, gnu/kfreebsd, aix, cygwin, darwin, hpux. dnl And special cases: berkeley-unix, usg-unix-v, ms-dos, windows-nt. SYSTEM_TYPE=`echo $opsys | sed -e 's/[[0-9]].*//' -e 's|-|/|'` @@ -1589,6 +1578,7 @@ fi dnl checks for header files AC_CHECK_HEADERS_ONCE( + malloc.h sys/systeminfo.h sys/sysinfo.h coff.h pty.h @@ -2121,7 +2111,13 @@ case "$opsys" in cygwin) hybrid_malloc=yes;; esac +if test "${system_malloc}" != yes && test "${doug_lea_malloc}" != yes \ + && test "${UNEXEC_OBJ}" = unexelf.o; then + hybrid_malloc=yes +fi + GMALLOC_OBJ= +HYBRID_MALLOC= if test "${system_malloc}" = "yes"; then AC_DEFINE([SYSTEM_MALLOC], 1, [Define to 1 to use the system memory allocator, even if it is not @@ -2133,6 +2129,7 @@ if test "${system_malloc}" = "yes"; then elif test "$hybrid_malloc" = yes; then AC_DEFINE(HYBRID_MALLOC, 1, [Define to use gmalloc before dumping and the system malloc after.]) + HYBRID_MALLOC=1 GNU_MALLOC= GNU_MALLOC_reason="only before dumping" GMALLOC_OBJ=gmalloc.o @@ -2155,10 +2152,12 @@ else of the main data segment.]) fi fi +AC_SUBST([HYBRID_MALLOC]) +AM_CONDITIONAL([HYBRID_MALLOC_LIB], [test -n "$HYBRID_MALLOC"]) AC_SUBST(GMALLOC_OBJ) AC_SUBST(VMLIMIT_OBJ) -if test "$doug_lea_malloc" = "yes" ; then +if test "$doug_lea_malloc" = "yes" && test "$hybrid_malloc" != yes; then if test "$GNU_MALLOC" = yes ; then GNU_MALLOC_reason=" (Using Doug Lea's new malloc from the GNU C Library.)" @@ -2182,7 +2181,7 @@ fi use_mmap_for_buffers=no case "$opsys" in - cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;; + cygwin|mingw32) use_mmap_for_buffers=yes ;; esac AC_FUNC_MMAP @@ -2404,13 +2403,20 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" OLD_LIBS=$LIBS CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" LIBS="$IMAGEMAGICK_LIBS $LIBS" - AC_CHECK_FUNCS(MagickExportImagePixels MagickMergeImageLayers) + AC_CHECK_FUNCS(MagickExportImagePixels MagickMergeImageLayers MagickAutoOrientImage) CFLAGS=$OLD_CFLAGS LIBS=$OLD_LIBS fi fi fi +AC_CHECK_LIB(anl, getaddrinfo_a, HAVE_GETADDRINFO_A=yes) +if test "${HAVE_GETADDRINFO_A}" = "yes"; then + AC_DEFINE(HAVE_GETADDRINFO_A, 1, +[Define to 1 if you have getaddrinfo_a for asynchronous DNS resolution.]) + GETADDRINFO_A_LIBS="-lanl" + AC_SUBST(GETADDRINFO_A_LIBS) +fi HAVE_GTK=no GTK_OBJ= @@ -3695,20 +3701,6 @@ fi AC_SUBST(LIBXML2_LIBS) AC_SUBST(LIBXML2_CFLAGS) -# If netdb.h doesn't declare h_errno, we must declare it by hand. -# On MinGW, that is provided by nt/inc/sys/socket.h and w32.c. -if test "${opsys}" = "mingw32"; then - emacs_cv_netdb_declares_h_errno=yes -fi -AC_CACHE_CHECK(whether netdb declares h_errno, - emacs_cv_netdb_declares_h_errno, -[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], - [[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, 1, [Define to 1 if netdb.h declares h_errno.]) -fi - # Check for mail-locking functions in a "mail" library. Probably this should # have the same check as for liblockfile below. AC_CHECK_LIB(mail, maillock, have_mail=yes, have_mail=no) @@ -3752,7 +3744,7 @@ mail_lock=no case "$opsys" in aix4-2) mail_lock="lockf" ;; - gnu|freebsd|dragonfly|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; + gnu|freebsd|dragonfly|netbsd|openbsd|darwin) mail_lock="flock" ;; ## On GNU/Linux systems, both methods are used by various mail programs. ## I assume most people are using newer mailers that have heard of flock. @@ -3797,7 +3789,7 @@ AC_CHECK_FUNCS(accept4 fchdir gethostname \ getrusage get_current_dir_name \ lrand48 random rint \ select getpagesize setlocale newlocale \ -getrlimit setrlimit shutdown getaddrinfo \ +getrlimit setrlimit shutdown \ pthread_sigmask strsignal setitimer \ sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \ gai_strerror sync \ @@ -3807,6 +3799,7 @@ LIBS=$OLD_LIBS dnl No need to check for posix_memalign if aligned_alloc works. AC_CHECK_FUNCS([aligned_alloc posix_memalign], [break]) +AC_CHECK_DECLS([aligned_alloc], [], [], [[#include <stdlib.h>]]) dnl Cannot use AC_CHECK_FUNCS AC_CACHE_CHECK([for __builtin_unwind_init], @@ -3983,44 +3976,13 @@ AC_CACHE_CHECK([whether signals can be handled on alternate stack], [emacs_cv_alternate_stack=yes], [emacs_cv_alternate_stack=no])]) -# Do we have res_init, for detecting changes in /etc/resolv.conf? -# On Darwin, res_init appears not to be useful: see bug#562 and -# http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01467.html -resolv=no - -if test $opsys != darwin; then - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h>]], - [[return res_init();]])], - have_res_init=yes, have_res_init=no) - if test "$have_res_init" = no; then - OLIBS="$LIBS" - LIBS="$LIBS -lresolv" - AC_MSG_CHECKING(for res_init with -lresolv) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h>]], - [[return res_init();]])], - have_res_init=yes, have_res_init=no) - AC_MSG_RESULT($have_res_init) - if test "$have_res_init" = yes ; then - resolv=yes - fi - LIBS="$OLIBS" - fi - - if test "$have_res_init" = yes; then - AC_DEFINE(HAVE_RES_INIT, 1, [Define to 1 if res_init is available.]) - fi -fi dnl !darwin - # Do we need the Hesiod library to provide the support routines? dnl FIXME? Should we be skipping this on Darwin too? LIBHESIOD= +LIBRESOLV= if test "$with_hesiod" != no ; then # Don't set $LIBS here -- see comments above. FIXME which comments? + resolv=no AC_CHECK_FUNC(res_send, , [AC_CHECK_FUNC(__res_send, , [AC_CHECK_LIB(resolv, res_send, resolv=yes, [AC_CHECK_LIB(resolv, __res_send, resolv=yes)])])]) @@ -4029,21 +3991,16 @@ if test "$with_hesiod" != no ; then else RESOLVLIB= fi + hesiod=no AC_CHECK_FUNC(hes_getmailhost, , [AC_CHECK_LIB(hesiod, hes_getmailhost, hesiod=yes, :, $RESOLVLIB)]) if test x"$hesiod" = xyes; then LIBHESIOD=-lhesiod + LIBRESOLV=$RESOLVLIB fi fi AC_SUBST(LIBHESIOD) - -# Do we need libresolv (due to res_init or Hesiod)? -if test "$resolv" = yes && test $opsys != darwin; then - LIBRESOLV=-lresolv -else - LIBRESOLV= -fi AC_SUBST(LIBRESOLV) # These tell us which Kerberos-related libraries to use. @@ -4238,7 +4195,7 @@ else SEPCHAR=':' fi AC_DEFINE_UNQUOTED(SEPCHAR, ['$SEPCHAR'], [Character that separates PATH elements.]) -dnl This is for MinGW, and is used in test/automated/Makefile.in. +dnl This is for MinGW, and is used in test/Makefile.in. dnl The MSYS Bash has heuristics for replacing ':' with ';' when it dnl decides that a command-line argument to be passed to a MinGW program dnl is a PATH-style list of directories. But that heuristics plays it @@ -4297,7 +4254,7 @@ esac case $opsys in - irix6-5 | sol2* | unixware ) + sol2* | unixware ) dnl Some SVr4s don't define NSIG in sys/signal.h for ANSI environments; dnl instead, there's a system variable _sys_nsig. Unfortunately, we dnl need the constant to dimension an array. So wire in the appropriate @@ -4311,7 +4268,7 @@ emacs_broken_SIGIO=no case $opsys in dnl SIGIO exists, but the feature doesn't work in the way Emacs needs. dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>. - hpux* | irix6-5 | nacl | openbsd | sol2* | unixware ) + hpux* | nacl | openbsd | sol2* | unixware ) emacs_broken_SIGIO=yes ;; @@ -4419,7 +4376,7 @@ dnl generated in the Makefile generated by 'xmkmf'. If we don't define dnl NARROWPROTO, we will see the wrong function prototypes for X functions dnl taking float or double parameters. case $opsys in - cygwin|gnu|gnu-linux|gnu-kfreebsd|irix6-5|freebsd|netbsd|openbsd) + cygwin|gnu|gnu-linux|gnu-kfreebsd|freebsd|netbsd|openbsd) AC_DEFINE(NARROWPROTO, 1, [Define if system's imake configuration file defines 'NeedWidePrototypes' as 'NO'.]) ;; @@ -4427,7 +4384,6 @@ esac dnl Used in process.c, this must be a loop, even if it only runs once. -dnl (Except on SGI; see below. Take that, clarity and consistency!) AH_TEMPLATE(PTY_ITERATION, [How to iterate over PTYs.]) dnl Only used if !PTY_ITERATION. Iterate from FIRST_PTY_LETTER to z, dnl trying suffixes 0-16. @@ -4490,27 +4446,6 @@ case $opsys in AC_DEFINE(PTY_TTY_NAME_SPRINTF, [sprintf (pty_name, "/dev/pty/tty%c%x", c, i);]) ;; - irix6-5 ) - dnl It looks like this cannot be right, because it is not a loop. - dnl However, process.c actually does this: - dnl # ifndef __sgi - dnl continue; - dnl # else - dnl return -1; - dnl # endif - dnl which presumably makes it OK, since irix == sgi (?). - dnl FIXME it seems like this special treatment is unnecessary? - dnl Why can't irix use a single-trip loop like eg cygwin? - AC_DEFINE(PTY_ITERATION, []) - dnl Not used, because PTY_ITERATION is defined. - AC_DEFINE(FIRST_PTY_LETTER, ['q']) - AC_DEFINE(PTY_OPEN, [ { struct sigaction ocstat, cstat; struct stat stb; char * name; sigemptyset(&cstat.sa_mask); cstat.sa_handler = SIG_DFL; cstat.sa_flags = 0; sigaction(SIGCHLD, &cstat, &ocstat); name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); sigaction(SIGCHLD, &ocstat, (struct sigaction *)0); if (name == 0) return -1; if (fd < 0) return -1; if (fstat (fd, &stb) < 0) return -1; strcpy (pty_name, name); }]) - dnl No need to get the pty name at all. - AC_DEFINE(PTY_NAME_SPRINTF, []) - dnl No need to use sprintf to get the tty name--we get that from _getpty. - AC_DEFINE(PTY_TTY_NAME_SPRINTF, []) - ;; - sol2* ) dnl On SysVr4, grantpt(3) forks a subprocess, so do not use dnl O_CLOEXEC when opening the pty, and keep the SIGCHLD handler @@ -4545,8 +4480,7 @@ AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by case $opsys in dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX. - dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX. - aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin ) + aix4-2 | cygwin | gnu | dragonfly | freebsd | netbsd | openbsd | darwin ) AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1) ;; @@ -4626,8 +4560,7 @@ if test x$GCC = xyes; then AC_DEFINE(GC_SETJMP_WORKS, 1) else case $opsys in - dnl irix: Tested on Irix 6.5. SCM worked on earlier versions. - aix* | dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* ) + aix* | dragonfly | freebsd | netbsd | openbsd | sol2* ) AC_DEFINE(GC_SETJMP_WORKS, 1) ;; esac @@ -4731,12 +4664,6 @@ case $opsys in AC_DEFINE(HPUX, [], [Define if the system is HPUX.]) ;; - irix6-5) - AC_DEFINE(USG, []) - AC_DEFINE(USG5_4, []) - AC_DEFINE(IRIX6_5, [], [Define if the system is IRIX.]) - ;; - mingw32) AC_DEFINE(DOS_NT, []) AC_DEFINE(WINDOWSNT, 1, [Define if compiling for native MS Windows.]) @@ -4810,11 +4737,6 @@ case $opsys in reopen it in the child.]) ;; - irix6-5) - AC_DEFINE(PREFER_VSUSP, 1, [Define if process_send_signal should - use VSUSP instead of VSWTCH.]) - ;; - sol2-10) AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes on Solaris.]) @@ -5028,7 +4950,7 @@ fi AC_SUBST(RALLOC_OBJ) if test "$opsys" = "cygwin"; then - CYGWIN_OBJ="sheap.o cygw32.o" + CYGWIN_OBJ="cygw32.o" ## Cygwin differs because of its unexec(). PRE_ALLOC_OBJ= POST_ALLOC_OBJ=lastfile.o @@ -5382,13 +5304,13 @@ AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \ leim/Makefile nextstep/Makefile nt/Makefile]) dnl test/ is not present in release tarfiles. -opt_makefile=test/automated/Makefile +opt_makefile=test/Makefile if test -f "$srcdir/$opt_makefile.in"; then SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile" dnl Again, it's best not to use a variable. Though you can add dnl ", [], [opt_makefile='$opt_makefile']" and it should work. - AC_CONFIG_FILES([test/automated/Makefile]) + AC_CONFIG_FILES([test/Makefile]) fi |