[vlc-commits] contrib: protobuf: remove useless guard

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May 19 11:36:06 2019 +0300| [43c0abc33f29c4e1ff2c667cc2a6c23b597015d1] | committer: Rémi Denis-Courmont

contrib: protobuf: remove useless guard

The error only occurs if $(PROTOC) is expanded, meaning protobuf is
used. Manually checking for enabled packages is incorrect.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=43c0abc33f29c4e1ff2c667cc2a6c23b597015d1
---

 contrib/src/protobuf/rules.mak | 2 --
 1 file changed, 2 deletions(-)

diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index a8db9a8364..c505ef7548 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -6,7 +6,6 @@ PKGS += protobuf
 ifeq ($(call need_pkg, "protobuf-lite >= 3.1.0 protobuf-lite < 3.2.0"),)
 PKGS_FOUND += protobuf
 else
-ifeq ($(findstring protobuf,$(PKGS_DISABLE)),)
 # check we have a matching protoc to use
 PROTOC_ABSPATH = $(shell PATH="$(PATH)" which protoc)
 ifeq ($(PROTOC_ABSPATH),)
@@ -22,7 +21,6 @@ PROTOC = $(PROTOC_ABSPATH)
 endif
 endif
 endif
-endif
 
 $(TARBALLS)/protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz:
 	$(call download_pkg,$(PROTOBUF_URL),protobuf)