diff options
| author | George Joseph <gjoseph@digium.com> | 2017-08-08 12:33:50 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2017-08-08 16:43:00 -0500 |
| commit | 305bd0d99fa0349db99b5aa631cd1ed2b11a59f7 (patch) | |
| tree | 5a8d3146212571aff4c15c772045f4bcc8d7e2a4 /makeopts.in | |
| parent | 62092bc1140a29c86e1fe4dd195ff819e6e7569b (diff) | |
Make --with-pjproject-bundled the default for Asterisk 15
'--with-pjproject-bundled' is now the default when running
./configure. It can be disabled with '--without-pjproject-bundled'.
To make building without an internet connection easier, a new
./configure option '--with-download-cache' was added that sets
the cache for externals (like pjproject, the codecs and the DPMA),
AND the sounds files. It can also be specified as an environment
variable named "AST_DOWNLOAD_CACHE". The existing
'--with-sounds-cache' option / SOUNDS_CACHE_DIR env variable and
'--with-externals-cache' option / EXTERNALS_CACHE_DIR env variable
remain and if specified, will override '--with-downloads-cache'.
ASTERISK-27189
Change-Id: Ifa9783fddf44aafadb060c9feba713dfa81d38ce
Diffstat (limited to 'makeopts.in')
| -rw-r--r-- | makeopts.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/makeopts.in b/makeopts.in index 887a15567..7d0347ddc 100644 --- a/makeopts.in +++ b/makeopts.in @@ -29,8 +29,9 @@ FETCH=@FETCH@ DOWNLOAD=@DOWNLOAD@ DOWNLOAD_TO_STDOUT=@DOWNLOAD_TO_STDOUT@ DOWNLOAD_TIMEOUT=@DOWNLOAD_TIMEOUT@ -SOUNDS_CACHE_DIR=@SOUNDS_CACHE_DIR@ -EXTERNALS_CACHE_DIR=@EXTERNALS_CACHE_DIR@ +AST_DOWNLOAD_CACHE=@AST_DOWNLOAD_CACHE@ +SOUNDS_CACHE_DIR=$(or @SOUNDS_CACHE_DIR@,${AST_DOWNLOAD_CACHE}) +EXTERNALS_CACHE_DIR=$(or @EXTERNALS_CACHE_DIR@,${AST_DOWNLOAD_CACHE}) RUBBER=@RUBBER@ CATDVI=@CATDVI@ KPATHSEA=@KPATHSEA@ |