[Commits] [SCM] claws branch, master, updated. 3.17.0-39-g09bc21b

[mones at claws-mail.org]

The branch, master has been updated
       via  09bc21b96f3bda637dcec73bb63c426c43a685bd (commit)
      from  c60b0fe14248f91abaf119a3caf4edaf04dea27d (commit)

Summary of changes:
 configure.ac |    8 ++++++++
 1 file changed, 8 insertions(+)


- Log -----------------------------------------------------------------
commit 09bc21b96f3bda637dcec73bb63c426c43a685bd
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Aug 31 20:36:54 2018 +0200

    Fix bug #3418 ‘Building on a Cross Compiling toolchain doesn't work’
    
    The bug is really fixed in commit 8eee2fd5ddb9d24d8f58bf88afdea8ca67daaea5
    This only adds a slight modification of the remaining portion of the
    patch checking the macro itself, from the original attached to the bug
    by ridai.govinda at gmail.com.

diff --git a/configure.ac b/configure.ac
index 50766e1..4a06390 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,14 @@ AC_SUBST(GIT_VERSION)
 AC_CHECK_PROG(HAVE_GTK_ICON_CACHE, gtk-update-icon-cache, yes, no)
 AM_CONDITIONAL(UPDATE_GTK_ICON_CACHE, test x"$HAVE_GTK_ICON_CACHE" = xyes)
 
+dnl Require pkg-config
+m4_ifndef([PKG_PROG_PKG_CONFIG],
+    [m4_fatal([Could not locate the pkg-config autoconf macros. These
+are usually located in /usr/share/aclocal/pkg.m4. If your macros
+are in a different location, try setting the environment variable
+ACLOCAL_FLAGS before running ./autogen.sh or autoreconf again. E.g.:
+export ACLOCAL_FLAGS="-I/other/macro/dir"])
+])
 PKG_PROG_PKG_CONFIG
 
 dnl libtool versioning

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail