mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
pjproject_bundled: Various fixes discovered during testing of OSes
For all OSes: * Disabled third-party codecs in pjproject and added '--disable-speex-codec --disable-speex-aec --disable-gsm-codec' to the configure options since we don't use the pjsip codec capability. FreeBSD: * Added FreeBSD support to install_prereq. * Changed pjproject/configure.m4 to use $GNU_MAKE instead of hardcoding "make". * Added __progname and environ to asterisk.exports.in. * Reverted the use of ldconfig to create shared library symlinks to ln. * Only enable epoll in pjproject if `uname -s` is Linux. * Added a patch to pjproject to take the name of the 'make' command from an environment variable if supplied. This is needed for the python bindings. (merged by Teluu into pjproject trunk 5/3/2016) FreeBSD support isn't complete. Still some general issues regarding make/gmake having nothing to do with pjproject. With some handholding it DOES build successfully. CentOS: Added 'patch' and 'bzip2' to install_prereq PACKAGES_RH. CentOS 6/7 32/64 build and run the pjsip testsuite successfully. Ubuntu: No changes required. Ubuntu 15/16 32/64 build and run the pjsip testsuite successfully. Debian: No changes required. Debian 6/7/8 32/64 build and run the pjsip testsuite successfully. There will utimately be a follow-up patch to create an install_prereq for the testsuite as I've discovered a few missing requirements. ASTERISK-25968 #close Change-Id: I5756a07facfc63798115a5e73a8709382fe9259c
This commit is contained in:
6
third-party/pjproject/configure.m4
vendored
6
third-party/pjproject/configure.m4
vendored
@@ -21,14 +21,14 @@ AC_DEFUN([PJPROJECT_CONFIGURE],
|
||||
[
|
||||
AC_MSG_CHECKING(for embedded pjproject (may have to download))
|
||||
AC_MSG_RESULT(configuring)
|
||||
make --quiet --no-print-directory -C $1 configure
|
||||
${GNU_MAKE} --quiet --no-print-directory -C $1 configure
|
||||
if test $? -ne 0 ; then
|
||||
AC_MSG_RESULT(failed)
|
||||
AC_MSG_NOTICE(Unable to configure $1)
|
||||
AC_MSG_ERROR(Run "make -C $1 NOISY_BUILD=yes configure" to see error details.)
|
||||
AC_MSG_ERROR(Run "${GNU_MAKE} -C $1 NOISY_BUILD=yes configure" to see error details.)
|
||||
fi
|
||||
|
||||
PJPROJECT_INCLUDE=$(make --quiet --no-print-directory -C $1 echo_cflags)
|
||||
PJPROJECT_INCLUDE=$(${GNU_MAKE} --quiet --no-print-directory -C $1 echo_cflags)
|
||||
PJPROJECT_CFLAGS="$PJPROJECT_INCLUDE"
|
||||
PBX_PJPROJECT=1
|
||||
PJPROJECT_BUNDLED=yes
|
||||
|
Reference in New Issue
Block a user