[caja] 01/01: debian/patches: Update 1001_use-correct-macros-to-cross-build.patch. Add check for PKG_CONFIG being set.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository caja.

commit 541398f4c85193a924b4b3876227f4d399deec57
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 15 10:10:03 2018 +0100

    debian/patches: Update 1001_use-correct-macros-to-cross-build.patch. Add check for PKG_CONFIG being set.
---
 .../1001_use-correct-macros-to-cross-build.patch       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/patches/1001_use-correct-macros-to-cross-build.patch b/debian/patches/1001_use-correct-macros-to-cross-build.patch
index 5925b2f..73ed2ea 100644
--- a/debian/patches/1001_use-correct-macros-to-cross-build.patch
+++ b/debian/patches/1001_use-correct-macros-to-cross-build.patch
@@ -3,16 +3,20 @@ Description: build - use correct macros to fix cross-build
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,11 @@
  AC_PROG_MAKE_SET
  AM_DISABLE_STATIC
  AM_PROG_LIBTOOL
 -AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 +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 !])
++fi
  
  AC_CHECK_LIB(m, floor)
  
-@@ -148,7 +148,7 @@
+@@ -148,7 +152,7 @@
      AC_HELP_STRING([--disable-xmp],
                     [build without xmp support]))
  msg_xmp=no
@@ -21,7 +25,7 @@ Description: build - use correct macros to fix cross-build
      PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver,
          [AM_CONDITIONAL(HAVE_EXEMPI, true)
           AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support])]
-@@ -157,7 +157,7 @@
+@@ -157,7 +161,7 @@
  
      AC_SUBST(EXEMPI_CFLAGS)
      AC_SUBST(EXEMPI_LIBS)
@@ -30,7 +34,7 @@ Description: build - use correct macros to fix cross-build
  
  dnl ==========================================================================
  
-@@ -192,10 +192,10 @@
+@@ -192,10 +196,10 @@
      AC_HELP_STRING([--disable-packagekit],
          [build without PackageKit support]))
  msg_packagekit=no
@@ -43,7 +47,7 @@ Description: build - use correct macros to fix cross-build
  
  # ==========================================================================
  # Turn on the additional warnings last, so -Werror doesn't affect other tests.
-@@ -213,7 +213,7 @@
+@@ -213,7 +217,7 @@
  fi
  ])
  AC_MSG_CHECKING(for more warnings, including -Werror)
@@ -52,7 +56,7 @@ Description: build - use correct macros to fix cross-build
      AC_MSG_RESULT(yes)
      WARNING_CFLAGS="\
      -Wall \
-@@ -238,9 +238,9 @@
+@@ -238,9 +242,9 @@
          unset SAVE_CFLAGS
      done
      unset option
@@ -64,7 +68,7 @@ Description: build - use correct macros to fix cross-build
  
  AC_SUBST(WARNING_CFLAGS)
  
-@@ -316,9 +316,9 @@
+@@ -316,9 +320,9 @@
  
  AC_ARG_ENABLE(icon-update, AC_HELP_STRING([--disable-icon-update],
                                          [Disable icon cache update]))

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