1 files changed, 15 insertions, 15 deletions
diff --git a/network/asterisk/asterisk.SlackBuild b/network/asterisk/asterisk.SlackBuild
index 8558434cf4..174ab9aba4 100644
--- a/network/asterisk/asterisk.SlackBuild
+++ b/network/asterisk/asterisk.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=asterisk
-VERSION=${VERSION:-13.23.1}
+VERSION=${VERSION:-16.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,10 +78,9 @@ rm -fr $PKG $TMP/$PRGNAM-$VERSION $TMP/$IMAPDIR
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-VM_IMAP=${VM_IMAP:-"no"}
 CONFIGURE_OPTS=
 
-if [ "$VM_IMAP" != "no" ] && [ "${VM_ODBC:-no}" = "no" ]; then
+if [ "${VM_IMAP:-no}" != "no" ] && [ "${VM_ODBC:-no}" = "no" ]; then
   tar xvf $CWD/imap.tar.Z
   ( cd imap-2007f
     chown -R root:root .
@@ -100,6 +99,18 @@ if [ "$VM_IMAP" != "no" ] && [ "${VM_ODBC:-no}" = "no" ]; then
   CONFIGURE_OPTS="--with-imap=$TMP/$IMAPDIR"
 fi
 
+if [ "${JANSSON:-no}" != "no" ]; then
+  CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-jansson-bundled"
+else
+  CONFIGURE_OPTS="${CONFIGURE_OPTS} --without-jansson-bundled"
+fi
+
+if [ "${PJSIP:-no}" != "no" ]; then
+  CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-pjproject-bundled"
+else
+  CONFIGURE_OPTS="${CONFIGURE_OPTS} --without-pjproject-bundled"
+fi
+
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -129,17 +140,6 @@ menuselect/menuselect \
   --enable res_config_mysql \
   menuselect.makeopts
 
-#
-# Did asterisk menuselect discover the pjsip library?
-if [ "$(menuselect/menuselect --list-options menuselect.makeopts | grep -c '+ res_pjsip')" -gt 0 ]; then
-  #
-  # Asterisk menuselect discovered the pjsip library and is trying to use it.
-  # Need to modify header file so asterisk will build properly.
-  sed -i -r \
-    -e "s/\/\*\s+#undef\s+(HAVE_PJ_TRANSACTION_GRP_LOCK)\s+\*\//#define \1 1/" \
-    include/asterisk/autoconfig.h
-fi
-
 if [ "${MOH:-no}" != "no" ]; then
   menuselect/menuselect \
     --enable MOH-OPSOUND-ULAW \
@@ -163,7 +163,7 @@ if [ "${VM_ODBC:-no}" != "no" ]; then
   menuselect/menuselect \
     --enable ODBC_STORAGE \
     menuselect.makeopts
-elif [ "$VM_IMAP" != "no" ]; then
+elif [ "${VM_IMAP:-no}" != "no" ]; then
   menuselect/menuselect \
     --enable IMAP_STORAGE \
     menuselect.makeopts