From 884d4a1dca29d00b3294577d75c12e416c5ae124 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 23 Apr 2014 17:21:13 +0200 Subject: [PATCH] use git submodule status instead of ls to check tunnel mode --- submodules/build/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index e6b95ed13..d7dee7037 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -25,12 +25,13 @@ enable_ffmpeg=yes enable_opus=yes enable_debug=no -TUNNEL_AVAILABLE=$(shell ls ../tunnel/configure.ac) - +TUNNEL_AVAILABLE=$(shell git submodule status ../tunnel) ifneq ($(TUNNEL_AVAILABLE),) -enable_tunnel=yes -enable_gpl_third_parties=no + enable_tunnel=yes + enable_gpl_third_parties=no +else + enable_tunnel=no endif