From: Miles Bader Date: Mon, 30 Oct 2006 08:54:41 +0000 (+0000) Subject: Merge from emacs--devo--0 X-Git-Tag: emacs-pretest-23.0.90~8295^2~705 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=503be82149af57edcba384554e0f268b9a9551e1;p=emacs.git Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 476-489) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 153-160) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127 --- 503be82149af57edcba384554e0f268b9a9551e1 diff --cc configure index 9c6e6ae48cb,e980605912a..f492a52d8aa --- a/configure +++ b/configure @@@ -11851,625 -11758,6 +11781,623 @@@ _ACEO fi CFLAGS=$late_CFLAGS +fi + +### For font-backend +if test "${USE_FONT_BACKEND}" = "yes"; then + + +cat >>confdefs.h <<\_ACEOF +#define USE_FONT_BACKEND 1 +_ACEOF + + +### Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. +HAVE_XFT=maybe +if test "${HAVE_X11}" = "yes"; then + if test "x${with_freetype}" = "xno"; then + with_xft="no"; + fi + if test "x${with_xft}" != "xno"; then + + if test "X${with_pkg_config_prog}" != X; then + PKG_CONFIG="${with_pkg_config_prog}" + fi + + + 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 xft >= 0.13.0" >&5 +echo $ECHO_N "checking for xft >= 0.13.0... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "xft >= 0.13.0" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5 +echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6 + XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"` + echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5 +echo "${ECHO_T}$XFT_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking XFT_LIBS" >&5 +echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6 + XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"` + echo "$as_me:$LINENO: result: $XFT_LIBS" >&5 +echo "${ECHO_T}$XFT_LIBS" >&6 + else + XFT_CFLAGS="" + XFT_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + XFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xft >= 0.13.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 + : + else + HAVE_XFT=no + fi + + if test "$HAVE_XFT" != no; then + OLD_CPPFLAGS="$CPPFLAGS" + OLD_CFLAGS="$CFLAGS" + OLD_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" + CFLAGS="$CFLAGS $XFT_CFLAGS" + LIBS="$XFT_LIBS $LIBS" + if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then + echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 +echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5 +echo $ECHO_N "checking X11/Xft/Xft.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 + 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' ++ { 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 + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +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 + +# Is the header present? +echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5 +echo $ECHO_N "checking X11/Xft/Xft.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 + 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 + 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 + +# 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/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.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/Xft/Xft.h" >&5 +echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6 + +fi +if test $ac_cv_header_X11_Xft_Xft_h = yes; then + echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5 +echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6 +if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXft $XFT_LIBS $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. */ +#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 XftFontOpen (); +int +main () +{ +XftFontOpen (); + ; + 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 + 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' ++ { 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 + ac_cv_lib_Xft_XftFontOpen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_Xft_XftFontOpen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5 +echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6 +if test $ac_cv_lib_Xft_XftFontOpen = yes; then + HAVE_XFT=yes +fi + +fi + + + + if test "${HAVE_XFT}" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XFT 1 +_ACEOF + + + C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS" + else + CFLAGS="$OLD_CPPFLAGS" + CFLAGS="$OLD_CFLAGS" + LIBS="$OLD_LIBS" + fi + fi + fi +fi + +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 + + + 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 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'. diff --cc lisp/ChangeLog index 6e15b2e24dc,ad942083566..6ecaf7fb33d --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,3 -1,239 +1,228 @@@ -2006-10-30 Kenichi Handa - - * files.el (revert-buffer): If a unibyte buffer is being reverted - with a coding system for multibyte, set buffer multibyte before - calling insert-file-contents. - -2006-10-30 Stefan Monnier - - * server.el (server-select-display): Use a dummy buffer to detect when - the frame is later used. - (server-select-display): New function. - (server-process-filter): Use it to detect unused temp frames. - + 2006-10-29 Stephen Leake + + * progmodes/ada-mode.el: Change maintainer, apply - whitespace-clean, checkdoc. Minor improvements to many doc strings. ++ whitespace-clean, checkdoc. Minor improvements to many doc ++ strings. + (ada-mode-version): New function. + (ada-create-menu): Menu operations are available for all supported + compilers. + + 2006-10-29 Lars Hansen + * net/tramp.el (with-parsed-tramp-file-name): Correct debug + spec. Highlight as keyword. + (tramp-do-copy-or-rename-file): Correct data for 'file-already-exists. + Don't call tramp-method-out-of-band-p for local files. + (tramp-touch): Quote file name. + + 2006-10-28 Glenn Morris + + * calendar/calendar.el (cal-html-cursor-month) + (cal-html-cursor-year): Add autoloads for this new package. - (calendar-mode-map): Bind cal-html-cursor-month, cal-html-cursor-year. ++ (calendar-mode-map): Bind cal-html-cursor-month, ++ cal-html-cursor-year. + + 2006-10-28 Anna Bigatti + + * calendar/cal-html.el: New file. + + 2006-10-28 Chong Yidong + + * emacs-lisp/authors.el (authors-aliases): Update. + + 2006-10-27 Chong Yidong + + * version.el (emacs-version): Bump version number to 22.0.90. + + 2006-10-26 John W. Eaton + + * progmodes/octave-inf.el (inferior-octave-has-built-in-variables): + New defvar. + (inferior-octave-resync-dirs): Check to see whether Octave has + built-in variables and set inferior-octave-has-built-in-variables. + Check inferior-octave-has-built-in-variables to decide whether to + send commands that set built-in variables or call functions to + change Octave's behavior. + Send "disp (pwd ())" to Octave instead of just "pwd". + (inferior-octave-startup): Send "more off" to Octave instead of + "page_screen_output = 0". + + 2006-10-26 Chong Yidong + + * emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the + pattern normally. + + 2006-10-26 Nick Roberts + + * bindings.el (mode-line-mode-menu): Remove bindings for global + minor modes (line/column number) as they are on the menubar. + + 2006-10-25 Juanma Barranquero + + * term/w32-win.el (x-handle-name-switch): Doc fix. + (w32-standard-fontset-spec): Fix typo in docstring. + + * midnight.el (midnight-buffer-display-time): Doc fix. + (clean-buffer-list-kill-never-buffer-names): Add "*server*". + + 2006-10-22 martin rudalics + + * textmodes/flyspell.el (flyspell-check-region-doublons): + Fix last fix. + + 2006-10-23 Nick Roberts + + * bindings.el (mode-line-mode-menu): List global minor modes + before local ones. + + 2006-10-23 Kim F. Storm + + * subr.el (add-to-list): Optimize if compare-fn is `eq' or `eql'. + (sit-for): If last command was a prefix arg, add the read-ahead + event to unread-command-events as (t . EVENT) so it will be added + to this-command-keys by read-key-sequence. + + 2006-10-22 martin rudalics + + * textmodes/flyspell.el (flyspell-word): Skip past all previous + whitespace when checking doublons. + (flyspell-check-region-doublons): Fix doublon regexp. + (flyspell-highlight-incorrect-region): Highlight doublons using + flyspell-duplicate face. + + * progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom. + + 2006-10-22 John Wiegley + + * progmodes/python.el (python-use-skeletons): python-mode was + auto-inserting templates (for those with abbrev-mode on), not only + by default -- *but without a configuration variable to disable + it*. This rendered python-mode completely useless for me, so I + have added `python-use-skeletons', which is now off by default. + + 2006-10-22 Chong Yidong + + * progmodes/cperl-mode.el (cperl-mode): Don't assume + font-lock-multiline is auto-local (it's not). + (cperl-windowed-init): Ensure that cperl-font-lock-multiline is + initialized before calling cperl-init-faces. + + 2006-10-22 Nick Roberts + + * progmodes/gdb-ui.el (gdb-info-stack-custom): Don't try to give + gdb-stack-position a value when there is no fringe. + + * bindings.el (mode-line-mode-menu): Disable auto-revert-tail-mode + indicator if not visiting a file. + + 2006-10-20 David Kastrup + + * window.el (kill-buffer-and-window): Fix a bug where an aborted + operation would still cause some window to collapse later. + + 2006-10-20 Stefan Monnier + + * vc.el (vc-switch-backend): Try to be more careful with unwanted + side-effect due to mixing various backends's file properties. + + * vc-svn.el (vc-svn-parse-status): Remove unused arg `localp'. + Add arg `filename' instead. Don't set vc-backend if `filename' is set. + Return `filename's status if applicable. Update callers. + + 2006-10-19 Kenichi Handa + + * international/kkc.el (kkc-region): When a key sequence is not + defined, append (this-single-command-raw-keys) to + unread-input-method-events. + + 2006-10-19 Juanma Barranquero + + * progmodes/ada-mode.el (ada-in-string-p): Doc fix. + + 2006-10-19 YAMAMOTO Mitsuharu + + * version.el (emacs-version): Use mac-carbon-version-string. + + * term/macterm.el (res-geometry): Apply 2006-10-18 change for x-win.el. + + 2006-10-19 Jan Dj,Ad(Brv + + * select.el (ccl-check-utf-8, string-utf-8-p): New functions + (by Kenichi Handa). + (xselect-convert-to-string): Decline requests for UTF8_STRING if + the selection is not UTF-8. + + 2006-10-18 Juanma Barranquero + + * progmodes/ada-mode.el (ada-83-string-keywords) + (ada-last-which-function-line ada-no-auto-case, ada-indent-region) + (ada-which-compiler, ada-align-modes, ada-adjust-case-buffer) + (ada-looking-at-semi-private, ada-get-body-name): + Fix typos in docstrings. + (ada-create-case-exception, ada-create-case-exception-substring): + Fix typos in error messages. + (ada-goto-matching-end, ada-narrow-to-defun): Doc fixes. + + 2006-10-18 Jan Dj,Ad(Brv + + * term/x-win.el (res-geometry): Don't set geometry from Xresources + to default-frame-alist if default-frame-alist already contains + width/height. + + 2006-10-18 Richard Stallman + + * emacs-lisp/pp.el (pp-eval-expression): Use `X' to read value. + Non-interactive arg is the value, not the expression. + + * simple.el (read-expression-map): Just set it, no defvar. + + * subr.el (insert-for-yank-1): If last inserted char has + properties, mark them as rear-nonsticky. + + * recentf.el (recentf-mode): Doc fix. + + * facemenu.el (facemenu-add-new-face): Defend against symbol + that isn't a face name. + + * dired-aux.el (dired-do-copy): Doc fix. + + 2006-10-18 Chong Yidong + + * simple.el (line-move-1): Ignore fields when moving to the + beginning of line to avoid getting point stuck. + + 2006-10-18 Martin Rudalics + + * textmodes/flyspell.el (flyspell-word-search-backward): + Set inhibit-point-motion-hooks to avoid looping due to intangibile + text. + + 2006-10-16 Richard Stallman + + * help-fns.el (describe-function-1): Special case optimization + for self-insert-command. + + 2006-10-16 Kim F. Storm + + * ido.el (ido-reread-directory): Work in `dir' mode too. + + 2006-10-15 Martin Rudalics + + * textmodes/table.el: Require 'regexp-opt. + + 2006-10-15 Lennart Borgman + + * progmodes/flymake.el (flymake-get-project-include-dirs-imp): + Use shell-quote-argument. + + * shell.el (explicit-bash-args): Likewise. + + * progmodes/ada-xref.el (ada-find-in-src-path): Likewise. + Use grep -E rather than egrep. + + 2006-10-15 Micha,Ak(Bl Cadilhac + + * ido.el (ido-exhibit): Allow `-', `_', and trailing `$' in user id. + 2006-10-15 Kim F. Storm * filesets.el (filesets-run-cmd--repl-fn): Use shell-quote-argument.