merge libXfont 1.2.8
This commit is contained in:
matthieu
parent
7b635a2b61
commit
1cc1a05d6b
48
lib/libXfont/aclocal.m4
vendored
48
lib/libXfont/aclocal.m4
vendored
@ -6429,7 +6429,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
|
||||
_pkg_min_version=m4_default([$1], [0.9.0])
|
||||
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
AC_MSG_RESULT([yes])
|
||||
@ -6465,14 +6465,30 @@ fi])
|
||||
# ---------------------------------------------
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
else
|
||||
PKG_CHECK_EXISTS([$3],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
||||
[pkg_failed=yes])
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
])# _PKG_CONFIG
|
||||
|
||||
# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
# -----------------------------
|
||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi[]dnl
|
||||
])# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
|
||||
|
||||
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
# [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
@ -6494,29 +6510,39 @@ AC_MSG_CHECKING([for $1])
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
|
||||
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
|
||||
and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
|
||||
ifelse([$4], , [AC_MSG_ERROR(dnl
|
||||
[Package requirements ($2) were not met.
|
||||
[Package requirements ($2) were not met:
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details.])],
|
||||
[$4])
|
||||
_PKG_TEXT
|
||||
])],
|
||||
[AC_MSG_RESULT([no])
|
||||
$4])
|
||||
elif test $pkg_failed = untried; then
|
||||
ifelse([$4], , [AC_MSG_FAILURE(dnl
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details.
|
||||
_PKG_TEXT
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
|
||||
[$4])
|
||||
|
||||
@ -51,6 +51,9 @@
|
||||
/* Support IPv6 for TCP connections */
|
||||
#undef IPv6
|
||||
|
||||
/* Support dynamically loaded font modules */
|
||||
#undef LOADABLEFONTS
|
||||
|
||||
/* Support os-specific local connections */
|
||||
#undef LOCALCONN
|
||||
|
||||
|
||||
241
lib/libXfont/configure
vendored
241
lib/libXfont/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for libXfont 1.2.7.
|
||||
# Generated by GNU Autoconf 2.59 for libXfont 1.2.8.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='libXfont'
|
||||
PACKAGE_TARNAME='libXfont'
|
||||
PACKAGE_VERSION='1.2.7'
|
||||
PACKAGE_STRING='libXfont 1.2.7'
|
||||
PACKAGE_VERSION='1.2.8'
|
||||
PACKAGE_STRING='libXfont 1.2.8'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
|
||||
# Factoring default headers for most tests.
|
||||
@ -981,7 +981,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures libXfont 1.2.7 to adapt to many kinds of systems.
|
||||
\`configure' configures libXfont 1.2.8 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1047,7 +1047,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of libXfont 1.2.7:";;
|
||||
short | recursive ) echo "Configuration of libXfont 1.2.8:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1070,6 +1070,9 @@ Optional Features:
|
||||
--disable-pcfformat
|
||||
--disable-bdfformat
|
||||
--disable-snfformat
|
||||
--disable-loadable-font-modules
|
||||
support dynamically loaded font modules (default is
|
||||
enabled)
|
||||
--disable-fontcache
|
||||
--disable-fc
|
||||
--enable-unix-transport Enable UNIX domain socket transport
|
||||
@ -1217,7 +1220,7 @@ fi
|
||||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
libXfont configure 1.2.7
|
||||
libXfont configure 1.2.8
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
@ -1231,7 +1234,7 @@ cat >&5 <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by libXfont $as_me 1.2.7, which was
|
||||
It was created by libXfont $as_me 1.2.8, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -1874,7 +1877,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='libXfont'
|
||||
VERSION='1.2.7'
|
||||
VERSION='1.2.8'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -3734,7 +3737,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 3737 "configure"' > conftest.$ac_ext
|
||||
echo '#line 3740 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -5333,7 +5336,7 @@ fi
|
||||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:5336:" \
|
||||
echo "$as_me:5339:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
@ -6396,11 +6399,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6399: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6402: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6403: \$? = $ac_status" >&5
|
||||
echo "$as_me:6406: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -6664,11 +6667,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6667: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6670: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6671: \$? = $ac_status" >&5
|
||||
echo "$as_me:6674: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -6768,11 +6771,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6771: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6774: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:6775: \$? = $ac_status" >&5
|
||||
echo "$as_me:6778: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -9117,7 +9120,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9120 "configure"
|
||||
#line 9123 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -9217,7 +9220,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9220 "configure"
|
||||
#line 9223 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11561,11 +11564,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11564: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11567: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11568: \$? = $ac_status" >&5
|
||||
echo "$as_me:11571: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -11665,11 +11668,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11668: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11671: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11672: \$? = $ac_status" >&5
|
||||
echo "$as_me:11675: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -13235,11 +13238,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13238: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13241: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13242: \$? = $ac_status" >&5
|
||||
echo "$as_me:13245: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -13339,11 +13342,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13342: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13345: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13346: \$? = $ac_status" >&5
|
||||
echo "$as_me:13349: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -15546,11 +15549,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15549: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15552: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15553: \$? = $ac_status" >&5
|
||||
echo "$as_me:15556: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -15814,11 +15817,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15817: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15820: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15821: \$? = $ac_status" >&5
|
||||
echo "$as_me:15824: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -15918,11 +15921,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15921: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15924: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15925: \$? = $ac_status" >&5
|
||||
echo "$as_me:15928: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -19015,6 +19018,9 @@ echo "$as_me:$LINENO: checking for FREETYPE" >&5
|
||||
echo $ECHO_N "checking for FREETYPE... $ECHO_C" >&6
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$FREETYPE_CFLAGS"; then
|
||||
pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
|
||||
@ -19025,10 +19031,14 @@ if test -n "$PKG_CONFIG"; then
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$FREETYPE_LIBS"; then
|
||||
pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
|
||||
@ -19039,16 +19049,31 @@ if test -n "$PKG_CONFIG"; then
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"`
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$FREETYPE_PKG_ERRORS" 1>&5
|
||||
|
||||
freetype_config=yes
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "freetype2"`
|
||||
else
|
||||
FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$FREETYPE_PKG_ERRORS" >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
freetype_config=yes
|
||||
elif test $pkg_failed = untried; then
|
||||
freetype_config=yes
|
||||
else
|
||||
@ -19334,6 +19359,21 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
# Check whether --enable-loadable-font-modules or --disable-loadable-font-modules was given.
|
||||
if test "${enable_loadable_font_modules+set}" = set; then
|
||||
enableval="$enable_loadable_font_modules"
|
||||
LOADABLE_FONTS=$enableval
|
||||
else
|
||||
LOADABLE_FONTS=yes
|
||||
fi;
|
||||
if test "x$LOADABLE_FONTS" = xyes; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define LOADABLEFONTS 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
#
|
||||
# Font cache extension support?
|
||||
#
|
||||
@ -19367,6 +19407,9 @@ echo "$as_me:$LINENO: checking for FONTCACHEPROTO" >&5
|
||||
echo $ECHO_N "checking for FONTCACHEPROTO... $ECHO_C" >&6
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$FONTCACHEPROTO_CFLAGS"; then
|
||||
pkg_cv_FONTCACHEPROTO_CFLAGS="$FONTCACHEPROTO_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontcacheproto\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "fontcacheproto") 2>&5
|
||||
@ -19377,10 +19420,14 @@ if test -n "$PKG_CONFIG"; then
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$FONTCACHEPROTO_LIBS"; then
|
||||
pkg_cv_FONTCACHEPROTO_LIBS="$FONTCACHEPROTO_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontcacheproto\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "fontcacheproto") 2>&5
|
||||
@ -19391,38 +19438,59 @@ if test -n "$PKG_CONFIG"; then
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
FONTCACHEPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontcacheproto"`
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
FONTCACHEPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fontcacheproto"`
|
||||
else
|
||||
FONTCACHEPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontcacheproto"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$FONTCACHEPROTO_PKG_ERRORS" 1>&5
|
||||
echo "$FONTCACHEPROTO_PKG_ERRORS" >&5
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: Package requirements (fontcacheproto) were not met:
|
||||
|
||||
$FONTCACHEPROTO_PKG_ERRORS
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: Package requirements (fontcacheproto) were not met.
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively you may set the FONTCACHEPROTO_CFLAGS and FONTCACHEPROTO_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details." >&5
|
||||
echo "$as_me: error: Package requirements (fontcacheproto) were not met.
|
||||
Alternatively, you may set the environment variables FONTCACHEPROTO_CFLAGS
|
||||
and FONTCACHEPROTO_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&5
|
||||
echo "$as_me: error: Package requirements (fontcacheproto) were not met:
|
||||
|
||||
$FONTCACHEPROTO_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively you may set the FONTCACHEPROTO_CFLAGS and FONTCACHEPROTO_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details." >&2;}
|
||||
Alternatively, you may set the environment variables FONTCACHEPROTO_CFLAGS
|
||||
and FONTCACHEPROTO_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
elif test $pkg_failed = untried; then
|
||||
{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
Alternatively you may set the FONTCACHEPROTO_CFLAGS and FONTCACHEPROTO_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details.
|
||||
Alternatively, you may set the environment variables FONTCACHEPROTO_CFLAGS
|
||||
and FONTCACHEPROTO_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
|
||||
See \`config.log' for more details." >&5
|
||||
@ -19430,9 +19498,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
Alternatively you may set the FONTCACHEPROTO_CFLAGS and FONTCACHEPROTO_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details.
|
||||
Alternatively, you may set the environment variables FONTCACHEPROTO_CFLAGS
|
||||
and FONTCACHEPROTO_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
|
||||
See \`config.log' for more details." >&2;}
|
||||
@ -19633,6 +19701,9 @@ echo "$as_me:$LINENO: checking for XFONT" >&5
|
||||
echo $ECHO_N "checking for XFONT... $ECHO_C" >&6
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$XFONT_CFLAGS"; then
|
||||
pkg_cv_XFONT_CFLAGS="$XFONT_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto xtrans fontsproto fontenc\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xproto xtrans fontsproto fontenc") 2>&5
|
||||
@ -19643,10 +19714,14 @@ if test -n "$PKG_CONFIG"; then
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$XFONT_LIBS"; then
|
||||
pkg_cv_XFONT_LIBS="$XFONT_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto xtrans fontsproto fontenc\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xproto xtrans fontsproto fontenc") 2>&5
|
||||
@ -19657,38 +19732,59 @@ if test -n "$PKG_CONFIG"; then
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
XFONT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto xtrans fontsproto fontenc"`
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
XFONT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto xtrans fontsproto fontenc"`
|
||||
else
|
||||
XFONT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto xtrans fontsproto fontenc"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$XFONT_PKG_ERRORS" 1>&5
|
||||
echo "$XFONT_PKG_ERRORS" >&5
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: Package requirements (xproto xtrans fontsproto fontenc) were not met:
|
||||
|
||||
$XFONT_PKG_ERRORS
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: Package requirements (xproto xtrans fontsproto fontenc) were not met.
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively you may set the XFONT_CFLAGS and XFONT_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details." >&5
|
||||
echo "$as_me: error: Package requirements (xproto xtrans fontsproto fontenc) were not met.
|
||||
Alternatively, you may set the environment variables XFONT_CFLAGS
|
||||
and XFONT_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&5
|
||||
echo "$as_me: error: Package requirements (xproto xtrans fontsproto fontenc) were not met:
|
||||
|
||||
$XFONT_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively you may set the XFONT_CFLAGS and XFONT_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details." >&2;}
|
||||
Alternatively, you may set the environment variables XFONT_CFLAGS
|
||||
and XFONT_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
elif test $pkg_failed = untried; then
|
||||
{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
Alternatively you may set the XFONT_CFLAGS and XFONT_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details.
|
||||
Alternatively, you may set the environment variables XFONT_CFLAGS
|
||||
and XFONT_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
|
||||
See \`config.log' for more details." >&5
|
||||
@ -19696,9 +19792,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
Alternatively you may set the XFONT_CFLAGS and XFONT_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details.
|
||||
Alternatively, you may set the environment variables XFONT_CFLAGS
|
||||
and XFONT_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
|
||||
See \`config.log' for more details." >&2;}
|
||||
@ -20347,6 +20443,9 @@ case $host_os in
|
||||
linux*)
|
||||
OS_CFLAGS="-D_XOPEN_SOURCE"
|
||||
;;
|
||||
darwin*)
|
||||
OS_CFLAGS="-Wl,-flat_namespace"
|
||||
;;
|
||||
*)
|
||||
OS_CFLAGS=
|
||||
;;
|
||||
@ -20856,7 +20955,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by libXfont $as_me 1.2.7, which was
|
||||
This file was extended by libXfont $as_me 1.2.8, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -20919,7 +21018,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
libXfont config.status 1.2.7
|
||||
libXfont config.status 1.2.8
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
@ -5976,8 +5976,8 @@ relink_command=\"$relink_command\""
|
||||
test -n "$relink_command" && srcname="$realname"T
|
||||
|
||||
# Install the shared library and build the symlinks.
|
||||
$show "$install_prog $dir/$srcname $destdir/$realname"
|
||||
$run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
|
||||
$show "$install_prog -m 644 $dir/$srcname $destdir/$realname"
|
||||
$run eval "$install_prog -m 644 $dir/$srcname $destdir/$realname" || exit $?
|
||||
if test -n "$stripme" && test -n "$striplib"; then
|
||||
$show "$striplib $destdir/$realname"
|
||||
$run eval "$striplib $destdir/$realname" || exit $?
|
||||
@ -6022,8 +6022,8 @@ relink_command=\"$relink_command\""
|
||||
# Install the pseudo-library for information purposes.
|
||||
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
|
||||
instname="$dir/$name"i
|
||||
$show "$install_prog $instname $destdir/$name"
|
||||
$run eval "$install_prog $instname $destdir/$name" || exit $?
|
||||
$show "$install_prog -m 644 $instname $destdir/$name"
|
||||
$run eval "$install_prog -m 644 $instname $destdir/$name" || exit $?
|
||||
|
||||
# Maybe install the static library, too.
|
||||
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
|
||||
@ -6058,8 +6058,8 @@ relink_command=\"$relink_command\""
|
||||
|
||||
# Install the libtool object if requested.
|
||||
if test -n "$destfile"; then
|
||||
$show "$install_prog $file $destfile"
|
||||
$run eval "$install_prog $file $destfile" || exit $?
|
||||
$show "$install_prog -m 644 $file $destfile"
|
||||
$run eval "$install_prog -m 644 $file $destfile" || exit $?
|
||||
fi
|
||||
|
||||
# Install the old object if enabled.
|
||||
@ -6067,8 +6067,8 @@ relink_command=\"$relink_command\""
|
||||
# Deduce the name of the old-style object file.
|
||||
staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
|
||||
|
||||
$show "$install_prog $staticobj $staticdest"
|
||||
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
|
||||
$show "$install_prog -m 644 $staticobj $staticdest"
|
||||
$run eval "$install_prog -m 644 \$staticobj \$staticdest" || exit $?
|
||||
fi
|
||||
exit $EXIT_SUCCESS
|
||||
;;
|
||||
|
||||
@ -49,9 +49,10 @@ CONFIG_CLEAN_FILES =
|
||||
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
||||
libstubs_la_LIBADD =
|
||||
am_libstubs_la_OBJECTS = cauthgen.lo csignal.lo delfntcid.lo errorf.lo \
|
||||
fatalerror.lo findoldfnt.lo getcres.lo getdefptsize.lo \
|
||||
getnewfntcid.lo gettime.lo initfshdl.lo regfpefunc.lo \
|
||||
rmfshdl.lo servclient.lo setfntauth.lo stfntcfnt.lo xpstubs.lo
|
||||
fatalerror.lo findoldfnt.lo fontmod.lo getcres.lo \
|
||||
getdefptsize.lo getnewfntcid.lo gettime.lo initfshdl.lo \
|
||||
regfpefunc.lo rmfshdl.lo servclient.lo setfntauth.lo \
|
||||
stfntcfnt.lo xpstubs.lo
|
||||
libstubs_la_OBJECTS = $(am_libstubs_la_OBJECTS)
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/include/X11/fonts
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
@ -212,6 +213,7 @@ libstubs_la_SOURCES = \
|
||||
errorf.c \
|
||||
fatalerror.c \
|
||||
findoldfnt.c \
|
||||
fontmod.c \
|
||||
getcres.c \
|
||||
getdefptsize.c \
|
||||
getnewfntcid.c \
|
||||
@ -282,6 +284,7 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errorf.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fatalerror.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/findoldfnt.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontmod.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcres.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdefptsize.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getnewfntcid.Plo@am__quote@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user