[caja-extensions] 01/01: debian/patches: 1001_pkg-config-macro-not-cross-compilation-safe.patch. Simplify PKG_CONFIG presence check.

[Mike Gabriel]

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

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

commit 9325916788d822c262fe4dbed0cf9424827f6110
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 15 10:13:32 2018 +0100

    debian/patches: 1001_pkg-config-macro-not-cross-compilation-safe.patch. Simplify PKG_CONFIG presence check.
---
 ...g-config-macro-not-cross-compilation-safe.patch | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 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 bbefa9c..aa6480f 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
-@@ -21,14 +21,12 @@
+@@ -21,14 +21,11 @@
  
  MATE_COMMON_INIT
  
@@ -14,15 +14,14 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 +PKG_PROG_PKG_CONFIG
  # 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
 +])
  
  GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
  AC_SUBST(GLIB_GENMARSHAL)
-@@ -45,14 +43,14 @@
+@@ -45,14 +42,14 @@
          [enable_image_converter=$enableval],
          [enable_image_converter=yes])
  
@@ -39,7 +38,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
  AM_CONDITIONAL(ENABLE_IMAGE_CONVERTER, test x"$enable_image_converter" = "xyes")
  
-@@ -62,13 +60,13 @@
+@@ -62,13 +59,13 @@
          [enable_open_terminal=$enableval],
          [enable_open_terminal=yes])
  
@@ -55,7 +54,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
  AM_CONDITIONAL(ENABLE_OPEN_TERMINAL, test x"$enable_open_terminal" = "xyes")
  
-@@ -78,7 +76,7 @@
+@@ -78,7 +75,7 @@
          [enable_sendto=$enableval],
          [enable_sendto=yes])
  
@@ -64,7 +63,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
          GTHREAD_REQUIRED=2.6.0
          DBUS_REQUIRED=1.0
          DBUS_GLIB_REQUIRED=0.60
-@@ -97,11 +95,11 @@
+@@ -97,11 +94,11 @@
  
      sendto_plugin_error_or_ignore()
      {
@@ -79,7 +78,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
      }
  
      AC_ARG_WITH([sendto-plugins],
-@@ -111,15 +109,15 @@
+@@ -111,15 +108,15 @@
      used_sendto_plugins=""
      used_sendto_plugins2=""
  
@@ -98,7 +97,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
      # Iterate through the wanted plugins and weed out bad ones (or error)
      for wanted_sendto_plugin in ${with_sendto_plugins}; do
-@@ -215,9 +213,9 @@
+@@ -215,9 +212,9 @@
      SENDTO_PLUGINS=$used_sendto_plugins2
  
      dnl Error out if no plugins will be built
@@ -110,7 +109,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
      AC_MSG_CHECKING([which sendto plugins to compile])
      AC_MSG_RESULT([$SENDTO_PLUGINS])
-@@ -230,12 +228,12 @@
+@@ -230,12 +227,12 @@
  
      dnl For the GIO based plugins
      enable_nst_common=no
@@ -126,7 +125,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
          for allowed_sendto_plugin in ${ALL_SENDTO_PLUGINS}; do
              for sendto_plugin in ${SENDTO_PLUGINS}; do
                  case ${allowed_sendto_plugin} in
-@@ -248,10 +246,10 @@
+@@ -248,10 +245,10 @@
              done
              AC_MSG_NOTICE([ ${allowed_sendto_plugin} sendto plugin disabled])
          done
@@ -140,7 +139,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  AM_CONDITIONAL(ENABLE_SENDTO, test x"$enable_sendto" = "xyes")
  
  # share extension
-@@ -260,12 +258,12 @@
+@@ -260,12 +257,12 @@
          [enable_share=$enableval],
          [enable_share=yes])
  
@@ -155,7 +154,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
  AM_CONDITIONAL(ENABLE_SHARE, test x"$enable_share" = "xyes")
  
-@@ -298,9 +296,9 @@
+@@ -298,9 +295,9 @@
      AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
      [ac_with_cajadir=$withval],
      [ac_with_cajadir=""])

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