[vlc-devel] [PATCH] protobuf: build protoc where necessary

[Sean McGovern]

---
 contrib/src/protobuf/rules.mak |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index 9fbd339..84f9916 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -21,6 +21,11 @@ ifdef HAVE_WIN32
 endif
 	$(MOVE)
 
+PROTOCONF := $(HOSTCONF)
+ifeq ($(shell protoc --version >/dev/null 2>&1 || echo FAIL),)
+PROTOCONF += --with-protoc=protoc
+endif
+
 .protobuf: protobuf
 	$(RECONF)
 # Local protoc Compiler
@@ -28,6 +33,6 @@ ifdef HAVE_CROSS_COMPILE
 	cd $< && ./configure --prefix="$(PREFIX)" && $(MAKE) install
 	cd $< && $(MAKE) clean
 endif
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc=protoc
+	cd $< && $(HOSTVARS) ./configure $(PROTOCONF)
 	cd $< && $(MAKE) install
 	touch $@
-- 
1.7.9.2