BuildSystem: Only if found external PJProject, check its optional parts.

Change-Id: I11d5693d25c166c99d8cebffc16184d58f6362de
This commit is contained in:
Alexander Traud
2020-04-15 09:38:23 +02:00
parent 4af84c5675
commit dafb58aafd
2 changed files with 74 additions and 72 deletions

3
configure vendored
View File

@@ -24907,7 +24907,7 @@ $as_echo "#define HAVE_PJPROJECT 1" >>confdefs.h
fi fi
fi fi
if test "x$PBX_PJPROJECT" = "x1" ; then
if test "x${PBX_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK}" != "x1" -a "${USE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK}" != "no"; then if test "x${PBX_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK}" != "x1" -a "${USE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK}" != "no"; then
pbxlibdir="" pbxlibdir=""
@@ -25986,6 +25986,7 @@ fi
fi fi
fi
if test "x$PBX_PJPROJECT" = "x1" ; then if test "x$PBX_PJPROJECT" = "x1" ; then
if test "x${AST_DEVMODE}" = "xyes" ; then if test "x${AST_DEVMODE}" = "xyes" ; then

View File

@@ -2407,7 +2407,7 @@ fi
if test "$USE_PJPROJECT" != "no" ; then if test "$USE_PJPROJECT" != "no" ; then
if test "$PJPROJECT_BUNDLED" = "no" ; then if test "$PJPROJECT_BUNDLED" = "no" ; then
AST_PKG_CONFIG_CHECK([PJPROJECT], [libpjproject]) AST_PKG_CONFIG_CHECK([PJPROJECT], [libpjproject])
if test "x$PBX_PJPROJECT" = "x1" ; then
AST_EXT_LIB_CHECK([PJSIP_DLG_CREATE_UAS_AND_INC_LOCK], [pjsip], [pjsip_dlg_create_uas_and_inc_lock], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS]) AST_EXT_LIB_CHECK([PJSIP_DLG_CREATE_UAS_AND_INC_LOCK], [pjsip], [pjsip_dlg_create_uas_and_inc_lock], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
AST_EXT_LIB_CHECK([PJ_TRANSACTION_GRP_LOCK], [pjsip], [pjsip_tsx_create_uac2], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS]) AST_EXT_LIB_CHECK([PJ_TRANSACTION_GRP_LOCK], [pjsip], [pjsip_tsx_create_uac2], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
@@ -2458,6 +2458,7 @@ if test "$USE_PJPROJECT" != "no" ; then
AST_EXT_LIB_CHECK([PJSIP_AUTH_CLT_DEINIT], [pjsip], [pjsip_auth_clt_deinit], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS]) AST_EXT_LIB_CHECK([PJSIP_AUTH_CLT_DEINIT], [pjsip], [pjsip_auth_clt_deinit], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
AST_EXT_LIB_CHECK([PJSIP_TSX_LAYER_FIND_TSX2], [pjsip], [pjsip_tsx_layer_find_tsx2], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS]) AST_EXT_LIB_CHECK([PJSIP_TSX_LAYER_FIND_TSX2], [pjsip], [pjsip_tsx_layer_find_tsx2], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
fi fi
fi
if test "x$PBX_PJPROJECT" = "x1" ; then if test "x$PBX_PJPROJECT" = "x1" ; then
if test "x${AST_DEVMODE}" = "xyes" ; then if test "x${AST_DEVMODE}" = "xyes" ; then