[gentoo-commits] gentoo-x86 commit in net-print/libgnomecups/files: libgnomecups-0.2.3-cups-config.patch

[Michal Gorny (mgorny)]

mgorny      14/06/29 09:43:48

  Added:                libgnomecups-0.2.3-cups-config.patch
  Log:
  Enable multilib support, required for gnome-base/libgnomeprint.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

Revision  Changes    Path
1.1                  net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch?rev=1.1&content-type=text/plain

Index: libgnomecups-0.2.3-cups-config.patch
===================================================================
From 8f5e326dd89d98b2d34cf6f97583be4eb819b02b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
Date: Sun, 29 Jun 2014 10:36:14 +0200
Subject: [PATCH] Use AC_PATH_TOOL to find cups-config. And actually use the
 result.

---
 configure.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 3f0ccc5..0bd367e 100644
--- a/configure.in
+++ b/configure.in
@@ -22,13 +22,13 @@ AC_SUBST(GLIB_REQUIRED)
 
 PKG_CHECK_MODULES(LIBGNOMECUPS, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED)
 
-AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
+AC_PATH_TOOL(CUPS_CONFIG, cups-config, no)
 if test "$CUPS_CONFIG" = "no"; then
   AC_MSG_ERROR([Please install cups development packages])
 fi
 
-CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-CUPS_LIBS=`cups-config --libs`
+CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+CUPS_LIBS=`$CUPS_CONFIG --libs`
 
 AC_SUBST(CUPS_CFLAGS)
 AC_SUBST(CUPS_LIBS)
-- 
2.0.0