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.5.1~40^2~9
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=96c98c5ba38261a40b0592b81269bc89cbe97363;p=collectd.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 7b3bc997..e91a1294 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"