[Commits] [SCM] claws branch, master, updated. 3.17.0-27-g8eee2fd

claws at claws-mail.org claws at claws-mail.org
Mon Aug 27 19:43:14 CEST 2018


The branch, master has been updated
       via  8eee2fd5ddb9d24d8f58bf88afdea8ca67daaea5 (commit)
      from  9883b5177048b9aae430bde299db57293eb16f06 (commit)

Summary of changes:
 configure.ac |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 8eee2fd5ddb9d24d8f58bf88afdea8ca67daaea5
Author: Paul <paul at claws-mail.org>
Date:   Mon Aug 27 18:42:44 2018 +0100

    fix lintian autotools-pkg-config-macro-not-cross-compilation-safe warning
    
    see
    https://lintian.debian.org/tags/autotools-pkg-config-macro-not-cross-compilation-safe.html

diff --git a/configure.ac b/configure.ac
index a3d2a67..edf7767 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,10 +65,7 @@ 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)
 
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test x$PKG_CONFIG = xno ; then
-  AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
-fi
+PKG_PROG_PKG_CONFIG
 
 dnl libtool versioning
 LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
@@ -427,7 +424,7 @@ dnl *****************
 dnl check for glib
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28 gmodule-2.0 >= 2.28 gobject-2.0 >= 2.28 gthread-2.0 >= 2.28)
 
-GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
 
 AC_SUBST(GLIB_CFLAGS)

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list