Source: xfe
Version: 1.42.1-1
Tags: patch upstream
User: [email protected]
Usertags: rebootstrap
The patch for #892445 included in version 1.42.1-1 regressed cross
building of xfe. It now uses the wrong pkg-config. The attached patch
fixes that. Please consider applying it.
Helmut
--- xfe-1.42.1.orig/configure.ac
+++ xfe-1.42.1/configure.ac
@@ -29,6 +29,7 @@
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+PKG_PROG_PKG_CONFIG
# Internationalization
@@ -119,11 +120,9 @@
CPPFLAGS="$freetype_cflags $CPPFLAGS"
else
# On some systems freetype-config is deprecated and pkg-config should be used instead
- pkg_config=''
- AC_CHECK_PROGS(pkg_config,pkg-config,)
- if test -n "$pkg_config"; then
- freetype_cflags=`$pkg_config --cflags freetype2`
- freetype_libs=`$pkg_config --libs freetype2`
+ if test -n "$PKG_CONFIG"; then
+ freetype_cflags=`$PKG_CONFIG --cflags freetype2`
+ freetype_libs=`$PKG_CONFIG --libs freetype2`
LIBS="$LIBS $freetype_libs"
CPPFLAGS="$freetype_cflags $CPPFLAGS"
fi
@@ -141,11 +140,9 @@
CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
else
# On some systems xft-config is deprecated and pkg-config should be used instead
- pkg_config=''
- AC_CHECK_PROGS(pkg_config,pkg-config,)
- if test -n "$pkg_config"; then
- xft_cflags=`$pkg_config --cflags xft`
- xft_libs=`$pkg_config --libs xft`
+ if test -n "$PKG_CONFIG"; then
+ xft_cflags=`$PKG_CONFIG --cflags xft`
+ xft_libs=`$PKG_CONFIG --libs xft`
LIBS="$LIBS $xft_libs"
CPPFLAGS="$xft_cflags $CPPFLAGS"
CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
