X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d..f0939c31a6f4f7afec3adf3f31817f998af6e667:/configure.in diff --git a/configure.in b/configure.in index d51e93d94b..376c82c4ca 100644 --- a/configure.in +++ b/configure.in @@ -4,9 +4,7 @@ dnl autoconf dnl in the directory containing this script. dnl If you changed any AC_DEFINES, also run autoheader. dnl -dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, -dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011 -dnl Free Software Foundation, Inc. +dnl Copyright (C) 1994-1996, 1999-2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -515,6 +513,17 @@ case "${canonical}" in CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS" ;; + ia64*-hp-hpux1[1-9]* ) + machine=hp800 opsys=hpux11 + ## FIXME. Peter O'Gorman reports that dumping using unexelf.o doesn't + ## work either: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6811 + CANNOT_DUMP=yes + ;; + + hppa*-*-linux-gnu* ) + machine=hp800 opsys=gnu-linux + ;; + ## IBM machines rs6000-ibm-aix4.[23]* ) machine=ibmrs6000 opsys=aix4-2 @@ -690,19 +699,6 @@ else test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" fi -### Use -Wno-pointer-sign if the compiler supports it -AC_MSG_CHECKING([whether gcc understands -Wno-pointer-sign]) -SAVE_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -Wno-pointer-sign" -AC_TRY_COMPILE([], [], has_option=yes, has_option=no,) -if test $has_option = yes; then - C_WARNINGS_SWITCH="-Wno-pointer-sign $C_WARNINGS_SWITCH" -fi -AC_MSG_RESULT($has_option) -CFLAGS="$SAVE_CFLAGS" -unset has_option -unset SAVE_CFLAGS - ### Use -Wdeclaration-after-statement if the compiler supports it AC_MSG_CHECKING([whether gcc understands -Wdeclaration-after-statement]) SAVE_CFLAGS="$CFLAGS" @@ -843,16 +839,16 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], CPP=`eval "echo $CPP"` -dnl Not used by any currently supported platform. dnl The function dump-emacs will not be defined and temacs will do dnl (load "loadup") automatically unless told otherwise. -CANNOT_DUMP=no +test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no case "$opsys" in - your-opsys-here) - CANNOT_DUMP=yes - AC_DEFINE(CANNOT_DUMP, 1, [Define if Emacs cannot be dumped on your system.]) - ;; + your-opsys-here) CANNOT_DUMP=yes ;; esac + +test "$CANNOT_DUMP" = "yes" && \ + AC_DEFINE(CANNOT_DUMP, 1, [Define if Emacs cannot be dumped on your system.]) + AC_SUBST(CANNOT_DUMP) @@ -877,11 +873,11 @@ case "$opsys" in # emacs, instead of the generic ELF dump code found in unexelf.c. # The resulting binary has a complete symbol table, and is better # for debugging and other observability tools (debuggers, pstack, etc). - # + # # If you encounter a problem using dldump(), please consider sending # a message to the OpenSolaris tools-linking mailing list: # http://mail.opensolaris.org/mailman/listinfo/tools-linking - # + # # It is likely that dldump() works with older Solaris too, but this has # not been tested, so for now this change is for Solaris 10 or newer. UNEXEC_OBJ=unexsol.o @@ -948,7 +944,7 @@ if test "$machine" = "alpha"; then AC_MSG_ERROR([What gives? Fix me if DEC Unix supports ELF now.]) fi else - UNEXEC_OBJ=unexalpha.o + UNEXEC_OBJ=unexalpha.o fi fi AC_SUBST(C_SWITCH_MACHINE) @@ -975,7 +971,7 @@ case "$opsys" in hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; - sol2*) LIBS_SYSTEM="-lsocket -lnsl -lkstat" ;; + sol2*) LIBS_SYSTEM="-lsocket -lnsl" ;; ## Motif needs -lgen. unixware) LIBS_SYSTEM="-lsocket -lnsl -lelf -lgen" ;; @@ -991,9 +987,6 @@ else CPPFLAGS="$C_SWITCH_SYSTEM $C_SWITCH_MACHINE $CPPFLAGS" fi -dnl For AC_FUNC_GETLOADAVG, at least: -AC_CONFIG_LIBOBJ_DIR(src) - dnl Do this early because it can frob feature test macros for Unix-98 &c. AC_SYS_LARGEFILE @@ -1130,7 +1123,7 @@ AC_DEFUN([PKG_CHECK_MODULES], [ 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, + AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h, have_sound_header=yes) # Emulation library used on NetBSD. AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) @@ -1323,6 +1316,19 @@ AH_TEMPLATE(POINTER_TYPE, dnl Check for endianess AC_C_BIGENDIAN +AC_CACHE_CHECK([for __attribute__ ((__aligned__ (expr)))], + [emacs_cv_attribute_aligned], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[char __attribute__ ((__aligned__ (1 << 3))) c;]], + [[]])], + [emacs_cv_attribute_aligned=yes], + [emacs_cv_attribute_aligned=no])]) +if test $emacs_cv_attribute_aligned = yes; then + AC_DEFINE([HAVE_ATTRIBUTE_ALIGNED], 1, + [Define to 1 if GCC-style __attribute__ ((__aligned__ (expr))) works.]) +fi + dnl check for Make feature AC_PROG_MAKE_SET @@ -1497,6 +1503,7 @@ AC_SUBST(TEMACS_LDFLAGS2) ns_frag=/dev/null NS_OBJ= +NS_OBJC_OBJ= NS_SUPPORT= if test "${HAVE_NS}" = yes; then window_system=nextstep @@ -1508,12 +1515,14 @@ if test "${HAVE_NS}" = yes; then prefix=${ns_appresdir} fi ns_frag=$srcdir/src/ns.mk - NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o" + NS_OBJ="fontset.o fringe.o image.o" + NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc" fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" AC_SUBST(NS_OBJ) +AC_SUBST(NS_OBJC_OBJ) AC_SUBST(NS_SUPPORT) AC_SUBST(LIB_STANDARD) AC_SUBST_FILE(ns_frag) @@ -1804,7 +1813,7 @@ if test "${HAVE_X11}" = "yes"; then PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) AC_SUBST(IMAGEMAGICK_CFLAGS) AC_SUBST(IMAGEMAGICK_LIBS) - + if test $HAVE_IMAGEMAGICK = yes; then AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" @@ -1984,7 +1993,8 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then #include #include ], [], - emacs_cv_xaw3d=yes, + [AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, + emacs_cv_xaw3d=yes, emacs_cv_xaw3d=no)], emacs_cv_xaw3d=no)]) else emacs_cv_xaw3d=no @@ -2239,17 +2249,9 @@ if test "${HAVE_X11}" = "yes"; then HAVE_XFT=no fi - - HAVE_FREETYPE=no ## We used to allow building with FreeType and without Xft. ## However, the ftx font backend driver is not in good shape. - if test "${HAVE_XFT}" = "yes"; then - dnl As we use Xft, we anyway use freetype. - dnl There's no need for additional CFLAGS and LIBS. - HAVE_FREETYPE=yes - FONTCONFIG_CFLAGS= - FONTCONFIG_LIBS= - fi + HAVE_FREETYPE=$HAVE_XFT HAVE_LIBOTF=no if test "${HAVE_FREETYPE}" = "yes"; then @@ -2512,7 +2514,7 @@ AC_SUBST(LIBXSM) ### Use libxml (-lxml2) if available if test "${with_xml2}" != "no"; then ### I'm not sure what the version number should be, so I just guessed. - PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.2.0, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) + PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.6.17, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) if test "${HAVE_LIBXML2}" = "yes"; then LIBS="$LIBXML2_LIBS $LIBS" AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) @@ -2650,17 +2652,15 @@ fi AC_CHECK_HEADERS(sys/un.h) -AC_FUNC_GETLOADAVG - AC_FUNC_FSEEKO AC_FUNC_GETPGRP # Configure gnulib. +gl_ASSERT_NO_GNULIB_POSIXCHECK +gl_ASSERT_NO_GNULIB_TESTS gl_INIT -AC_FUNC_STRFTIME - # UNIX98 PTYs. AC_CHECK_FUNCS(grantpt) @@ -3056,15 +3056,7 @@ if test "x$GCC" = xyes \ AC_MSG_ERROR([GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'.]) fi -#### Find out which version of Emacs this is. -[version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`] -if test x"${version}" = x; then - AC_MSG_ERROR([can't find current emacs version in `${srcdir}/src/emacs.c'.]) -fi -if test x"${version}" != x"$PACKAGE_VERSION"; then - AC_MSG_WARN([version mismatch between `${srcdir}/configure.in' and `${srcdir}/src/emacs.c'.]) -fi +version=$PACKAGE_VERSION ### Specify what sort of things we'll be editing into Makefile and config.h. ### Use configuration here uncanonicalized to avoid exceeding size limits. @@ -3108,7 +3100,6 @@ fi S_FILE="\$(srcdir)/${opsysfile}" AC_SUBST(M_FILE) AC_SUBST(S_FILE) -AC_SUBST(GETLOADAVG_LIBS) AC_SUBST(ns_appdir) AC_SUBST(ns_appbindir) AC_SUBST(ns_appresdir) @@ -3228,7 +3219,7 @@ fi if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then OLDXMENU_TARGET= - OLDXMENU=nothing + OLDXMENU=nothing LIBXMENU= OLDXMENU_DEPS= fi @@ -3292,7 +3283,7 @@ case "$opsys" in headerpad_extra=690 fi LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra" - + ## This is here because src/Makefile.in did some extra fiddling around ## with LD_SWITCH_SYSTEM. The cpp logic was: ## #ifndef LD_SWITCH_SYSTEM @@ -3428,8 +3419,9 @@ AC_SUBST(WINDOW_SUPPORT) AH_TOP([/* GNU Emacs site configuration template file. - Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2011 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -3511,8 +3503,6 @@ AH_BOTTOM([ #endif #endif -#define my_strftime nstrftime /* for strftime.c */ - /* These default definitions are good for almost all machines. The exceptions override them in m/MACHINE.h. */ @@ -3734,4 +3724,3 @@ if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then fi ], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPPFLAGS="$CPPFLAGS"]) -