Source: wmfire
Version: 1.2.3-2
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

wmfire's configure.ac hard codes the build architecture pkg-config by
using AC_PATH_PROG rather than AC_PATH_TOOL. However, using
PKG_CHECK_MODULES would be even better and is what the attached patch
implements to make wmfire cross buildable. Please consider applying it.

Helmut
--- wmfire-1.2.4.orig/configure.ac
+++ wmfire-1.2.4/configure.ac
@@ -33,16 +33,15 @@
 fi
 AM_CONDITIONAL(SESSION, test "x$session" = "xon")
 
-AC_PATH_PROG(config, pkg-config)
-
-AC_CACHE_CHECK([for gdk2 includes], ac_cv_cflags_GDKINCS, [GDKINCS=`$config --cflags gtk+-2.0`])
-AC_CACHE_CHECK([for gdk2 libs], ac_cv_ldflags_GDKLIBS, [GDKLIBS=`$config --libs gtk+-2.0 | sed -e "s/-lgtk-x11-2.0//g" -e "s/-latk-1.0//g"`])
+PKG_CHECK_MODULES([GTK2],[gtk+-2.0],[
+  GDKINCS=$GTK2_CFLAGS
+  GDKLIBS=`echo "$GTK2_LIBS" | sed -e "s/-lgtk-x11-2.0//g" -e "s/-latk-1.0//g"`
+])
 
-AC_CACHE_CHECK([for libgtop2 includes], ac_cv_cflags_GTOPINCS, [GTOPINCS=`$config --cflags libgtop-2.0`])
-AC_CACHE_CHECK([for libgtop2 libs], ac_cv_ldflags_GTOPLIBS, [GTOPLIBS=`$config --libs libgtop-2.0`])
+PKG_CHECK_MODULES([GTOP],[libgtop-2.0])
 
-CFLAGS="$CFLAGS $GDKINCS $GTOPINCS"
-LDFLAGS="$LDFLAGS $GDKLIBS $GTOPLIBS"
+CFLAGS="$CFLAGS $GDKINCS $GTOP_CFLAGS"
+LDFLAGS="$LDFLAGS $GDKLIBS $GTOP_LIBS"
 
 AC_CHECK_FUNCS(strstr)
 

Reply via email to