mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Fix issues with bundled pjproject cached download.
Previously when testing I had a preexisting makeopts in ASTTOPDIR. The ordering of configure.ac causes --with-externals-cache to be processed after third-party configure. In cases where the Asterisk clone is cleaned it would cause pjproject to be downloaded to /tmp. This moves processing of the externals cache and sounds cache to happen before third-party configure. This also addresses a possible issue with the third-party Makefile. If TMPDIR is set by the environment it would override the path given to --with-externals-cache. ASTERISK-26416 Change-Id: Ifab7f35bfcd5a31a31a3a4353cc26a68c8c6592d
This commit is contained in:
committed by
George Joseph
parent
3633c7926c
commit
ce4cfd2eca
7
third-party/pjproject/configure.m4
vendored
7
third-party/pjproject/configure.m4
vendored
@@ -9,7 +9,7 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
|
||||
|
||||
AC_MSG_CHECKING(for embedded pjproject (may have to download))
|
||||
AC_MSG_RESULT(configuring)
|
||||
|
||||
|
||||
if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then
|
||||
AC_MSG_ERROR(A download utility (wget, curl or fetch) is required to download bundled pjproject)
|
||||
fi
|
||||
@@ -28,7 +28,7 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
|
||||
if test "${NM}" = ":" ; then
|
||||
AC_MSG_ERROR(nm is required to build bundled pjproject)
|
||||
fi
|
||||
|
||||
|
||||
export TAR PATCH SED NM EXTERNALS_CACHE_DIR DOWNLOAD_TO_STDOUT
|
||||
${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} configure
|
||||
if test $? -ne 0 ; then
|
||||
@@ -42,7 +42,7 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
|
||||
PJPROJECT_INCLUDE=$(${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} echo_cflags)
|
||||
PJPROJECT_CFLAGS="$PJPROJECT_INCLUDE"
|
||||
PBX_PJPROJECT=1
|
||||
|
||||
|
||||
AC_DEFINE([HAVE_PJPROJECT], 1, [Define if your system has PJPROJECT])
|
||||
AC_DEFINE([HAVE_PJPROJECT_BUNDLED], 1, [Define if your system has PJPROJECT_BUNDLED])
|
||||
|
||||
@@ -70,4 +70,3 @@ AC_DEFUN([PJPROJECT_CONFIGURE],
|
||||
_PJPROJECT_CONFIGURE()
|
||||
fi
|
||||
])
|
||||
|
Reference in New Issue
Block a user