X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/3a4336e6def99c0e15e2f9ae36e6f31b3d6dad69..9c8020a8df03dc67a56d7df15664dcf7ace54bf0:/configure diff --git a/configure b/configure index bbc3a5a18b..ae2dc48184 100755 --- a/configure +++ b/configure @@ -679,6 +679,7 @@ INSTALL_DATA RANLIB INSTALL_INFO GZIP_PROG +MAKEINFO LIBSOUND PKG_CONFIG ALSA_CFLAGS @@ -686,6 +687,9 @@ ALSA_LIBS CFLAGS_SOUND SET_MAKE XMKMF +HAVE_XSERVER +RSVG_CFLAGS +RSVG_LIBS GTK_CFLAGS GTK_LIBS XFT_CFLAGS @@ -1320,12 +1324,14 @@ if test -n "$ac_init_help"; then 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-font-backend compile code of font-backend support --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 @@ -1340,20 +1346,22 @@ 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 -lungif for displaying GIF images + --with-gif use -lgif (or -lungif) for displaying GIF images --with-png use -lpng for displaying PNG images --with-freetype use -lfreetype for local fonts support --with-xft use -lXft for anti aliased fonts --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 --with-x use the X Window System @@ -1823,12 +1831,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 @@ -1847,6 +1857,7 @@ fi + # Check whether --with-kerberos was given. if test "${with_kerberos+set}" = set; then withval=$with_kerberos; if test "$withval" = yes; then @@ -1859,6 +1870,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 @@ -1878,6 +1890,7 @@ fi fi + # Check whether --with-hesiod was given. if test "${with_hesiod+set}" = set; then withval=$with_hesiod; if test "$withval" = yes; then @@ -1901,19 +1914,19 @@ fi # Check whether --with-x-toolkit was given. if test "${with_x_toolkit+set}" = set; then withval=$with_x_toolkit; case "${withval}" in - y | ye | yes ) val=athena ;; + y | ye | yes ) val=gtk ;; n | no ) val=no ;; l | lu | luc | luci | lucid ) val=lucid ;; a | at | ath | athe | athen | athena ) val=athena ;; m | mo | mot | moti | motif ) val=motif ;; g | gt | gtk ) val=gtk ;; * ) -{ { echo "$as_me:$LINENO: error: \`--with-x-toolkit=$withval' is invalid\; +{ { echo "$as_me:$LINENO: error: \`--with-x-toolkit=$withval' is invalid; this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif' or \`gtk'. -Currently, \`yes', \`athena' and \`lucid' are synonyms." >&5 -echo "$as_me: error: \`--with-x-toolkit=$withval' is invalid\; +\`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." >&5 +echo "$as_me: error: \`--with-x-toolkit=$withval' is invalid; this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif' or \`gtk'. -Currently, \`yes', \`athena' and \`lucid' are synonyms." >&2;} +\`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -1922,6 +1935,7 @@ Currently, \`yes', \`athena' and \`lucid' are synonyms." >&2;} fi + # Check whether --with-xpm was given. if test "${with_xpm+set}" = set; then withval=$with_xpm; @@ -1970,6 +1984,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; @@ -1988,6 +2008,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; @@ -1999,6 +2025,7 @@ if test "${with_carbon+set}" = set; then withval=$with_carbon; fi + # Check whether --enable-carbon-app was given. if test "${enable_carbon_app+set}" = set; then enableval=$enable_carbon_app; carbon_appdir_x=${enableval} @@ -3032,14 +3059,8 @@ _ACEOF ;; *-sunos5* | *-solaris* ) opsys=sol2-6 -## FIXME: make this into a proper fix that checks the compiler type, -## rather than relying on path. Or is /usr/ccs/lib/cpp a bad default now? - if [ "x$CC" = x/opt/SUNWspro/bin/cc ]; then - ## -Xs prevents spurious whitespace. - NON_GNU_CPP="/opt/SUNWspro/bin/cc -E -Xs" - else - NON_GNU_CPP=/usr/ccs/lib/cpp - fi + emacs_check_sunpro_c=yes + NON_GNU_CPP=/usr/ccs/lib/cpp ;; * ) opsys=bsd4-2 ;; esac @@ -4195,6 +4216,72 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi +## If not using gcc, and on Solaris, and no CPP specified, see if +## using a Sun compiler, which needs -Xs to prevent whitespace. +if test x"$GCC" != xyes && test x"$emacs_check_sunpro_c" = xyes && \ + test x"$CPP" = x; then + { echo "$as_me:$LINENO: checking whether we are using a Sun C compiler" >&5 +echo $ECHO_N "checking whether we are using a Sun C compiler... $ECHO_C" >&6; } + +if test "${emacs_cv_sunpro_c+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. */ + +int +main () +{ +#ifndef __SUNPRO_C +fail; +#endif + + ; + 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 + emacs_cv_sunpro_c=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + emacs_cv_sunpro_c=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + { echo "$as_me:$LINENO: result: $emacs_cv_sunpro_c" >&5 +echo "${ECHO_T}$emacs_cv_sunpro_c" >&6; } + + if test x"$emacs_cv_sunpro_c" = xyes; then + NON_GNU_CPP="$CC -E -Xs" + fi +fi + #### Some systems specify a CPP to use unless we are using GCC. #### Now that we know whether we are using GCC, we can decide whether #### to use that one. @@ -4222,7 +4309,6 @@ then CC="$CC $NON_GCC_TEST_OPTIONS" fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5291,6 +5377,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" @@ -9539,7 +9680,13 @@ case "${window_system}" in gtk ) with_gtk=yes USE_X_TOOLKIT=none ;; no ) USE_X_TOOLKIT=none ;; - * ) USE_X_TOOLKIT=maybe ;; + * ) + if test x"$with_gtk" = xyes; then + USE_X_TOOLKIT=none + else + USE_X_TOOLKIT=maybe + fi + ;; esac ;; mac | none ) @@ -9549,6 +9696,68 @@ case "${window_system}" in ;; esac +if test "$window_system" = none && test "X$with_x" != "Xno"; then + # Extract the first word of "X", so it can be a program name with args. +set dummy X; 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_prog_HAVE_XSERVER+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$HAVE_XSERVER"; then + ac_cv_prog_HAVE_XSERVER="$HAVE_XSERVER" # Let the user override the test. +else +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_prog_HAVE_XSERVER="true" + 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_prog_HAVE_XSERVER" && ac_cv_prog_HAVE_XSERVER="false" +fi +fi +HAVE_XSERVER=$ac_cv_prog_HAVE_XSERVER +if test -n "$HAVE_XSERVER"; then + { echo "$as_me:$LINENO: result: $HAVE_XSERVER" >&5 +echo "${ECHO_T}$HAVE_XSERVER" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + if test "$HAVE_XSERVER" = true || + 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 +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 +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." >&2;} + { (exit 1); exit 1; }; } + fi +fi + ### If we're using X11, we should use the X menu package. HAVE_MENUS=no case ${HAVE_X11} in @@ -10970,18 +11179,143 @@ echo "${ECHO_T}before 5" >&6; } fi fi +### 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 + 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 + : + 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_RSVG 1 +_ACEOF + + 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 fi -if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then +if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \ + test "$USE_X_TOOLKIT" = "maybe"; then if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5 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 @@ -11035,11 +11369,7 @@ fi fi if test "$PKG_CONFIG" = "no" ; then - { { echo "$as_me:$LINENO: error: - *** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." >&5 -echo "$as_me: error: - *** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." >&2;} - { (exit 1); exit 1; }; } + pkg_check_gtk=no else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then @@ -11070,7 +11400,7 @@ echo "${ECHO_T}no" >&6; } ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GTK_MODULES"` - echo $GTK_PKG_ERRORS + fi @@ -11082,12 +11412,20 @@ echo "${ECHO_T}no" >&6; } fi if test $succeeded = yes; then - : + pkg_check_gtk=yes else - { { echo "$as_me:$LINENO: error: Library requirements ($GTK_MODULES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements ($GTK_MODULES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + pkg_check_gtk=no + fi + + if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then + { { echo "$as_me:$LINENO: error: $GTK_PKG_ERRORS" >&5 +echo "$as_me: error: $GTK_PKG_ERRORS" >&2;} { (exit 1); exit 1; }; } fi +fi + + +if test x"$pkg_check_gtk" = xyes; then @@ -11190,18 +11528,25 @@ fi done if test "${GTK_COMPILES}" != "yes"; then - { { echo "$as_me:$LINENO: error: Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" >&5 + if test "$USE_X_TOOLKIT" != "maybe"; then + { { echo "$as_me:$LINENO: error: Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" >&5 echo "$as_me: error: Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" >&2;} { (exit 1); exit 1; }; }; - fi - - HAVE_GTK=yes + fi + else + HAVE_GTK=yes cat >>confdefs.h <<\_ACEOF #define HAVE_GTK 1 _ACEOF - USE_X_TOOLKIT=none + USE_X_TOOLKIT=none + fi + +fi + + +if test "${HAVE_GTK}" = "yes"; then if test "$with_toolkit_scroll_bars" != no; then with_toolkit_scroll_bars=yes @@ -11309,6 +11654,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi + HAVE_GTK_FILE_SELECTION=no for ac_func in gtk_file_selection_new @@ -11720,7 +12066,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 @@ -11730,11 +12079,15 @@ _ACEOF fi 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 - { echo "$as_me:$LINENO: checking X11 version 5 with Xaw" >&5 -echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6; } - if test "${emacs_cv_x11_version_5_with_xaw+set}" = set; 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -11745,7 +12098,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include +#include int main () { @@ -11772,35 +12125,100 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - emacs_cv_x11_version_5_with_xaw=yes + emacs_cv_xaw3d=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - emacs_cv_x11_version_5_with_xaw=no + emacs_cv_xaw3d=no 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_with_xaw = yes; then - { echo "$as_me:$LINENO: result: 5 or newer, with Xaw; use toolkit by default" >&5 -echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6; } + 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 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XAW3D 1 +_ACEOF + else - if test x"${USE_X_TOOLKIT}" = xLUCID; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { 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 + 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 +#include +int +main () +{ + + ; + 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 + emacs_cv_xaw=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + emacs_cv_xaw=no +fi + +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 +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 echo "$as_me: error: Lucid toolkit requires X11/Xaw include files" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: before 5 or no Xaw; do not use toolkit by default" >&5 -echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6; } + { 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 fi - else - USE_X_TOOLKIT=none fi fi @@ -12200,126 +12618,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 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_objext; then - emacs_cv_lesstif=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - emacs_cv_lesstif=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $emacs_cv_lesstif" >&5 -echo "${ECHO_T}$emacs_cv_lesstif" >&6; } - 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 - fi -fi - -### Is -lXaw3d available? -HAVE_XAW3D=no -if test "${HAVE_X11}" = "yes"; then - if test "${USE_X_TOOLKIT}" != "none" && test "${with_toolkit_scroll_bars}" != "no"; then - { echo "$as_me:$LINENO: checking for X11/Xaw3d/Scrollbar.h" >&5 -echo $ECHO_N "checking for X11/Xaw3d/Scrollbar.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xaw3d_Scrollbar_h+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 -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_cv_header_X11_Xaw3d_Scrollbar_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_X11_Xaw3d_Scrollbar_h=no -fi - -rm -f conftest.err conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_Scrollbar_h" >&6; } -if test $ac_cv_header_X11_Xaw3d_Scrollbar_h = yes; then - { echo "$as_me:$LINENO: checking for XawScrollbarSetThumb in -lXaw3d" >&5 -echo $ECHO_N "checking for XawScrollbarSetThumb in -lXaw3d... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXaw3d $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XawScrollbarSetThumb (); -int -main () -{ -return XawScrollbarSetThumb (); - ; - 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 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -12328,35 +12627,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 - ac_cv_lib_Xaw3d_XawScrollbarSetThumb=yes + } && test -s conftest.$ac_objext; then + emacs_cv_lesstif=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xaw3d_XawScrollbarSetThumb=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5 -echo "${ECHO_T}$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6; } -if test $ac_cv_lib_Xaw3d_XawScrollbarSetThumb = yes; then - HAVE_XAW3D=yes + emacs_cv_lesstif=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - - if test "${HAVE_XAW3D}" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XAW3D 1 -_ACEOF - +{ echo "$as_me:$LINENO: result: $emacs_cv_lesstif" >&5 +echo "${ECHO_T}$emacs_cv_lesstif" >&6; } + 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 fi fi @@ -14121,11 +14415,10 @@ _ACEOF fi fi -### Use -lgif if available, unless `--with-gif=no'. +### Use -lgif or -lungif if available, unless `--with-gif=no'. HAVE_GIF=no -if test "${HAVE_X11}" = "yes"; then - if test "${with_gif}" != "no"; then - if test "${ac_cv_header_gif_lib_h+set}" = set; then +if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then + if test "${ac_cv_header_gif_lib_h+set}" = set; then { echo "$as_me:$LINENO: checking for gif_lib.h" >&5 echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6; } if test "${ac_cv_header_gif_lib_h+set}" = set; then @@ -14253,7 +14546,84 @@ fi if test $ac_cv_header_gif_lib_h = yes; then # EGifPutExtensionLast only exists from version libungif-4.1.0b1. # Earlier versions can crash Emacs. - { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5 + { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5 +echo $ECHO_N "checking for EGifPutExtensionLast in -lgif... $ECHO_C" >&6; } +if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgif $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char EGifPutExtensionLast (); +int +main () +{ +return EGifPutExtensionLast (); + ; + 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 + ac_cv_lib_gif_EGifPutExtensionLast=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_gif_EGifPutExtensionLast=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5 +echo "${ECHO_T}$ac_cv_lib_gif_EGifPutExtensionLast" >&6; } +if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then + HAVE_GIF=yes +else + try_libungif=yes +fi + +fi + + + + if test "$HAVE_GIF" = yes; then + ac_gif_lib_name="-lgif" + fi + +# If gif_lib.h but no libgif, try libungif. + if test x"$try_libungif" = xyes; then + { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5 echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; } if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14318,9 +14688,15 @@ if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then HAVE_GIF=yes fi -fi + if test "$HAVE_GIF" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define LIBGIF -lungif +_ACEOF + ac_gif_lib_name="-lungif" + fi fi if test "${HAVE_GIF}" = "yes"; then @@ -14332,6 +14708,37 @@ _ACEOF fi fi +if test "${HAVE_X11}" = "yes"; then + MISSING="" + WITH_NO="" + test "${with_xpm}" != "no" && test "${HAVE_XPM}" != "yes" && + MISSING="libXpm" && WITH_NO="--with-xpm=no" + test "${with_jpeg}" != "no" && test "${HAVE_JPEG}" != "yes" && + MISSING="$MISSING libjpeg" && WITH_NO="$WITH_NO --with-jpeg=no" + test "${with_png}" != "no" && test "${HAVE_PNG}" != "yes" && + MISSING="$MISSING libpng" && WITH_NO="$WITH_NO --with-png=no" + test "${with_gif}" != "no" && test "${HAVE_GIF}" != "yes" && + MISSING="$MISSING libgif/libungif" && WITH_NO="$WITH_NO --with-gif=no" + test "${with_tiff}" != "no" && test "${HAVE_TIFF}" != "yes" && + 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 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 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" >&2;} + { (exit 1); exit 1; }; } + fi +fi + ### Use -lgpm if available, unless `--with-gpm=no'. HAVE_GPM=no if test "${with_gpm}" != "no"; then @@ -15324,6 +15731,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. @@ -15897,12 +16310,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 \ @@ -18509,13 +18921,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; } @@ -18555,13 +18965,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; } @@ -19590,10 +19998,165 @@ _ACEOF fi +# Do we have res_init, for detecting changes in /etc/resolv.conf? + +resolv=no +{ echo "$as_me:$LINENO: checking for res_init" >&5 +echo $ECHO_N "checking for res_init... $ECHO_C" >&6; } +if test "${ac_cv_func_res_init+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. */ +/* Define res_init to an innocuous variant, in case declares res_init. + For example, HP-UX 11i declares gettimeofday. */ +#define res_init innocuous_res_init + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char res_init (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef res_init + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_init (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_res_init || defined __stub___res_init +choke me +#endif + +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 + ac_cv_func_res_init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_res_init=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5 +echo "${ECHO_T}$ac_cv_func_res_init" >&6; } +if test $ac_cv_func_res_init = yes; then + have_res_init=yes +else + have_res_init=no +fi + +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 () +{ +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 @@ -19899,11 +20462,6 @@ fi if test "$resolv" = yes ; then RESOLVLIB=-lresolv - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBRESOLV 1 -_ACEOF - else RESOLVLIB= fi @@ -20066,6 +20624,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 @@ -23675,6 +24242,7 @@ fi + #### Report on what we decided to do. #### Report GTK as a toolkit, even if it doesn't use Xt. #### It makes printing result more understandable as using GTK sets @@ -23711,8 +24279,9 @@ echo " Does Emacs use -lXaw3d? ${HAVE_XAW3D}" echo " Does Emacs use -lXpm? ${HAVE_XPM}" echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" echo " Does Emacs use -ltiff? ${HAVE_TIFF}" -echo " Does Emacs use -lungif? ${HAVE_GIF}" +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 @@ -23763,7 +24332,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" @@ -24333,12 +24902,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" ;; @@ -24466,6 +25036,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 @@ -24473,6 +25044,9 @@ ALSA_LIBS!$ALSA_LIBS$ac_delim 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 XFT_CFLAGS!$XFT_CFLAGS$ac_delim @@ -24496,10 +25070,6 @@ version!$version$ac_delim configuration!$configuration$ac_delim canonical!$canonical$ac_delim srcdir!$srcdir$ac_delim -lispdir!$lispdir$ac_delim -locallisppath!$locallisppath$ac_delim -lisppath!$lisppath$ac_delim -x_default_search_path!$x_default_search_path$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -24541,6 +25111,10 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +lispdir!$lispdir$ac_delim +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 @@ -24558,7 +25132,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` = 15; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5