From e6b0053d7561032b7adbf6f3afaecf30f5046605 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Mon, 3 Oct 2016 10:30:43 -0600 Subject: bundled_pjproject: Add tests for programs used by the Makefile, et al. Added tests for bzip2, tar, patch, sed and nm to configure.ac. Set DOWNLOAD_TO_STDOUT to a working command line regardless of whether the download program is wget, curl or fetch. Added a 'configure.m4' file to the third-party directory which takes care of calling any third-party project setup. Had to move some pjproject_bundled stuff up in configure.ac so it was called before the third-party configure macro. The pjproject tarball is now downloaded to the externals_cache_dir if it was specified on the ./configure command line Removed regeneration of the pjproject aconfigure file. It was only needed for an old patch that no longer applies. Converted the tests for symbols to explicit tests since we know that they're now available in the bundled version. Saves a little time during configure. ASTERISK-26416 #close Reported-by: Corey Farrell Change-Id: Id1d94251c0155f8dd41b7de7067f35cfbaafbb9b --- third-party/Makefile.rules | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'third-party/Makefile.rules') diff --git a/third-party/Makefile.rules b/third-party/Makefile.rules index 92e4ebc85..4f804dd0e 100644 --- a/third-party/Makefile.rules +++ b/third-party/Makefile.rules @@ -13,18 +13,6 @@ QUIET_CONFIGURE= REALLY_QUIET= endif -DOWNLOAD := $(shell which wget 2>/dev/null) -DOWNLOAD := $(if $(DOWNLOAD),$(DOWNLOAD) -O- ,) - -ifeq ($(DOWNLOAD),) -DOWNLOAD := $(shell which curl 2>/dev/null) -DOWNLOAD := $(if $(DOWNLOAD), $(DOWNLOAD) -L ,) -endif - -ifeq ($(DOWNLOAD),) -DOWNLOAD := echo "No download program available" ; exit 1; -endif - export SUBMAKE export ECHO_PREFIX export CMD_PREFIX @@ -34,3 +22,8 @@ export ASTTOPDIR export ASTSBINDIR export DESTDIR export ASTDATADIR +export TAR +export PATCH +export SED +export NM +export DOWNLOAD -- cgit v1.2.3