[caja-dropbox] 05/09: debian/patches: Add 1001_pkgconfig-cross-compile-safe.patch. Make caja-dropbox 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 caja-dropbox.

commit 6395e2ff9b94193d1df8a819313853a52ffaa8db
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 15 11:26:11 2018 +0100

    debian/patches: Add 1001_pkgconfig-cross-compile-safe.patch. Make caja-dropbox cross-compile safe.
---
 .../1001_pkgconfig-cross-compile-safe.patch        | 65 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 66 insertions(+)

diff --git a/debian/patches/1001_pkgconfig-cross-compile-safe.patch b/debian/patches/1001_pkgconfig-cross-compile-safe.patch
new file mode 100644
index 0000000..4e5fe20
--- /dev/null
+++ b/debian/patches/1001_pkgconfig-cross-compile-safe.patch
@@ -0,0 +1,65 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,11 +21,10 @@
+ AM_PROG_LIBTOOL
+ 
+ # Check for pkg-config
+-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-if test "x$HAVE_PKGCONFIG" = "xno"; then
++PKG_PROG_PKG_CONFIG
++AS_IF([test "x$PKG_CONFIG" = "x"],[
+ 	AC_MSG_ERROR(you need to have pkgconfig installed !)
+-fi
++])
+ 
+ PKG_CHECK_MODULES(CAJA, libcaja-extension >= $CAJA_REQUIRED)
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+@@ -48,12 +47,12 @@
+  exit(0)
+ EOF
+ 
+-if test $? -ne 0; then
++AS_IF([test $? -ne 0],[
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([couldn't find $1])
+-else
++],[
+    AC_MSG_RESULT([yes])
+-fi
++])
+ ])
+ 
+ PYTHON_CHECK_MODULE(pygtk, gtk)
+@@ -82,24 +81,24 @@
+ 
+ # Get caja extensions directory
+ AC_MSG_CHECKING([for caja extension directory])
+-if test -n "$with_caja_extension_dir"; then
++AS_IF([test -n "$with_caja_extension_dir"],[
+     CAJA_EXTENSION_DIR=$with_caja_extension_dir
+-else
++],[
+     CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
+-fi
+-if test -z "$CAJA_EXTENSION_DIR"; then
++])
++AS_IF([test -z "$CAJA_EXTENSION_DIR"],[
+     CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extensions-2.0'
+-fi
++])
+ 
+ AC_MSG_RESULT([${CAJA_EXTENSION_DIR}])
+ AC_SUBST(CAJA_EXTENSION_DIR)
+ 
+ CAJA_VERSION=`$PKG_CONFIG --modversion libcaja-extension`
+-if test -n "$CAJA_VERSION"; then
++AS_IF([test -n "$CAJA_VERSION"],[
+     CAJA_VERSION_MAJOR=`echo -n $CAJA_VERSION | cut -d . -f 1`
+     CAJA_VERSION_MINOR=`echo -n $CAJA_VERSION | cut -d . -f 2`
+     CAJA_VERSION_MICRO=`echo -n $CAJA_VERSION | cut -d . -f 3`
+-fi
++])
+ 
+ AC_DEFINE_UNQUOTED(CAJA_VERSION_MAJOR, [$CAJA_VERSION_MAJOR], [ caja version major])
+ AC_DEFINE_UNQUOTED(CAJA_VERSION_MINOR, [$CAJA_VERSION_MINOR], [ caja version minor])
diff --git a/debian/patches/series b/debian/patches/series
index 9995852..e345f37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+1001_pkgconfig-cross-compile-safe.patch
 1001_unlink-before-extract.patch
 1002_do-not-hardcode-dropboxd-path.patch
 1003_dropbox-update.patch

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