contrib: protobuf: add variable for the protobuf compiler

a3596601 · Rémi Denis-Courmont · ec9a6af6 · a3596601 · a3596601
Commit a3596601 authored Jan 14, 2016 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

contrib/src/main.mak contrib/src/main.mak +6 -0

contrib/src/protobuf/rules.mak contrib/src/protobuf/rules.mak +1 -1

No files found.
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -273,6 +273,12 @@ else
 SHA512SUM = $(error SHA-512 checksumming not found!)
 endif

+ifeq ($(shell protoc --version >/dev/null 2>&1 || echo FAIL),)
+PROTOC = protoc
+else
+PROTOC ?= $(error Protobuf compiler (protoc) not found!)
+endif
+
 #
 # Common helpers
 #

--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -23,6 +23,6 @@ endif

 .protobuf: protobuf
 	$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc=protoc
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc="$(PROTOC)"
 	cd $< && $(MAKE) && $(MAKE) install
 	touch $@