From: Florian Forster <octo@collectd.org>
Date: Thu, 17 Dec 2015 12:41:18 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~13
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ea3a86f0ff50f12650aae7eea033984a8ae0eba5;hp=879a770744e7d049389f52a5104c79d795037578;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

diff --git a/configure.ac b/configure.ac
index eecca626..8f7a4f33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_LEX
 AC_PROG_YACC
+
+# Warn when pkg.m4 is missing
+m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
+
 PKG_PROG_PKG_CONFIG
 
 AC_CHECK_PROG([have_protoc_c], [protoc-c], [yes], [no])