[python-caja] 02/02: debian/patches: Simplify 1001_pkg-config-macro-not-cross-compilation-safe.patch.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository python-caja.

commit 7b54969a354e92d94052acb80a08dce586d42aca
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 15 08:39:17 2018 +0100

    debian/patches: Simplify 1001_pkg-config-macro-not-cross-compilation-safe.patch.
---
 .../1001_pkg-config-macro-not-cross-compilation-safe.patch    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/patches/1001_pkg-config-macro-not-cross-compilation-safe.patch b/debian/patches/1001_pkg-config-macro-not-cross-compilation-safe.patch
index 5ef0c73..4e6da2d 100644
--- a/debian/patches/1001_pkg-config-macro-not-cross-compilation-safe.patch
+++ b/debian/patches/1001_pkg-config-macro-not-cross-compilation-safe.patch
@@ -3,7 +3,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -15,14 +15,12 @@
+@@ -15,14 +15,11 @@
  AC_DISABLE_STATIC
  AC_PROG_LIBTOOL
  
@@ -14,15 +14,14 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 +PKG_PROG_PKG_CONFIG
  dnl Give error and exit if we dont have pkgconfig
 -if test "x$HAVE_PKGCONFIG" = "xno"; then
-+AC_CHECK_PROG(HAVE_PKGCONFIG, `basename pkg-config`, yes, no)
-+AS_IF([test "x$HAVE_PKGCONFIG" = "xno"],[
++AS_IF([test "x$PKG_CONFIG" = "x"],[
    AC_MSG_ERROR([you need to have pkgconfig installed !])
 -fi
 +])
  
  dnl i18n
  GETTEXT_PACKAGE=python-caja
-@@ -40,7 +38,7 @@
+@@ -40,7 +37,7 @@
  dnl **************************************************
  AM_PATH_PYTHON([2.7])
  PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
@@ -31,7 +30,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  AC_SUBST(PYTHON_LIBS)
  AC_SUBST(PYTHON_CFLAGS)
  AC_SUBST(PYTHON_LIB_LOC)
-@@ -77,9 +75,9 @@
+@@ -77,9 +74,9 @@
  	AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
  	[ac_with_cajadir=$withval],
  	[ac_with_cajadir=""])
@@ -43,7 +42,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
  AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}])
  AC_SUBST([CAJA_EXTENSION_DIR], [${ac_with_cajadir}])
-@@ -87,14 +85,14 @@
+@@ -87,14 +84,14 @@
  dnl ---------------------------------
  dnl Check for gtk-doc dependencies
  dnl ---------------------------------

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