[Pkg-wmaker-commits] [wmaker] 12/40: configure: Use PKG_PROG_PKG_CONFIG macro to allow cross building.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository wmaker.

commit 92bc458fac499c8c491234525a70a0277c5e46fc
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Mon Jan 30 14:00:40 2017 -0500

    configure: Use PKG_PROG_PKG_CONFIG macro to allow cross building.
    
    Patch by Helmut Grohne <helmut at subdivi.de> 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 844c024..c77717c 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git