Code

protoc: check for headers in new location as well
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 9 Aug 2015 17:05:25 +0000 (19:05 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 30 Nov 2015 21:52:26 +0000 (22:52 +0100)
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.

configure.ac

index 7b3bc997942abbc029d9361f592086a5152eaf0b..e91a129464f8f30a1f7c0ec9799a925f98047f55 100644 (file)
@@ -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"