[vlc-devel] [PATCH] extras/tools: build pkg-config only when necessary

[Sean McGovern]

Actually let me think about this one a bit more -- contribs built OK, but I can't bootstrap in the toplevel now.

I think if pkg-config is OK but autoconf is non-present or outdated it will still need to be told where the system aclocal directory is. Since this varies per OS, it will be a PITA. Maybe I could just leave that part as a local patch.

Thoughts?

-- Sean McG.
-----Original Message-----
From: Sean McGovern <gseanmcg at gmail.com>
Sender: "vlc-devel" <vlc-devel-bounces at videolan.org>Date: Sun, 15 Feb 2015 02:51:18 
To: <vlc-devel at videolan.org>
Reply-To: Mailing list for VLC media player developers <vlc-devel at videolan.org>
Subject: [vlc-devel] [PATCH] extras/tools: build pkg-config only when
	necessary

---
 extras/tools/tools.mak |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index c74a223..2781cd8 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -137,7 +137,11 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
 	$(UNPACK)
 	$(MOVE)
 
-.autoconf: autoconf .pkg-config
+ifneq ($(shell pkg-config --version >/dev/null 2>&1 || echo FAIL),)
+DEPS_autoconf += .pkg-config
+endif
+
+.autoconf: autoconf $(DEPS_autoconf)
 	(cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
 	touch $@
 
-- 
1.7.9.2

_______________________________________________
vlc-devel mailing list
To unsubscribe or modify your subscription options:
https://mailman.videolan.org/listinfo/vlc-devel