X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/aaf34461ff5804e5cebe163b31e535da72e81d87..e5e76c04310d287a56675876dd83e1089faba215:/configure diff --git a/configure b/configure index 93705b7815..f2f5648234 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. +# Generated by GNU Autoconf 2.61 for emacs 23.0.50. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -570,13 +570,12 @@ MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='emacs' +PACKAGE_TARNAME='emacs' +PACKAGE_VERSION='23.0.50' +PACKAGE_STRING='emacs 23.0.50' +PACKAGE_BUGREPORT='' -ac_unique_file="src/lisp.h" ac_config_libobj_dir=src # Factoring default headers for most tests. ac_includes_default="\ @@ -679,6 +678,7 @@ INSTALL_DATA RANLIB INSTALL_INFO GZIP_PROG +MAKEINFO LIBSOUND PKG_CONFIG ALSA_CFLAGS @@ -687,8 +687,12 @@ CFLAGS_SOUND SET_MAKE XMKMF HAVE_XSERVER +RSVG_CFLAGS +RSVG_LIBS GTK_CFLAGS GTK_LIBS +DBUS_CFLAGS +DBUS_LIBS XFT_CFLAGS XFT_LIBS ALLOCA @@ -771,7 +775,7 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' infodir='${datarootdir}/info' htmldir='${docdir}' dvidir='${docdir}' @@ -1235,7 +1239,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures emacs 23.0.50 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1283,7 +1287,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --docdir=DIR documentation root [DATAROOTDIR/doc/emacs] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1308,17 +1312,21 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of emacs 23.0.50:";; + esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-carbon-app[=DIR] [DIR=/Application] + --enable-carbon-app[=DIR] specify install directory for Emacs.app on Mac OS X + [DIR=/Application] --enable-asserts compile code with asserts enabled - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --enable-locallisppath=PATH directories Emacs should search for lisp files specific to this site @@ -1333,20 +1341,23 @@ Optional Packages: --with-kerberos5 support Kerberos version 5 authenticated POP --with-hesiod support Hesiod to get the POP server host --without-sound don't compile with sound support - --with-x-toolkit=KIT use an X toolkit - (KIT = yes/lucid/athena/motif/gtk/no) + --with-x-toolkit=KIT use an X toolkit (KIT one of: yes, lucid, athena, + motif, gtk, no) --with-xpm use -lXpm for displaying XPM images --with-jpeg use -ljpeg for displaying JPEG images --with-tiff use -ltiff for displaying TIFF images --with-gif use -lgif (or -lungif) for displaying GIF images --with-png use -lpng for displaying PNG images --with-gpm use -lgpm for mouse support on a GNU/Linux console + --with-rsvg use -lrsvg-2 for displaying SVG images --with-gtk use GTK (same as --with-x-toolkit=gtk) - --with-pkg-config-prog Path to pkg-config to use for finding GTK + --with-pkg-config-prog Path to pkg-config for finding GTK and librsvg --without-toolkit-scroll-bars don't use Motif or Xaw3d scroll bars + --without-xaw3d don't use Xaw3d --without-xim don't use X11 XIM --without-carbon don't use Carbon GUI on Mac OS X + --without-dbus don't use D-Bus --with-x use the X Window System Some influential environment variables: @@ -1423,7 +1434,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +emacs configure 23.0.50 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1437,7 +1448,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by emacs $as_me 23.0.50, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1773,6 +1784,14 @@ fi + + + + + + + + @@ -1814,12 +1833,14 @@ gamedir='${localstatedir}/games/emacs' gameuser=games + # Check whether --with-gcc was given. if test "${with_gcc+set}" = set; then withval=$with_gcc; fi + # Check whether --with-pop was given. if test "${with_pop+set}" = set; then withval=$with_pop; if test "$withval" = yes; then @@ -1838,6 +1859,7 @@ fi + # Check whether --with-kerberos was given. if test "${with_kerberos+set}" = set; then withval=$with_kerberos; if test "$withval" = yes; then @@ -1850,6 +1872,7 @@ fi + # Check whether --with-kerberos5 was given. if test "${with_kerberos5+set}" = set; then withval=$with_kerberos5; if test "${with_kerberos5+set}" = set; then @@ -1869,6 +1892,7 @@ fi fi + # Check whether --with-hesiod was given. if test "${with_hesiod+set}" = set; then withval=$with_hesiod; if test "$withval" = yes; then @@ -1913,6 +1937,7 @@ this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif' or \` fi + # Check whether --with-xpm was given. if test "${with_xpm+set}" = set; then withval=$with_xpm; @@ -1949,6 +1974,12 @@ if test "${with_gpm+set}" = set; then fi +# Check whether --with-rsvg was given. +if test "${with_rsvg+set}" = set; then + withval=$with_rsvg; +fi + + # Check whether --with-gtk was given. if test "${with_gtk+set}" = set; then withval=$with_gtk; @@ -1967,6 +1998,12 @@ if test "${with_toolkit_scroll_bars+set}" = set; then fi +# Check whether --with-xaw3d was given. +if test "${with_xaw3d+set}" = set; then + withval=$with_xaw3d; +fi + + # Check whether --with-xim was given. if test "${with_xim+set}" = set; then withval=$with_xim; @@ -1978,6 +2015,13 @@ if test "${with_carbon+set}" = set; then withval=$with_carbon; fi + +# Check whether --with-dbus was given. +if test "${with_dbus+set}" = set; then + withval=$with_dbus; +fi + + # Check whether --enable-carbon-app was given. if test "${enable_carbon_app+set}" = set; then enableval=$enable_carbon_app; carbon_appdir_x=${enableval} @@ -2220,6 +2264,19 @@ case "${canonical}" in esac ;; + ## FreeBSD kernel + glibc based userland + *-*-kfreebsd*gnu* ) + opsys=gnu-kfreebsd + case "${canonical}" in + alpha*-*-kfreebsd*) machine=alpha ;; + ia64-*-kfreebsd*) machine=ia64 ;; + sparc64-*-kfreebsd*) machine=sparc ;; + powerpc-*-kfreebsd*) machine=macppc ;; + i[3456]86-*-kfreebsd*) machine=intel386 ;; + amd64-*-kfreebsd*|x86_64-*-kfreebsd*) machine=amdx86-64 ;; + esac + ;; + ## NetBSD ports *-*-netbsd* ) opsys=netbsd @@ -5321,6 +5378,61 @@ fi +## Need makeinfo >= 4.6 (?) to build the manuals. +# Extract the first word of "makeinfo", so it can be a program name with args. +set dummy makeinfo; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_MAKEINFO+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MAKEINFO in + [\\/]* | ?:[\\/]*) + ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MAKEINFO="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO="no" + ;; +esac +fi +MAKEINFO=$ac_cv_path_MAKEINFO +if test -n "$MAKEINFO"; then + { echo "$as_me:$LINENO: result: $MAKEINFO" >&5 +echo "${ECHO_T}$MAKEINFO" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +if test "$MAKEINFO" != "no" && \ + test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([1-4][0-9]+|[5-9]|4\.[6-9]|4\.[1-5][0-9]+)'`" = x; then + MAKEINFO=no +fi + +if test "$MAKEINFO" = "no"; then + { { echo "$as_me:$LINENO: error: makeinfo >= 4.6 is required " >&5 +echo "$as_me: error: makeinfo >= 4.6 is required " >&2;} + { (exit 1); exit 1; }; } +fi + + + if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x then ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" @@ -9628,16 +9740,16 @@ fi test -n "$DISPLAY" || test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then { { echo "$as_me:$LINENO: error: You seem to be running X, but no X development libraries -where found. You should install the relevant development files for X -and the for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make +were found. You should install the relevant development files for X +and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make sure you have development files for image handling, i.e. tiff, gif, jpeg, png and xpm. If you are sure you want Emacs compiled without X window support, pass --without-x to configure." >&5 echo "$as_me: error: You seem to be running X, but no X development libraries -where found. You should install the relevant development files for X -and the for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make +were found. You should install the relevant development files for X +and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make sure you have development files for image handling, i.e. tiff, gif, jpeg, png and xpm. If you are sure you want Emacs compiled without X window support, pass @@ -10998,76 +11110,131 @@ echo "${ECHO_T}before 6" >&6; } fi fi -if test "${window_system}" = "x11"; then - { echo "$as_me:$LINENO: checking X11 version 5" >&5 -echo $ECHO_N "checking X11 version 5... $ECHO_C" >&6; } - if test "${emacs_cv_x11_version_5+set}" = set; then + +### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. +HAVE_RSVG=no +if test "${HAVE_X11}" = "yes" || test "${HAVE_CARBON}" = "yes"; then + if test "${with_rsvg}" != "no"; then + if test "X${with_pkg_config_prog}" != X; then + PKG_CONFIG="${with_pkg_config_prog}" + fi + + RSVG_REQUIRED=2.0.0 + RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" + + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -#if XlibSpecificationRelease < 5 -fail; -#endif + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - emacs_cv_x11_version_5=yes +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - emacs_cv_x11_version_5=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi - if test $emacs_cv_x11_version_5 = yes; then - { echo "$as_me:$LINENO: result: 5 or newer" >&5 -echo "${ECHO_T}5 or newer" >&6; } - HAVE_X11R5=yes + fi + + if test "$PKG_CONFIG" = "no" ; then + : + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for $RSVG_MODULE" >&5 +echo $ECHO_N "checking for $RSVG_MODULE... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "$RSVG_MODULE" 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking RSVG_CFLAGS" >&5 +echo $ECHO_N "checking RSVG_CFLAGS... $ECHO_C" >&6; } + RSVG_CFLAGS=`$PKG_CONFIG --cflags "$RSVG_MODULE"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $RSVG_CFLAGS" >&5 +echo "${ECHO_T}$RSVG_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking RSVG_LIBS" >&5 +echo $ECHO_N "checking RSVG_LIBS... $ECHO_C" >&6; } + RSVG_LIBS=`$PKG_CONFIG --libs "$RSVG_MODULE"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $RSVG_LIBS" >&5 +echo "${ECHO_T}$RSVG_LIBS" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + RSVG_CFLAGS="" + RSVG_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + RSVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$RSVG_MODULE"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + : + fi + + + + + if test ".${RSVG_CFLAGS}" != "."; then + HAVE_RSVG=yes cat >>confdefs.h <<\_ACEOF -#define HAVE_X11R5 1 +#define HAVE_RSVG 1 _ACEOF - else - HAVE_X11R5=no - { echo "$as_me:$LINENO: result: before 5" >&5 -echo "${ECHO_T}before 5" >&6; } + CFLAGS="$CFLAGS $RSVG_CFLAGS" + LIBS="$RSVG_LIBS $LIBS" + fi fi fi + HAVE_GTK=no if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then USE_X_TOOLKIT=none @@ -11079,8 +11246,8 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \ echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} { (exit 1); exit 1; }; }; fi - GLIB_REQUIRED=2.4 - GTK_REQUIRED=2.4 + GLIB_REQUIRED=2.6 + GTK_REQUIRED=2.6 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" if test "X${with_pkg_config_prog}" != X; then @@ -11317,6 +11484,7 @@ if test "${HAVE_GTK}" = "yes"; then with_toolkit_scroll_bars=yes fi + HAVE_GTK_MULTIDISPLAY=no for ac_func in gdk_display_open do @@ -11830,7 +11998,10 @@ fi fi if test "$HAVE_GTK_AND_PTHREAD" = yes; then - GTK_LIBS="$GTK_LIBS -lpthread" + case "${canonical}" in + *-hpux*) ;; + *) GTK_LIBS="$GTK_LIBS -lpthread" ;; + esac cat >>confdefs.h <<\_ACEOF #define HAVE_GTK_AND_PTHREAD 1 @@ -11840,6 +12011,113 @@ _ACEOF fi fi +HAVE_DBUS=no +if test "${with_dbus}" = "yes"; then + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + fi + + if test "$PKG_CONFIG" = "no" ; then + HAVE_DBUS=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for dbus-1 >= 1.0" >&5 +echo $ECHO_N "checking for dbus-1 >= 1.0... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "dbus-1 >= 1.0" 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 +echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; } + DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 +echo "${ECHO_T}$DBUS_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 +echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; } + DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 +echo "${ECHO_T}$DBUS_LIBS" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + DBUS_CFLAGS="" + DBUS_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 1.0"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_DBUS=yes + else + HAVE_DBUS=no + fi + + if test "$HAVE_DBUS" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DBUS 1 +_ACEOF + + fi +fi + ### Link with -lXft if available to work around a bug. HAVE_XFT=maybe if test "${HAVE_GTK}" = "yes"; then @@ -12163,9 +12441,7 @@ fi HAVE_XAW3D=no if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then - if test x"${HAVE_X11R5}" != xyes; then - USE_X_TOOLKIT=none - else + if test "$with_xaw3d" != no; then { echo "$as_me:$LINENO: checking for xaw3d" >&5 echo $ECHO_N "checking for xaw3d... $ECHO_C" >&6; } if test "${emacs_cv_xaw3d+set}" = set; then @@ -12218,22 +12494,25 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi - if test $emacs_cv_xaw3d = yes; then - { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 + else + emacs_cv_xaw3d=no + fi + if test $emacs_cv_xaw3d = yes; then + { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 echo "${ECHO_T}yes; using Lucid toolkit" >&6; } - USE_X_TOOLKIT=LUCID - HAVE_XAW3D=yes + USE_X_TOOLKIT=LUCID + HAVE_XAW3D=yes cat >>confdefs.h <<\_ACEOF #define HAVE_XAW3D 1 _ACEOF - else - { echo "$as_me:$LINENO: result: no" >&5 + else + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: checking for libXaw" >&5 + { echo "$as_me:$LINENO: checking for libXaw" >&5 echo $ECHO_N "checking for libXaw... $ECHO_C" >&6; } - if test "${emacs_cv_xaw+set}" = set; then + if test "${emacs_cv_xaw+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -12283,19 +12562,18 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi - if test $emacs_cv_xaw = yes; then - { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 + if test $emacs_cv_xaw = yes; then + { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 echo "${ECHO_T}yes; using Lucid toolkit" >&6; } - USE_X_TOOLKIT=LUCID - elif test x"${USE_X_TOOLKIT}" = xLUCID; then - { { echo "$as_me:$LINENO: error: Lucid toolkit requires X11/Xaw include files" >&5 + USE_X_TOOLKIT=LUCID + elif test x"${USE_X_TOOLKIT}" = xLUCID; then + { { echo "$as_me:$LINENO: error: Lucid toolkit requires X11/Xaw include files" >&5 echo "$as_me: error: Lucid toolkit requires X11/Xaw include files" >&2;} { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: result: no; do not use toolkit by default" >&5 + else + { echo "$as_me:$LINENO: result: no; do not use toolkit by default" >&5 echo "${ECHO_T}no; do not use toolkit by default" >&6; } - USE_X_TOOLKIT=none - fi + USE_X_TOOLKIT=none fi fi fi @@ -14120,13 +14398,13 @@ if test "${HAVE_X11}" = "yes"; then MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no" if test "X${MISSING}" != X; then - { { echo "$as_me:$LINENO: error: The following required libraries was not found: + { { echo "$as_me:$LINENO: error: The following required libraries were not found: $MISSING Maybe some development libraries/packages are missing? If you don't want to link with them give $WITH_NO as options to configure" >&5 -echo "$as_me: error: The following required libraries was not found: +echo "$as_me: error: The following required libraries were not found: $MISSING Maybe some development libraries/packages are missing? If you don't want to link with them give @@ -15128,6 +15406,12 @@ _ACEOF fi +if test x"$ac_cv_func_alloca_works" != xyes; then + { { echo "$as_me:$LINENO: error: a system implementation of alloca is required " >&5 +echo "$as_me: error: a system implementation of alloca is required " >&2;} + { (exit 1); exit 1; }; } +fi + # fmod, logb, and frexp are found in -lm on most systems. # On HPUX 9.01, -lm does not contain logb, so check for sqrt. @@ -15701,12 +15985,11 @@ done - for ac_func in gethostname getdomainname dup2 \ rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \ -random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \ +random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime setsid \ strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \ utimes setrlimit setpgid getcwd getwd shutdown getaddrinfo \ __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \ @@ -18313,13 +18596,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -18359,13 +18640,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -19394,10 +19673,123 @@ _ACEOF fi +# Do we have res_init, for detecting changes in /etc/resolv.conf? + +resolv=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +int +main () +{ +return res_init(); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + have_res_init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + have_res_init=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test "$have_res_init" = no; then + OLIBS="$LIBS" + LIBS="$LIBS -lresolv" + { echo "$as_me:$LINENO: checking for res_init with -lresolv" >&5 +echo $ECHO_N "checking for res_init with -lresolv... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +int +main () +{ +return res_init(); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + have_res_init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + have_res_init=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + { echo "$as_me:$LINENO: result: $have_res_init" >&5 +echo "${ECHO_T}$have_res_init" >&6; } + if test "$have_res_init" = yes ; then + resolv=yes + fi + LIBS="$OLIBS" +fi + +if test "$have_res_init" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_RES_INIT 1 +_ACEOF + +fi + # Do we need the Hesiod library to provide the support routines? if test "$with_hesiod" = yes ; then # Don't set $LIBS here -- see comments above. - resolv=no { echo "$as_me:$LINENO: checking for res_send" >&5 echo $ECHO_N "checking for res_send... $ECHO_C" >&6; } if test "${ac_cv_func_res_send+set}" = set; then @@ -19703,11 +20095,6 @@ fi if test "$resolv" = yes ; then RESOLVLIB=-lresolv - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBRESOLV 1 -_ACEOF - else RESOLVLIB= fi @@ -19870,6 +20257,15 @@ fi fi +# Do we need libresolv (due to res_init or Hesiod)? +if test "$resolv" = yes ; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBRESOLV 1 +_ACEOF + +fi + # These tell us which Kerberos-related libraries to use. if test "${with_kerberos+set}" = set; then @@ -23518,6 +23914,7 @@ echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" echo " Does Emacs use -ltiff? ${HAVE_TIFF}" echo " Does Emacs use a gif library? ${HAVE_GIF} $ac_gif_lib_name" echo " Does Emacs use -lpng? ${HAVE_PNG}" +echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" echo " Does Emacs use -lgpm? ${HAVE_GPM}" echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" echo @@ -23539,6 +23936,19 @@ if test "$USE_X_TOOLKIT" = GTK; then fi +if test "$HAVE_CARBON" = "yes"; then + echo + echo "Warning: The Mac Carbon port is currently unsupported and has +known problems. It is not recommended for use by non-developers. +Read the emacs-devel archives for more information." + echo +fi + +if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then + echo "D-Bus integration has been tested for GNU/Linux only." + echo +fi + # Remove any trailing slashes in these variables. test "${prefix}" != NONE && @@ -23568,7 +23978,7 @@ fi rm -f conftest* -ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in lisp/Makefile lispref/Makefile lispintro/Makefile leim/Makefile" +ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile.c:src/Makefile.in lwlib/Makefile lisp/Makefile leim/Makefile" ac_config_commands="$ac_config_commands default" @@ -23968,7 +24378,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by $as_me, which was +This file was extended by emacs $as_me 23.0.50, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24021,7 +24431,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +emacs config.status 23.0.50 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -24138,12 +24548,13 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lib-src/Makefile.c") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;; "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;; - "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; - "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;; + "doc/emacs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/emacs/Makefile" ;; + "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;; + "doc/lispintro/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispintro/Makefile" ;; + "doc/lispref/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispref/Makefile" ;; "src/Makefile.c") CONFIG_FILES="$CONFIG_FILES src/Makefile.c:src/Makefile.in" ;; + "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;; "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; - "lispref/Makefile") CONFIG_FILES="$CONFIG_FILES lispref/Makefile" ;; - "lispintro/Makefile") CONFIG_FILES="$CONFIG_FILES lispintro/Makefile" ;; "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; @@ -24271,6 +24682,7 @@ INSTALL_DATA!$INSTALL_DATA$ac_delim RANLIB!$RANLIB$ac_delim INSTALL_INFO!$INSTALL_INFO$ac_delim GZIP_PROG!$GZIP_PROG$ac_delim +MAKEINFO!$MAKEINFO$ac_delim LIBSOUND!$LIBSOUND$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim @@ -24279,8 +24691,12 @@ CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim SET_MAKE!$SET_MAKE$ac_delim XMKMF!$XMKMF$ac_delim HAVE_XSERVER!$HAVE_XSERVER$ac_delim +RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim +RSVG_LIBS!$RSVG_LIBS$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim GTK_LIBS!$GTK_LIBS$ac_delim +DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim +DBUS_LIBS!$DBUS_LIBS$ac_delim XFT_CFLAGS!$XFT_CFLAGS$ac_delim XFT_LIBS!$XFT_LIBS$ac_delim ALLOCA!$ALLOCA$ac_delim @@ -24300,11 +24716,6 @@ locallisppath!$locallisppath$ac_delim lisppath!$lisppath$ac_delim x_default_search_path!$x_default_search_path$ac_delim etcdir!$etcdir$ac_delim -archlibdir!$archlibdir$ac_delim -bitmapdir!$bitmapdir$ac_delim -gamedir!$gamedir$ac_delim -gameuser!$gameuser$ac_delim -c_switch_system!$c_switch_system$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -24346,6 +24757,11 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +archlibdir!$archlibdir$ac_delim +bitmapdir!$bitmapdir$ac_delim +gamedir!$gamedir$ac_delim +gameuser!$gameuser$ac_delim +c_switch_system!$c_switch_system$ac_delim c_switch_machine!$c_switch_machine$ac_delim LD_SWITCH_X_SITE!$LD_SWITCH_X_SITE$ac_delim LD_SWITCH_X_SITE_AUX!$LD_SWITCH_X_SITE_AUX$ac_delim @@ -24357,7 +24773,7 @@ carbon_appdir!$carbon_appdir$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5