[python-caja] 04/05: debian/patches: Add 0002_pkg-config-macro-not-cross-compilation-safe.patch. Make configure.ac cross-compile safe.

[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 e38fa337f363e914b7cf48a4904a762e44219287
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 14 10:26:00 2018 +0100

    debian/patches: Add 0002_pkg-config-macro-not-cross-compilation-safe.patch. Make configure.ac cross-compile safe.
---
 ...g-config-macro-not-cross-compilation-safe.patch | 50 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 51 insertions(+)

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
new file mode 100644
index 0000000..1a6a9d5
--- /dev/null
+++ b/debian/patches/0002_pkg-config-macro-not-cross-compilation-safe.patch
@@ -0,0 +1,50 @@
+Description: Make configure.ac cross compile safe
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,14 +15,7 @@
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ 
+-dnl Check for pkgconfig first
+-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
+-if test "x$HAVE_PKGCONFIG" = "xno"; then
+-  AC_MSG_ERROR([you need to have pkgconfig installed !])
+-fi
++PKG_PROG_PKG_CONFIG
+ 
+ dnl i18n
+ GETTEXT_PACKAGE=python-caja
+@@ -77,9 +70,9 @@
+ 	AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
+ 	[ac_with_cajadir=$withval],
+ 	[ac_with_cajadir=""])
+-if test "${ac_with_cajadir}" = ""; then
++AS_IF([test "${ac_with_cajadir}" = ""],[
+ 	ac_with_cajadir=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
+-fi
++])
+ 
+ AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}])
+ AC_SUBST([CAJA_EXTENSION_DIR], [${ac_with_cajadir}])
+@@ -87,14 +80,14 @@
+ dnl ---------------------------------
+ dnl Check for gtk-doc dependencies
+ dnl ---------------------------------
+-if test "${enable_gtk_doc}" != no; then
++AS_IF([test "${enable_gtk_doc}" != no],[
+     dnl Check for xsltproc
+     AC_PATH_PROG([XSLTPROC], [xsltproc])
+     if test -z "$XSLTPROC"; then
+         echo " disabling generation of docs"
+         enable_gtk_doc=no
+     fi
+-fi
++])
+ 
+ AC_OUTPUT([
+   Makefile
diff --git a/debian/patches/series b/debian/patches/series
index e9077f0..4f00923 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 2001_fix-python-libdir-not-found.patch
 0001_reproducible-build.patch
+0002_pkg-config-macro-not-cross-compilation-safe.patch

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