[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#888015: ddccontrol FTCBFS: uses the build architecture pkg-config



Source: ddccontrol
Version: 0.4.2-12
Tags: patch upstream
User: helmutg@debian.org
Usertags: rebootstrap

ddccontrol fails to cross build from source, because it uses the build
architecture pkg-config both as a result of using AC_PATH_PROG rather
than AC_PATH_TOOL and due to hard coding pkg-config rather than using
$PKG_CONFIG. The attached patch fixes that. Unfortunately, I couldn't
test it, because the package lacks instructions on how to rebuild
configure from source. Can you apply it anyway. I'm inclined to say that
ddccontrol violates DFSG #3 by making modification technically
impossible. That'd make the package rc buggy. Please prove me wrong by
applying the attached patch.

Helmut
Index: ddccontrol-0.4.2/configure.ac
===================================================================
--- ddccontrol-0.4.2.orig/configure.ac
+++ ddccontrol-0.4.2/configure.ac
@@ -117,16 +117,16 @@
   fi])
 
 GDDCCONTROL=
+AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
 if test x$support_gnome = xyes; then
-   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
    if test "x$PKG_CONFIG" = "xno" ; then
       AC_MSG_ERROR(pkg-config not found, please install pkg-config)
    fi
 
    echo -n "checking for gtk+>=2.4 and gthread>=2.4... "
-   if pkg-config --atleast-version=2.4 gtk+-2.0 gthread-2.0 ; then
-      GNOME_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0`"
-      GNOME_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0`"
+   if $PKG_CONFIG --atleast-version=2.4 gtk+-2.0 gthread-2.0 ; then
+      GNOME_LDFLAGS="$LIBXML2_LDFLAGS `$PKG_CONFIG --libs gtk+-2.0 gthread-2.0`"
+      GNOME_CFLAGS="$LIBXML2_CFLAGS `$PKG_CONFIG --cflags gtk+-2.0 gthread-2.0`"
       GDDCCONTROL=gddccontrol
       echo "yes"
       
@@ -148,10 +148,10 @@
 
 GNOME_APPLET=
 if test x$support_gnome_applet = xyes; then
-	if pkg-config --atleast-version=2.10 libpanelapplet-2.0 ; then
+	if $PKG_CONFIG --atleast-version=2.10 libpanelapplet-2.0 ; then
 		GNOME_APPLET="gnome-ddcc-applet"
-	    GNOME_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
-	    GNOME_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
+	    GNOME_LDFLAGS="$LIBXML2_LDFLAGS `$PKG_CONFIG --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
+	    GNOME_CFLAGS="$LIBXML2_CFLAGS `$PKG_CONFIG --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
 	fi
 fi
 

Reply to: