Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

pjproject_bundled: Honor --without-pjproject.

Browse Source 
ASTERISK-28837

Change-Id: Id057324912a3cfe6f50af372675626bb515907d9
pull/18/head
Alexander Traud 5 years ago committed by Joshua Colp
parent d50fd0acc0
commit 966acc6251
3 changed files with 220 additions and 212 deletions
Show Stats Download Patch File Download Diff File

40
configure vendored
Unescape View File

@ -9194,6 +9194,8 @@ $as_echo "#define HAVE_JANSSON_BUNDLED 1" >>confdefs.h
as_fn_error $? "--with-pjproject and --with-pjproject-bundled can't both be specified" "$LINENO" 5
fi
if test "${with_pjproject}" != "no" && test "${with_pjproject}" != "n" ; then
ac_mandatory_list="$ac_mandatory_list PJPROJECT"
PJPROJECT_DIR="${ac_top_build_prefix}third-party/pjproject"
@ -9346,6 +9348,8 @@ $as_echo "yes" >&6; }
fi
fi
# AST_EXT_LIB_SETUP is used to tell configure to handle variables for
@ -13472,8 +13476,8 @@ fi
if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
$as_echo_n "checking for libedit... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEDIT" >&5
$as_echo_n "checking for LIBEDIT... " >&6; }
if test -n "$LIBEDIT_CFLAGS"; then
pkg_cv_LIBEDIT_CFLAGS="$LIBEDIT_CFLAGS"
@ -13932,8 +13936,8 @@ if test "$JANSSON_BUNDLED" = "no" ; then
if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson >= 2.11" >&5
$as_echo_n "checking for jansson >= 2.11... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5
$as_echo_n "checking for JANSSON... " >&6; }
if test -n "$JANSSON_CFLAGS"; then
pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"
@ -20620,8 +20624,8 @@ if test "${USE_ILBC}" != "no"; then
if test "x${PBX_ILBC}" != "x1" -a "${USE_ILBC}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libilbc" >&5
$as_echo_n "checking for libilbc... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ILBC" >&5
$as_echo_n "checking for ILBC... " >&6; }
if test -n "$ILBC_CFLAGS"; then
pkg_cv_ILBC_CFLAGS="$ILBC_CFLAGS"
@ -24861,8 +24865,8 @@ if test "$USE_PJPROJECT" != "no" ; then
if test "x${PBX_PJPROJECT}" != "x1" -a "${USE_PJPROJECT}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpjproject" >&5
$as_echo_n "checking for libpjproject... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PJPROJECT" >&5
$as_echo_n "checking for PJPROJECT... " >&6; }
if test -n "$PJPROJECT_CFLAGS"; then
pkg_cv_PJPROJECT_CFLAGS="$PJPROJECT_CFLAGS"
@ -26290,8 +26294,8 @@ fi
if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python" >&5
$as_echo_n "checking for python... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5
$as_echo_n "checking for PYTHONDEV... " >&6; }
if test -n "$PYTHONDEV_CFLAGS"; then
pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"
@ -26486,8 +26490,8 @@ fi
if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for portaudio-2.0" >&5
$as_echo_n "checking for portaudio-2.0... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
$as_echo_n "checking for PORTAUDIO... " >&6; }
if test -n "$PORTAUDIO_CFLAGS"; then
pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
@ -32788,8 +32792,8 @@ for ver in 3.0 2.6 2.4 2.2 2.0; do
if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gmime-$ver" >&5
$as_echo_n "checking for gmime-$ver... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMIME" >&5
$as_echo_n "checking for GMIME... " >&6; }
if test -n "$GMIME_CFLAGS"; then
pkg_cv_GMIME_CFLAGS="$GMIME_CFLAGS"
@ -34225,8 +34229,8 @@ fi
if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5
$as_echo_n "checking for gtk+-2.0... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
$as_echo_n "checking for GTK2... " >&6; }
if test -n "$GTK2_CFLAGS"; then
pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
@ -34336,8 +34340,8 @@ fi
if test "x${PBX_SYSTEMD}" != "x1" -a "${USE_SYSTEMD}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
$as_echo_n "checking for libsystemd... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
$as_echo_n "checking for SYSTEMD... " >&6; }
if test -n "$SYSTEMD_CFLAGS"; then
pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"

4
menuselect/configure vendored
Unescape View File

@ -4982,8 +4982,8 @@ fi
if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5
$as_echo_n "checking for gtk+-2.0... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
$as_echo_n "checking for GTK2... " >&6; }
if test -n "$GTK2_CFLAGS"; then
pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"

4
third-party/pjproject/configure.m4 vendored
Unescape View File

@ -9,6 +9,8 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
AC_MSG_ERROR(--with-pjproject and --with-pjproject-bundled can't both be specified)
fi
if test "${with_pjproject}" != "no" && test "${with_pjproject}" != "n" ; then
ac_mandatory_list="$ac_mandatory_list PJPROJECT"
PJPROJECT_DIR="${ac_top_build_prefix}third-party/pjproject"
@ -116,6 +118,8 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
AC_SUBST([PJPROJECT_LIB])
AC_SUBST([PJPROJECT_INCLUDE])
AC_MSG_RESULT(yes)
fi
])
AC_DEFUN([PJPROJECT_CONFIGURE],

Write Preview
Loading…
Cancel
Save