This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.
The branch, next has been updated
via 92bc458fac499c8c491234525a70a0277c5e46fc (commit)
from 6f3dbfeabafd3256886b857ae04efb8b99412b85 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 92bc458fac499c8c491234525a70a0277c5e46fc
Author: Doug Torrance <[email protected]>
Date: Mon, 30 Jan 2017 14:00:40 -0500
URL: <http://repo.or.cz/wmaker-crm.git/92bc458fac499c8c>
configure: Use PKG_PROG_PKG_CONFIG macro to allow cross building.
Patch by Helmut Grohne <[email protected]> to fix Debian bug #853236 [1]:
> wmaker fails to cross build from source, because it forces the use of
> pkg-config without $ac_tool_prefix. Discovering pkg-config with the
> PKG_PROG_PKG_CONFIG macro considers $ac_tool_prefix and thus makes cross
> compilation succeed. Please consider applying the attached patch after
> stretch is released.
>
> Helmut
[1] https://bugs.debian.org/853236
---
configure.ac | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 844c0240f8fb..c77717cb5a10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,7 +447,8 @@ WM_TYPE_SIGNAL
dnl pkg-config
dnl ==========
-AC_CHECK_PROG([PKGCONFIG], [pkg-config], [pkg-config])
+PKG_PROG_PKG_CONFIG
+AS_IF([test -z "$PKG_CONFIG"],[AC_MSG_ERROR([pkg-config is required.])])
@@ -612,7 +613,7 @@ dnl FontConfig
dnl ==========
dnl libWINGS uses FcPatternDel from libfontconfig
AC_MSG_CHECKING([for fontconfig library])
-FCLIBS=`$PKGCONFIG fontconfig --libs`
+FCLIBS=`$PKG_CONFIG fontconfig --libs`
if test "x$FCLIBS" = "x" ; then
AC_MSG_RESULT([not found])
else
@@ -627,8 +628,8 @@ dnl =============================
xft=yes
XFTLIBS=""
-if test "x$PKGCONFIG" != x -a "`$PKGCONFIG xft; echo $?`" = 0; then
- XFTCONFIG="$PKGCONFIG xft"
+if test "x$PKG_CONFIG" != x -a "`$PKG_CONFIG xft; echo $?`" = 0; then
+ XFTCONFIG="$PKG_CONFIG xft"
pkgconfig_xft=yes
else
AC_CHECK_PROG(XFTCONFIG, xft-config, xft-config)
@@ -678,8 +679,8 @@ AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango],
[enable Pango text layout
PANGOFLAGS=
PANGOLIBS=
if test "$pango" = yes; then
- PANGOLIBS=`$PKGCONFIG pangoxft --libs`
- PANGOFLAGS=`$PKGCONFIG pangoxft --cflags`
+ PANGOLIBS=`$PKG_CONFIG pangoxft --libs`
+ PANGOFLAGS=`$PKG_CONFIG pangoxft --cflags`
if test "x$PANGOLIBS" = "x" ; then
AC_MSG_RESULT([not found])
else
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
