Skip to content

V
vlc
Commit a3596601 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

contrib: protobuf: add variable for the protobuf compiler

parent ec9a6af6
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
contrib/src/main.mak
View file @ a3596601
...@@ -273,6 +273,12 @@ else ...@@ -273,6 +273,12 @@ else
SHA512SUM = $(error SHA-512 checksumming not found!) SHA512SUM = $(error SHA-512 checksumming not found!)
endif endif
ifeq ($(shell protoc --version >/dev/null 2>&1 || echo FAIL),)
PROTOC = protoc
else
PROTOC ?= $(error Protobuf compiler (protoc) not found!)
endif
# #
# Common helpers # Common helpers
# #
......
contrib/src/protobuf/rules.mak
View file @ a3596601
...@@ -23,6 +23,6 @@ endif ...@@ -23,6 +23,6 @@ endif
.protobuf: protobuf .protobuf: protobuf
$(RECONF) $(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc=protoc cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc="$(PROTOC)"
cd $< && $(MAKE) && $(MAKE) install cd $< && $(MAKE) && $(MAKE) install
touch $@ touch $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment