From: Miles Bader Date: Mon, 1 Jan 2007 03:21:06 +0000 (+0000) Subject: Merge from emacs--devo--0 X-Git-Tag: emacs-pretest-23.0.90~8295^2~621 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4c34eeeee5886d14f3e60b77fb563cb549c8896f;p=emacs.git Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 563-582) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 177-185) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158 --- 4c34eeeee5886d14f3e60b77fb563cb549c8896f diff --cc configure index 645820a18b6,6d63a92fc97..d4f82d57f7e --- a/configure +++ b/configure @@@ -310,8 -614,124 +614,19 @@@ ac_includes_default=" # include #endif" -ac_header_list= -ac_func_list= -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -MAINT -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -CPP -GREP -EGREP -LN_S -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -RANLIB -INSTALL_INFO -GZIP_PROG -LIBSOUND -PKG_CONFIG -ALSA_CFLAGS -ALSA_LIBS - -CFLAGS_SOUND -SET_MAKE -XMKMF -GTK_CFLAGS -GTK_LIBS -ALLOCA -liblockfile -LIBOBJS -NEED_SETGID -KMEM_GROUP -GETLOADAVG_LIBS -GETOPT_H -GETOPTOBJS -version -configuration -canonical -srcdir -lispdir -locallisppath -lisppath -x_default_search_path -etcdir -archlibdir -bitmapdir -gamedir -gameuser -c_switch_system -c_switch_machine -LD_SWITCH_X_SITE -LD_SWITCH_X_SITE_AUX -C_SWITCH_X_SITE -X_TOOLKIT_TYPE -machfile -opsysfile -carbon_appdir -LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INSTALL_INFO GZIP_PROG LIBSOUND PKG_CONFIG ALSA_CFLAGS ALSA_LIBS CFLAGS_SOUND SET_MAKE GTK_CFLAGS GTK_LIBS XFT_CFLAGS XFT_LIBS FREETYPE_CFLAGS FREETYPE_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS HAVE_LIBOTF LIBOTF_CFLAGS LIBOTF_LIBS ALLOCA liblockfile LIBOBJS NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS GETOPT_H GETOPTOBJS version configuration canonical srcdir lispdir locallisppath lisppath x_default_search_path etcdir archlibdir docdir bitmapdir gamedir gameuser c_switch_system c_switch_machine LD_SWITCH_X_SITE LD_SWITCH_X_SITE_AUX C_SWITCH_X_SITE X_TOOLKIT_TYPE machfile opsysfile carbon_appdir LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias + host_alias + target_alias + CC + CFLAGS + LDFLAGS + LIBS + CPPFLAGS + CPP + XMKMF' + # Initialize some variables set by options. ac_init_help= @@@ -1460,108 -1903,89 +1801,109 @@@ Currently, \`yes', \`athena' and \`luci esac with_x_toolkit=$val - fi; + fi + - # Check whether --with-xpm or --without-xpm was given. + # Check whether --with-xpm was given. if test "${with_xpm+set}" = set; then - withval="$with_xpm" + withval=$with_xpm; + fi - fi; - # Check whether --with-jpeg or --without-jpeg was given. + # Check whether --with-jpeg was given. if test "${with_jpeg+set}" = set; then - withval="$with_jpeg" + withval=$with_jpeg; + fi - fi; - # Check whether --with-tiff or --without-tiff was given. + # Check whether --with-tiff was given. if test "${with_tiff+set}" = set; then - withval="$with_tiff" + withval=$with_tiff; + fi - fi; - # Check whether --with-gif or --without-gif was given. + # Check whether --with-gif was given. if test "${with_gif+set}" = set; then - withval="$with_gif" + withval=$with_gif; + fi - fi; - # Check whether --with-png or --without-png was given. + # Check whether --with-png was given. if test "${with_png+set}" = set; then - withval="$with_png" + withval=$with_png; + fi - fi; -# Check whether --with-gtk was given. +# Check whether --with-freetype or --without-freetype was given. +if test "${with_freetype+set}" = set; then + withval="$with_freetype" + +fi; + +# Check whether --with-xft or --without-xft was given. +if test "${with_xft+set}" = set; then + withval="$with_xft" + +fi; + +# Check whether --with-gtk or --without-gtk was given. if test "${with_gtk+set}" = set; then - withval="$with_gtk" + withval=$with_gtk; + fi - fi; - # Check whether --with-pkg-config-prog or --without-pkg-config-prog was given. + # Check whether --with-pkg-config-prog was given. if test "${with_pkg_config_prog+set}" = set; then - withval="$with_pkg_config_prog" + withval=$with_pkg_config_prog; + fi - fi; - # Check whether --with-toolkit-scroll-bars or --without-toolkit-scroll-bars was given. + # Check whether --with-toolkit-scroll-bars was given. if test "${with_toolkit_scroll_bars+set}" = set; then - withval="$with_toolkit_scroll_bars" + withval=$with_toolkit_scroll_bars; + fi - fi; - # Check whether --with-xim or --without-xim was given. + # Check whether --with-xim was given. if test "${with_xim+set}" = set; then - withval="$with_xim" + withval=$with_xim; + fi - fi; - # Check whether --with-carbon or --without-carbon was given. + # Check whether --with-carbon was given. if test "${with_carbon+set}" = set; then - withval="$with_carbon" + withval=$with_carbon; + fi - fi; - # Check whether --enable-carbon-app or --disable-carbon-app was given. + # Check whether --enable-carbon-app was given. if test "${enable_carbon_app+set}" = set; then - enableval="$enable_carbon_app" - carbon_appdir_x=${enableval} - fi; + enableval=$enable_carbon_app; carbon_appdir_x=${enableval} + fi + -# Check whether --enable-asserts was given. +# Check whether --enable-font-backend or --disable-font-backend was given. +if test "${enable_font_backend+set}" = set; then + enableval="$enable_font_backend" + USE_FONT_BACKEND=$enableval +else + USE_FONT_BACKEND=no +fi; + +# Check whether --enable-asserts or --disable-asserts was given. if test "${enable_asserts+set}" = set; then - enableval="$enable_asserts" - USE_XASSERTS=$enableval + enableval=$enable_asserts; USE_XASSERTS=$enableval else USE_XASSERTS=no - fi; + fi + - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. + # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" - USE_MAINTAINER_MODE=$enableval + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no - fi; + fi + if test $USE_MAINTAINER_MODE = yes; then MAINT= else @@@ -12233,548 -12690,32 +12726,533 @@@ _ACEO fi fi fi +fi - if test "${HAVE_XPM}" = "yes"; then +HAVE_FREETYPE=no +### Use -lfreetype if available, unless `--with-freetype=no'. +if test "${HAVE_XFT}" = "yes"; then + HAVE_FREETYPE=yes +elif test "x${with_freetype}" != "xno"; then + if test "X${with_pkg_config_prog}" != X; then + PKG_CONFIG="${with_pkg_config_prog}" + fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_XPM 1 -_ACEOF - fi -fi + succeeded=no -### Use -ljpeg if available, unless `--with-jpeg=no'. -HAVE_JPEG=no -if test "${HAVE_X11}" = "yes"; then - if test "${with_jpeg}" != "no"; then - if test "${ac_cv_header_jerror_h+set}" = set; then - { echo "$as_me:$LINENO: checking for jerror.h" >&5 -echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6; } -if test "${ac_cv_header_jerror_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + 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 $as_executable_p "$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 + + 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 + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or give the full path to pkg-config with" + echo "*** the PKG_CONFIG environment variable or --with-pkg-config-prog." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + 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 freetype2" >&5 +echo $ECHO_N "checking for freetype2... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "freetype2" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 +echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6 + FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2"` + echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 +echo "${ECHO_T}$FREETYPE_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 +echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6 + FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2"` + echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 +echo "${ECHO_T}$FREETYPE_LIBS" >&6 + else + FREETYPE_CFLAGS="" + FREETYPE_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"` + + 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_FREETYPE=yes + else + HAVE_FREETYPE=no + fi + + if test "${HAVE_FREETYPE}" = "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 $as_executable_p "$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 + + 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 + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or give the full path to pkg-config with" + echo "*** the PKG_CONFIG environment variable or --with-pkg-config-prog." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + 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 fontconfig" >&5 +echo $ECHO_N "checking for fontconfig... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "fontconfig" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking FONTCONFIG_CFLAGS" >&5 +echo $ECHO_N "checking FONTCONFIG_CFLAGS... $ECHO_C" >&6 + FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig"` + echo "$as_me:$LINENO: result: $FONTCONFIG_CFLAGS" >&5 +echo "${ECHO_T}$FONTCONFIG_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking FONTCONFIG_LIBS" >&5 +echo $ECHO_N "checking FONTCONFIG_LIBS... $ECHO_C" >&6 + FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig"` + echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5 +echo "${ECHO_T}$FONTCONFIG_LIBS" >&6 + else + FONTCONFIG_CFLAGS="" + FONTCONFIG_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig"` + + 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_FC=yes + else + HAVE_FC=no + fi + + if test "${HAVE_FC}" = "no"; then + HAVE_FREETYPE=no + fi + fi +fi +if test "${HAVE_FREETYPE}" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FREETYPE 1 +_ACEOF + + # Extract the first word of "libotf-config", so it can be a program name with args. +set dummy libotf-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_prog_HAVE_LIBOTF+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$HAVE_LIBOTF"; then + ac_cv_prog_HAVE_LIBOTF="$HAVE_LIBOTF" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_LIBOTF="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_HAVE_LIBOTF" && ac_cv_prog_HAVE_LIBOTF="no" +fi +fi +HAVE_LIBOTF=$ac_cv_prog_HAVE_LIBOTF +if test -n "$HAVE_LIBOTF"; then + echo "$as_me:$LINENO: result: $HAVE_LIBOTF" >&5 +echo "${ECHO_T}$HAVE_LIBOTF" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "${HAVE_LIBOTF}" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBOTF 1 +_ACEOF + + LIBOTF_CFLAGS=`libotf-config --cflags` + LIBOTF_LIBS=`libotf-config --libs` + fi +fi + + + + + + + +fi + +### Use -lXpm if available, unless `--with-xpm=no'. +HAVE_XPM=no +if test "${HAVE_X11}" = "yes"; then + if test "${with_xpm}" != "no"; then + if test "${ac_cv_header_X11_xpm_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 - echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 ++echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; } +if test "${ac_cv_header_X11_xpm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi - echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 - echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; } +else + # Is the header compilable? - echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5 - echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5 ++echo $ECHO_N "checking X11/xpm.h usability... $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. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++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_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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + - ac_header_compiler=no ++ ac_header_compiler=no +fi - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? - echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5 - echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5 ++echo $ECHO_N "checking X11/xpm.h presence... $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 +_ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++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; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi - else - ac_cpp_err=yes - fi - if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi ++ +rm -f conftest.err conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 - echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/xpm.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: X11/xpm.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: X11/xpm.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/xpm.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/xpm.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX - ## ------------------------------------------ ## - ## Report this to the AC_PACKAGE_NAME lists. ## - ## ------------------------------------------ ## - _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; +esac - echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 - echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 ++echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; } +if test "${ac_cv_header_X11_xpm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_X11_xpm_h=$ac_header_preproc +fi - echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 - echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; } + +fi +if test $ac_cv_header_X11_xpm_h = yes; then - echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in -lXpm" >&5 - echo $ECHO_N "checking for XpmReadFileToPixmap in -lXpm... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in -lXpm" >&5 ++echo $ECHO_N "checking for XpmReadFileToPixmap in -lXpm... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXpm -lX11 $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 gcc2 internal prototype to avoid an error. */ ++/* 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 - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ +char XpmReadFileToPixmap (); +int +main () +{ - XpmReadFileToPixmap (); ++return XpmReadFileToPixmap (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 ++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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then ++ (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_Xpm_XpmReadFileToPixmap=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + - ac_cv_lib_Xpm_XpmReadFileToPixmap=no ++ ac_cv_lib_Xpm_XpmReadFileToPixmap=no +fi - rm -f conftest.err conftest.$ac_objext \ ++ ++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_Xpm_XpmReadFileToPixmap" >&5 - echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; } +if test $ac_cv_lib_Xpm_XpmReadFileToPixmap = yes; then + HAVE_XPM=yes +fi + +fi + + + if test "${HAVE_XPM}" = "yes"; then - echo "$as_me:$LINENO: checking for XpmReturnAllocPixels preprocessor define" >&5 - echo $ECHO_N "checking for XpmReturnAllocPixels preprocessor define... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for XpmReturnAllocPixels preprocessor define" >&5 ++echo $ECHO_N "checking for XpmReturnAllocPixels preprocessor define... $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 "X11/xpm.h" +#ifndef XpmReturnAllocPixels +no_return_alloc_pixels +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "no_return_alloc_pixels" >/dev/null 2>&1; then + HAVE_XPM=no +else + HAVE_XPM=yes +fi +rm -f conftest* + + + if test "${HAVE_XPM}" = "yes"; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + fi + fi + + if test "${HAVE_XPM}" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XPM 1 +_ACEOF + + fi +fi + +### Use -ljpeg if available, unless `--with-jpeg=no'. +HAVE_JPEG=no +if test "${HAVE_X11}" = "yes"; then + if test "${with_jpeg}" != "no"; then + if test "${ac_cv_header_jerror_h+set}" = set; then - echo "$as_me:$LINENO: checking for jerror.h" >&5 - echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for jerror.h" >&5 ++echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6; } +if test "${ac_cv_header_jerror_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 fi - echo "$as_me:$LINENO: result: $ac_cv_header_jerror_h" >&5 - echo "${ECHO_T}$ac_cv_header_jerror_h" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_header_jerror_h" >&5 + echo "${ECHO_T}$ac_cv_header_jerror_h" >&6; } else # Is the header compilable? - echo "$as_me:$LINENO: checking jerror.h usability" >&5 - echo $ECHO_N "checking jerror.h usability... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking jerror.h usability" >&5 + echo $ECHO_N "checking jerror.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@ -23955,184 -23414,286 +24123,429 @@@ $debug | { (exit 1); exit 1; } } - _ACEOF + # + # Set up the sed scripts for CONFIG_FILES section. + # + + # No need to generate the scripts if there are no CONFIG_FILES. + # This happens for instance when ./config.status config.h + if test -n "$CONFIG_FILES"; then + + _ACEOF + + + + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF + SHELL!$SHELL$ac_delim + PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim + PACKAGE_NAME!$PACKAGE_NAME$ac_delim + PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim + PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim + PACKAGE_STRING!$PACKAGE_STRING$ac_delim + PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim + exec_prefix!$exec_prefix$ac_delim + prefix!$prefix$ac_delim + program_transform_name!$program_transform_name$ac_delim + bindir!$bindir$ac_delim + sbindir!$sbindir$ac_delim + libexecdir!$libexecdir$ac_delim + datarootdir!$datarootdir$ac_delim + datadir!$datadir$ac_delim + sysconfdir!$sysconfdir$ac_delim + sharedstatedir!$sharedstatedir$ac_delim + localstatedir!$localstatedir$ac_delim + includedir!$includedir$ac_delim + oldincludedir!$oldincludedir$ac_delim + docdir!$docdir$ac_delim + infodir!$infodir$ac_delim + htmldir!$htmldir$ac_delim + dvidir!$dvidir$ac_delim + pdfdir!$pdfdir$ac_delim + psdir!$psdir$ac_delim + libdir!$libdir$ac_delim + localedir!$localedir$ac_delim + mandir!$mandir$ac_delim + DEFS!$DEFS$ac_delim + ECHO_C!$ECHO_C$ac_delim + ECHO_N!$ECHO_N$ac_delim + ECHO_T!$ECHO_T$ac_delim + LIBS!$LIBS$ac_delim + build_alias!$build_alias$ac_delim + host_alias!$host_alias$ac_delim + target_alias!$target_alias$ac_delim + MAINT!$MAINT$ac_delim + build!$build$ac_delim + build_cpu!$build_cpu$ac_delim + build_vendor!$build_vendor$ac_delim + build_os!$build_os$ac_delim + host!$host$ac_delim + host_cpu!$host_cpu$ac_delim + host_vendor!$host_vendor$ac_delim + host_os!$host_os$ac_delim + CC!$CC$ac_delim + CFLAGS!$CFLAGS$ac_delim + LDFLAGS!$LDFLAGS$ac_delim + CPPFLAGS!$CPPFLAGS$ac_delim + ac_ct_CC!$ac_ct_CC$ac_delim + EXEEXT!$EXEEXT$ac_delim + OBJEXT!$OBJEXT$ac_delim + CPP!$CPP$ac_delim + GREP!$GREP$ac_delim + EGREP!$EGREP$ac_delim + LN_S!$LN_S$ac_delim + INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim + INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim + INSTALL_DATA!$INSTALL_DATA$ac_delim + RANLIB!$RANLIB$ac_delim + INSTALL_INFO!$INSTALL_INFO$ac_delim + GZIP_PROG!$GZIP_PROG$ac_delim + LIBSOUND!$LIBSOUND$ac_delim + PKG_CONFIG!$PKG_CONFIG$ac_delim + ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim + ALSA_LIBS!$ALSA_LIBS$ac_delim + CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim + SET_MAKE!$SET_MAKE$ac_delim + XMKMF!$XMKMF$ac_delim + GTK_CFLAGS!$GTK_CFLAGS$ac_delim + GTK_LIBS!$GTK_LIBS$ac_delim + ALLOCA!$ALLOCA$ac_delim + liblockfile!$liblockfile$ac_delim + LIBOBJS!$LIBOBJS$ac_delim + NEED_SETGID!$NEED_SETGID$ac_delim + KMEM_GROUP!$KMEM_GROUP$ac_delim + GETLOADAVG_LIBS!$GETLOADAVG_LIBS$ac_delim + GETOPT_H!$GETOPT_H$ac_delim + GETOPTOBJS!$GETOPTOBJS$ac_delim + 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 + 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 + 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 + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 + echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi + done + + ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` + if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` + fi cat >>$CONFIG_STATUS <<_ACEOF + cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b + _ACEOF + sed ' + s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g + s/^/s,@/; s/!/@,|#_!!_#|/ + :n + t n + s/'"$ac_delim"'$/,g/; t + s/$/\\/; p + N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n + ' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF + CEOF$ac_eof + _ACEOF - # - # CONFIG_FILES section. - # + + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF + C_SWITCH_X_SITE!$C_SWITCH_X_SITE$ac_delim + X_TOOLKIT_TYPE!$X_TOOLKIT_TYPE$ac_delim + machfile!$machfile$ac_delim + opsysfile!$opsysfile$ac_delim + 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` = 6; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "\$CONFIG_FILES"; then + # Protect against being on the right side of a sed subst in config.status. + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@exec_prefix@,$exec_prefix,;t t +s,@prefix@,$prefix,;t t +s,@program_transform_name@,$program_transform_name,;t t +s,@bindir@,$bindir,;t t +s,@sbindir@,$sbindir,;t t +s,@libexecdir@,$libexecdir,;t t +s,@datadir@,$datadir,;t t +s,@sysconfdir@,$sysconfdir,;t t +s,@sharedstatedir@,$sharedstatedir,;t t +s,@localstatedir@,$localstatedir,;t t +s,@libdir@,$libdir,;t t +s,@includedir@,$includedir,;t t +s,@oldincludedir@,$oldincludedir,;t t +s,@infodir@,$infodir,;t t +s,@mandir@,$mandir,;t t +s,@build_alias@,$build_alias,;t t +s,@host_alias@,$host_alias,;t t +s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t +s,@ECHO_C@,$ECHO_C,;t t +s,@ECHO_N@,$ECHO_N,;t t +s,@ECHO_T@,$ECHO_T,;t t +s,@LIBS@,$LIBS,;t t +s,@MAINT@,$MAINT,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t +s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t +s,@LN_S@,$LN_S,;t t +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@RANLIB@,$RANLIB,;t t +s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s,@INSTALL_INFO@,$INSTALL_INFO,;t t +s,@GZIP_PROG@,$GZIP_PROG,;t t +s,@LIBSOUND@,$LIBSOUND,;t t +s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@ALSA_CFLAGS@,$ALSA_CFLAGS,;t t +s,@ALSA_LIBS@,$ALSA_LIBS,;t t +s,@CFLAGS_SOUND@,$CFLAGS_SOUND,;t t +s,@SET_MAKE@,$SET_MAKE,;t t +s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t +s,@GTK_LIBS@,$GTK_LIBS,;t t +s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t +s,@XFT_LIBS@,$XFT_LIBS,;t t +s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t +s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t +s,@FONTCONFIG_CFLAGS@,$FONTCONFIG_CFLAGS,;t t +s,@FONTCONFIG_LIBS@,$FONTCONFIG_LIBS,;t t +s,@HAVE_LIBOTF@,$HAVE_LIBOTF,;t t +s,@LIBOTF_CFLAGS@,$LIBOTF_CFLAGS,;t t +s,@LIBOTF_LIBS@,$LIBOTF_LIBS,;t t +s,@ALLOCA@,$ALLOCA,;t t +s,@liblockfile@,$liblockfile,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@NEED_SETGID@,$NEED_SETGID,;t t +s,@KMEM_GROUP@,$KMEM_GROUP,;t t +s,@GETLOADAVG_LIBS@,$GETLOADAVG_LIBS,;t t +s,@GETOPT_H@,$GETOPT_H,;t t +s,@GETOPTOBJS@,$GETOPTOBJS,;t t +s,@version@,$version,;t t +s,@configuration@,$configuration,;t t +s,@canonical@,$canonical,;t t +s,@srcdir@,$srcdir,;t t +s,@lispdir@,$lispdir,;t t +s,@locallisppath@,$locallisppath,;t t +s,@lisppath@,$lisppath,;t t +s,@x_default_search_path@,$x_default_search_path,;t t +s,@etcdir@,$etcdir,;t t +s,@archlibdir@,$archlibdir,;t t +s,@docdir@,$docdir,;t t +s,@bitmapdir@,$bitmapdir,;t t +s,@gamedir@,$gamedir,;t t +s,@gameuser@,$gameuser,;t t +s,@c_switch_system@,$c_switch_system,;t t +s,@c_switch_machine@,$c_switch_machine,;t t +s,@LD_SWITCH_X_SITE@,$LD_SWITCH_X_SITE,;t t +s,@LD_SWITCH_X_SITE_AUX@,$LD_SWITCH_X_SITE_AUX,;t t +s,@C_SWITCH_X_SITE@,$C_SWITCH_X_SITE,;t t +s,@X_TOOLKIT_TYPE@,$X_TOOLKIT_TYPE,;t t +s,@machfile@,$machfile,;t t +s,@opsysfile@,$opsysfile,;t t +s,@carbon_appdir@,$carbon_appdir,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t +CEOF + +_ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + fi + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat fi - fi # test -n "$CONFIG_FILES" + done + + ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` + if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` + fi + cat >>$CONFIG_STATUS <<_ACEOF + cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end + _ACEOF + sed ' + s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g + s/^/s,@/; s/!/@,|#_!!_#|/ + :n + t n + s/'"$ac_delim"'$/,g/; t + s/$/\\/; p + N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n + ' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF + :end + s/|#_!!_#|//g + CEOF$ac_eof _ACEOF + + + # VPATH may cause trouble with some makes, so we remove $(srcdir), + # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ + s/:*\$(srcdir):*/:/ + s/:*\${srcdir}:*/:/ + s/:*@srcdir@:*/:/ + s/^\([^=]*=[ ]*\):*/\1/ + s/:*$// + s/^[^=]*=[ ]*$// + }' + fi + cat >>$CONFIG_STATUS <<\_ACEOF - for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + fi # test -n "$CONFIG_FILES" + + + for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS + do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 + echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 + echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ diff --cc man/ChangeLog index 09eb469c53f,1404658209e..3e6fb6d8164 --- a/man/ChangeLog +++ b/man/ChangeLog @@@ -1,3 -1,166 +1,156 @@@ -2007-01-01 Richard Stallman - - * commands.texi (User Input): Document keys stolen by window mangers. - -2006-12-31 Richard Stallman - - * custom.texi (Specific Customization): Document customize-option - instead of customize-variable. - + 2006-12-31 Kim F. Storm + - * major.texi (Choosing Modes): Document auto-mode-case-fold. ++ * major.texi (Choosing Modes): Document auto-mode-case-fond. + + 2006-12-30 Kim F. Storm + + * killing.texi (CUA Bindings): Fix typo. + + * xresources.texi (Table of Resources): Mention grow-only value for + auto-resize-tool-bars. + + 2006-12-30 Michael Albinus + + Sync with Tramp 2.0.55. + + * trampver.texi: Update release number. + + 2006-12-29 Reiner Steib + + * gnus.texi (Customizing Articles): Add index entries for all + gnus-treat-* variables. + + 2006-12-29 Jouni K. Sepp,Ad(Bnen + + * gnus.texi (IMAP): Fix incorrect explanation of + nnimap-search-uids-not-since-is-evil in documentation for + nnimap-expunge-search-string. + + 2006-12-27 Reiner Steib + + * gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to + spam-ifile-database. + + 2006-12-26 Reiner Steib + + * gnus.texi (Spam Package Configuration Examples): Don't encourage to + rebind C-s. + + 2006-12-26 Jouni K. Sepp,Ad(Bnen + + * gnus.texi (Group Parameters, Group Maintenance, Topic Commands) + (Mail Group Commands, Expiring Mail, IMAP): Add index entries for + "expiring mail". + (IMAP): Document nnimap-search-uids-not-since-is-evil and + nnimap-nov-is-evil. + ->>>>>>> 1.1170 + 2006-12-27 Eli Zaretskii + + * msdog.texi (Windows Keyboard): Mention widespread Windows bindings, + and how to get them back. + + 2006-12-26 Richard Stallman + + * calendar.texi (Holidays): Holiday listing is based on current + practice, but DST is not. + + 2006-12-25 Richard Stallman + + * emacs.texi (Top): Update subnode menus. + + * mark.texi (Transient Mark): Fix xref. + + * killing.texi (Graphical Kill): Node deleted. + (Killing): Add xref to Cut and Paste. + (CUA Bindings): Update xref. + + * frames.texi (Cut and Paste): New section to hold other nodes. + (Mouse Commands): Node demoted. + (Cut/Paste Other App): Split out from Mouse Commands. + (Word and Line Mouse): Likewise. + (Secondary Selection, Clipboard): Nodes demoted. + + 2006-12-25 Kevin Ryde + + * cl.texi (Sorting Sequences): In sort*, add a little cautionary note + about the key procedure being used heavily. + + 2006-12-24 Chong Yidong + + * pgg.texi (Caching passphrase): Default for pgg-gpg-use-agent changed + to t. + (Prerequisites): Add explanation about gpg-agent. + + 2006-12-24 Kevin Ryde + + * calendar.texi (Holidays): US daylight savings begins second Sunday + in March for 2007 onwards. + (Daylight Savings): Show new US default daylight savings rules, 2nd + Sun in Mar to 1st Sun in Nov, now in cal-dst.el. + + 2006-12-23 Chong Yidong + + * calendar.texi (Scroll Calendar): < and > are switched. + + 2006-12-23 Kevin Rodgers + + * killing.texi (Deletion): Describe M-\ prefix argument. + + 2006-12-23 Richard Stallman + + * search.texi (Regexp Search): Explain why forward and reverse regexp + search are not mirror images. + + 2006-12-22 Kevin Ryde + + * cl.texi (Sorting Sequences): Typo in sort*, example showed plain + "sort" instead of "sort*". + + 2006-12-19 Richard Stallman + + * calc.texi (History and Acknowledgements): Recognize that Emacs + now does have floating point. + + 2006-12-19 Kim F. Storm + + * major.texi (Choosing Modes): Describe match-function elements for + magic-mode-alist. + + 2006-12-19 Michael Albinus + + * tramp.texi (External transfer methods): Describe new method `scpc'. + + 2006-12-18 Eli Zaretskii + + * msdog.texi (Windows Keyboard): Add a footnote about "Windows" keys + peculiarities. + + 2006-12-18 Richard Stallman + + * abbrevs.texi (Editing Abbrevs): Fix previous change. + + 2006-12-17 Sascha Wilde + + * pgg.texi: Added short note on gpg-agent to the introduction. + + 2006-12-17 Alan Mackenzie + + * programs.texi (Left Margin Paren): Remove the bit which says + that CC Mode sets open-paren-in-column-0-is-defun-start to nil. + Discuss some of the issues of setting this option to nil. + + 2006-12-17 Glenn Morris + + * abbrevs.texi (Editing Abbrevs): Mention system abbrevs. + + 2006-12-16 Eli Zaretskii + + * msdog.texi (Windows Keyboard): Clarify `w32-recognize-altgr' effect. + (Windows Files): `w32-get-true-file-attributes' is only relevant for + NTFS volumes. + (ls in Lisp): `links' in `ls-lisp-verbosity' is only relevant to NTFS + volumes. + 2006-12-15 Eli Zaretskii * text.texi (HTML Mode): Fix "C-c TAB".