[python-caja] 02/03: debian/patches: Update 0002_pkg-config-macro-not-cross-compilation-safe.patch after feedback from Helmut Grohne.

[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 180e4a0daa32066dcb7cd6fff1a8e55a896ffc6b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 14 14:57:44 2018 +0100

    debian/patches: Update 0002_pkg-config-macro-not-cross-compilation-safe.patch after feedback from Helmut Grohne.
---
 ...g-config-macro-not-cross-compilation-safe.patch | 30 ++++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0002_pkg-config-macro-not-cross-compilation-safe.patch b/debian/patches/0002_pkg-config-macro-not-cross-compilation-safe.patch
index 1a6a9d5..5ef0c73 100644
--- a/debian/patches/0002_pkg-config-macro-not-cross-compilation-safe.patch
+++ b/debian/patches/0002_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,7 @@
+@@ -15,14 +15,12 @@
  AC_DISABLE_STATIC
  AC_PROG_LIBTOOL
  
@@ -11,15 +11,27 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 -AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
 -AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 -
--dnl Give error and exit if we dont have pkgconfig
++PKG_PROG_PKG_CONFIG
+ dnl Give error and exit if we dont have pkgconfig
 -if test "x$HAVE_PKGCONFIG" = "xno"; then
--  AC_MSG_ERROR([you need to have pkgconfig installed !])
++AC_CHECK_PROG(HAVE_PKGCONFIG, `basename pkg-config`, yes, no)
++AS_IF([test "x$HAVE_PKGCONFIG" = "xno"],[
+   AC_MSG_ERROR([you need to have pkgconfig installed !])
 -fi
-+PKG_PROG_PKG_CONFIG
++])
  
  dnl i18n
  GETTEXT_PACKAGE=python-caja
-@@ -77,9 +70,9 @@
+@@ -40,7 +38,7 @@
+ dnl **************************************************
+ AM_PATH_PYTHON([2.7])
+ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
+-PYTHON_LIB_LOC="`pkg-config gobject-introspection-1.0 --variable=libdir`"
++PYTHON_LIB_LOC="`$PKG_CONFIG gobject-introspection-1.0 --variable=libdir`"
+ AC_SUBST(PYTHON_LIBS)
+ AC_SUBST(PYTHON_CFLAGS)
+ AC_SUBST(PYTHON_LIB_LOC)
+@@ -77,9 +75,9 @@
  	AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
  	[ac_with_cajadir=$withval],
  	[ac_with_cajadir=""])
@@ -31,7 +43,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 +80,14 @@
+@@ -87,14 +85,14 @@
  dnl ---------------------------------
  dnl Check for gtk-doc dependencies
  dnl ---------------------------------
@@ -39,11 +51,13 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 +AS_IF([test "${enable_gtk_doc}" != no],[
      dnl Check for xsltproc
      AC_PATH_PROG([XSLTPROC], [xsltproc])
-     if test -z "$XSLTPROC"; then
+-    if test -z "$XSLTPROC"; then
++    AS_IF([test -z "$XSLTPROC"],[
          echo " disabling generation of docs"
          enable_gtk_doc=no
-     fi
+-    fi
 -fi
++    ])
 +])
  
  AC_OUTPUT([

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