From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 9 Aug 2015 17:05:25 +0000 (+0200)
Subject: protoc: check for headers in new location as well
X-Git-Tag: collectd-5.6.0~570^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F1210%2Fhead;p=thirdparty%2Fcollectd.git

protoc: check for headers in new location as well

Newer versions of protobuf-c have their headers in
/usr/include/protobuf-c, and a symlink from
/usr/include/google/protobuf-c/.

These symlinks will eventually disappear however, so be prepared.
---

diff --git a/configure.ac b/configure.ac
index 888c6e9dc..d119fc774 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,8 +64,8 @@ fi
 
 if test "x$have_protoc_c" = "xyes"
 then
-	AC_CHECK_HEADERS([google/protobuf-c/protobuf-c.h],
-			 [have_protoc_c="yes"],
+	AC_CHECK_HEADERS([protobuf-c/protobuf-c.h google/protobuf-c/protobuf-c.h],
+			 [have_protoc_c="yes"; break],
 			 [have_protoc_c="no (<google/protobuf-c/protobuf-c.h> not found)"])
 fi
 if test "x$have_protoc_c" = "xyes"