1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-13 16:38:14 +00:00

Regenerate.

This commit is contained in:
Glenn Morris 2008-11-18 03:50:10 +00:00
parent d0d8885d3f
commit 44e5501c61

204
configure vendored
View File

@ -694,12 +694,12 @@ GTK_CFLAGS
GTK_LIBS
DBUS_CFLAGS
DBUS_LIBS
FONTCONFIG_CFLAGS
FONTCONFIG_LIBS
XFT_CFLAGS
XFT_LIBS
FREETYPE_CFLAGS
FREETYPE_LIBS
FONTCONFIG_CFLAGS
FONTCONFIG_LIBS
LIBOTF_CFLAGS
LIBOTF_LIBS
M17N_FLT_CFLAGS
@ -12575,6 +12575,101 @@ fi
### Start of font-backend section.
succeeded=no
# 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
if test "$PKG_CONFIG" = "no" ; then
HAVE_FC=no
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
{ echo "$as_me:$LINENO: checking for fontconfig >= 2.2.0" >&5
echo $ECHO_N "checking for fontconfig >= 2.2.0... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "fontconfig >= 2.2.0" 2>&5; 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 >= 2.2.0"|sed -e 's,///*,/,g'`
{ 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 >= 2.2.0"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5
echo "${ECHO_T}$FONTCONFIG_LIBS" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
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 >= 2.2.0"`
fi
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
HAVE_FC=yes
else
HAVE_FC=no
fi
test "${HAVE_FC}" = "no" && with_freetype=no
## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
HAVE_XFT=maybe
if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then
@ -12903,6 +12998,8 @@ HAVE_FREETYPE=no
### Use -lfreetype if available, unless `--with-freetype=no'.
if test "${HAVE_XFT}" = "yes"; then
HAVE_FREETYPE=yes
FONTCONFIG_CFLAGS=
FONTCONFIG_LIBS=
elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
@ -12999,105 +13096,6 @@ echo "${ECHO_T}no" >&6; }
HAVE_FREETYPE=no
fi
if test "${HAVE_FREETYPE}" = "yes"; then
succeeded=no
# 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
if test "$PKG_CONFIG" = "no" ; then
HAVE_FC=no
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
{ echo "$as_me:$LINENO: checking for fontconfig" >&5
echo $ECHO_N "checking for fontconfig... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "fontconfig" 2>&5; 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"|sed -e 's,///*,/,g'`
{ 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"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5
echo "${ECHO_T}$FONTCONFIG_LIBS" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
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
HAVE_LIBOTF=no
@ -25129,12 +25127,12 @@ GTK_CFLAGS!$GTK_CFLAGS$ac_delim
GTK_LIBS!$GTK_LIBS$ac_delim
DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
DBUS_LIBS!$DBUS_LIBS$ac_delim
FONTCONFIG_CFLAGS!$FONTCONFIG_CFLAGS$ac_delim
FONTCONFIG_LIBS!$FONTCONFIG_LIBS$ac_delim
XFT_CFLAGS!$XFT_CFLAGS$ac_delim
XFT_LIBS!$XFT_LIBS$ac_delim
FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim
FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim
FONTCONFIG_CFLAGS!$FONTCONFIG_CFLAGS$ac_delim
FONTCONFIG_LIBS!$FONTCONFIG_LIBS$ac_delim
LIBOTF_CFLAGS!$LIBOTF_CFLAGS$ac_delim
LIBOTF_LIBS!$LIBOTF_LIBS$ac_delim
M17N_FLT_CFLAGS!$M17N_FLT_CFLAGS$ac_delim