Index: head/net/asterisk16/Makefile =================================================================== --- head/net/asterisk16/Makefile (revision 538550) +++ head/net/asterisk16/Makefile (revision 538551) @@ -1,306 +1,303 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 16.10.0 -PORTREVISION= 2 +PORTVERSION= 16.11.0 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \ http://www.pjsip.org/release/${PJSIP_VERSION}/:PJSIP MASTER_SITE_SUBDIR= asterisk/ \ asterisk/old-releases/ \ sounds/releases/:g729 PKGNAMESUFFIX= 16 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ pjproject-${PJSIP_VERSION}.tar.bz2:PJSIP DIST_SUBDIR= ${PORTNAME} MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 sparc64 EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \ shebangfix sqlite ssl ncurses USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= asterisk USE_GITHUB= nodefault PJSIP_VERSION= 2.9 GNU_CONFIGURE= yes CONFIGURE_ARGS= --datarootdir=${DATADIR} \ --with-ilbc=internal \ --with-crypto=${OPENSSLBASE} \ --with-ssl=${OPENSSLBASE} \ --with-externals-cache=${DISTDIR}/${DIST_SUBDIR} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi \ contrib/scripts/astversion LDFLAGS+= -L. MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OSVERSION=${OSVERSION} \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" \ ASTLDFLAGS="${LDFLAGS}" MAKE_ARGS+= NOISY_BUILD=yes \ ASTDATADIR=${DATADIR} CONFLICTS= ossp-uuid-[0-9]* CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk13 OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \ MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \ SPANDSP SRTP SYSINFO URIPARSER XMPP -OPTIONS_DEFAULT= CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC MYSQL PGSQL \ +OPTIONS_DEFAULT= CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \ PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 SRTP URIPARSER \ VORBIS OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI XMPP OPTIONS_DEFAULT_amd64= DAHDI XMPP OPTIONS_DEFAULT_sparc64= DAHDI XMPP OPTIONS_DEFAULT_powerpc= XMPP OPTIONS_GROUP= CODECS OPTIONS_GROUP_CODECS= GSM NEWG711 OPUS SPEEX VORBIS CODECS_DESC= Encoder/Decoder (Codec) Support OPTIONS_GROUP+= DATABASE OPTIONS_GROUP_DATABASE= MYSQL ODBC PGSQL SQLITE2 DATABASE_DESC= Database Support OPTIONS_MULTI= MENU OPTIONS_MULTI_MENU= NCURSES NEWT MENU_DESC= Menuselect Interface Backend NEWT_DESC= Newt User Interface ASTERISK_CORE_G729_SOUNDS= asterisk-core-sounds-en-g729-1.5.tar.gz ASTERISK_MOH_G729_SOUNDS= asterisk-moh-opsound-g729-2.03.tar.gz G729_DISTFILES= ${ASTERISK_CORE_G729_SOUNDS}:g729 \ ${ASTERISK_MOH_G729_SOUNDS}:g729 ASTVERSION_DESC?= Install astversion (requires bash) BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo DAHDI_DESC?= DAHDI support EXCHANGE_DESC?= Exchange calendar support G729_DESC?= Install G.729 format sounds for Music-on-Hold (MoH) MACRO_DESC?= Enable app_macro (deprecated) MP3PLAYER_DESC= Install MP3 Player for Music-On-Hold (mpg123) NEWG711_DESC?= New G711 Codec OOH323_DESC?= ooh323 support OPUS_DESC?= Opus Codec PJSIP_DESC?= Build the PJSIP based SIP channel SRTP_DESC?= SecureRTP support SYSINFO_DESC?= Use devel/libsysinfo to get system information URIPARSER_DESC?= Use RFC 3986 compliant uriparser library XMPP_DESC?= XMPP/GTALK support OPTIONS_SUB= yes ASTVERSION_RUN_DEPENDS= bash:shells/bash BACKTRACE_CONFIGURE_WITH= execinfo CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:ftp/curl DAHDI_CONFIGURE_WITH= dahdi openr2 DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \ libopenr2.so:misc/openr2 \ libtonezone.so:misc/dahdi EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:www/neon \ libexpat.so:textproc/expat2 EXCHANGE_USES= gettext-runtime FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:databases/freetds GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes LUA_CONFIGURE_WITH= lua LUA_USES= lua LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} MYSQL_CONFIGURE_WITH= mysqlclient MYSQL_USES= mysql MP3PLAYER_RUN_DEPENDS= mpg123:audio/mpg123 NCURSES_USES= ncurses NEWT_LIB_DEPENDS= libnewt.so:devel/newt ODBC_CONFIGURE_WITH= unixodbc ODBC_CONFIGURE_ON= --with-ltdl ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC \ libltdl.so:devel/libltdl OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_EXTRACT_ONLY= ${DISTFILE_opus} OPUS_GH_TUPLE= traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql PJSIP_CONFIGURE_WITH= pjproject pjproject-bundled PJSIP_USES= pkgconfig PJSIP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp PORTAUDIO_CONFIGURE_WITH= portaudio PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio RADIUS_CONFIGURE_WITH= radius RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient SNMP_CONFIGURE_WITH= netsnmp SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp \ libpkg.so:${PKG_ORIGIN} SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:comms/spandsp \ libtiff.so:graphics/tiff SPEEX_CONFIGURE_WITH= speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp SQLITE2_CONFIGURE_WITH= sqlite SQLITE2_LIB_DEPENDS= libsqlite.so:databases/sqlite2 SRTP_CONFIGURE_WITH= srtp SRTP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo URIPARSER_CONFIGURE_WITH= uriparser URIPARSER_LIB_DEPENDS= liburiparser.so:net/uriparser VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg XMPP_CONFIGURE_WITH= iksemel XMPP_LIB_DEPENDS= libiksemel.so:textproc/iksemel ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk USERS= ${ASTERISK_USER} GROUPS= ${ASTERISK_GROUP} dahdi .include .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif .if ${PREFIX} == ${LOCALBASE} VARDIR=/var .else VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \ ASTERISK_GROUP=${ASTERISK_GROUP} \ VARDIR=${VARDIR} post-extract: @${FIND} ${WRKSRC} -name '*.d' -delete post-extract-G729-on: ${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds post-extract-OPUS-on: ${CP} ${WRKSRC_opus}/include/asterisk/* ${WRKSRC}/include/asterisk ${CP} ${WRKSRC_opus}/codecs/* ${WRKSRC}/codecs ${CP} ${WRKSRC_opus}/res/* ${WRKSRC}/res post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample - @${CP} ${FILESDIR}/0050-fix-race-parallel-build.patch \ - ${WRKSRC}/third-party/pjproject/patches/ .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts .endif post-patch-SYSINFO-on: @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile post-patch-SYSINFO-off: @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts post-configure-MACRO-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable app_macro menuselect.makeopts post-configure-MYSQL-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts post-configure-OOH323-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts post-configure-NEWG711-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts post-configure-OPTIMIZED_CFLAGS-off: @cd ${WRKSRC} && ./menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts post-configure-OPUS-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable codec_opus_open_source menuselect.makeopts post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ast[a-f]* ${STAGEDIR}${PREFIX}/lib/*.so.* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so ${STAGEDIR}${DATADIR}/agi-bin/eagi-* ${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} (cd ${STAGEDIR} && \ ${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \ ${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \ ${ECHO} "@owner" >> ${TMPPLIST} && \ ${ECHO} "@group" >> ${TMPPLIST}); post-install-ASTVERSION-off: @${RM} ${STAGEDIR}${PREFIX}/sbin/astversion .include Index: head/net/asterisk16/distinfo =================================================================== --- head/net/asterisk16/distinfo (revision 538550) +++ head/net/asterisk16/distinfo (revision 538551) @@ -1,11 +1,11 @@ -TIMESTAMP = 1588265447 -SHA256 (asterisk/asterisk-16.10.0.tar.gz) = 8733f137b4b4e01d90bb796fa41d992e656b4cf1c28d2d7e81863a6839975702 -SIZE (asterisk/asterisk-16.10.0.tar.gz) = 27706766 +TIMESTAMP = 1591868315 +SHA256 (asterisk/asterisk-16.11.0.tar.gz) = 5db58aeee6cbc7604cd7059fe210f5fae0eae8aa1b13e5282984b9b9c12eaf36 +SIZE (asterisk/asterisk-16.11.0.tar.gz) = 27708591 SHA256 (asterisk/pjproject-2.9.tar.bz2) = d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636 SIZE (asterisk/pjproject-2.9.tar.bz2) = 5009546 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000 SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044 Index: head/net/asterisk16/files/0050-fix-race-parallel-build.patch =================================================================== --- head/net/asterisk16/files/0050-fix-race-parallel-build.patch (revision 538550) +++ head/net/asterisk16/files/0050-fix-race-parallel-build.patch (nonexistent) @@ -1,59 +0,0 @@ -diff --git a/build/rules.mak b/build/rules.mak -index 8fa98655e..912199c41 100644 ---- a/build/rules.mak -+++ b/build/rules.mak -@@ -129,7 +129,7 @@ endif - $(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS) - $(CROSS_COMPILE)ld -r -o $@ $(OBJS) - --$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o -+$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o | $(OBJDIRS) - @echo Creating kbuild Makefile... - @echo "# Our module name:" > $(OBJDIR)/Makefile - @echo 'obj-m += $(app).o' >> $(OBJDIR)/Makefile -@@ -154,27 +154,27 @@ $(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o - ../lib/$(app).ko: $(LIB) $(OBJDIR)/$(app).ko - cp $(OBJDIR)/$(app).ko ../lib - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m | $(OBJDIRS) - $(CC) $($(APP)_CFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c | $(OBJDIRS) - $(CC) $($(APP)_CFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S | $(OBJDIRS) - $(CC) $($(APP)_CFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp | $(OBJDIRS) - $(CXX) $($(APP)_CXXFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc | $(OBJDIRS) - $(CXX) $($(APP)_CXXFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) -diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile -index b85c7817a..20777909f 100644 ---- a/pjsip/build/Makefile -+++ b/pjsip/build/Makefile -@@ -262,7 +262,7 @@ $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPL - - pjsua2-lib: $(PJSUA2_LIB_LIB) - $(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB) --$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB) $(PSJUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) -+$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) - $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) - - pjsip-test: $(TEST_EXE) Property changes on: head/net/asterisk16/files/0050-fix-race-parallel-build.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-configure =================================================================== --- head/net/asterisk16/files/patch-configure (revision 538550) +++ head/net/asterisk16/files/patch-configure (revision 538551) @@ -1,109 +1,78 @@ --- configure.orig 2020-04-30 14:11:40 UTC +++ configure @@ -4687,8 +4687,6 @@ case "${host_os}" in ;; dragonfly*|freebsd*) ac_default_prefix=/usr/local - CPPFLAGS=-I/usr/local/include - LDFLAGS=-L/usr/local/lib ;; openbsd*) ac_default_prefix=/usr/local -@@ -9230,25 +9228,25 @@ $as_echo "configuring" >&6; } - - this_host=$(./config.sub $(./config.guess)) - if test "$build" != "$this_host" ; then -- PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias" -+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias" - fi - if test "$host" != "$this_host" ; then -- PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias" -+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias" - fi - # This was a copy of the autoconf generated code from the root ./configure. - # Hopefully, when you read this, the code is still the same. - if test "${with_ssl+set}" = set; then : - case $with_ssl in - n|no) -- PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl" -+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl" - ;; - y|ye|yes) - # Not to mention SSL is the default in PJProject and means "autodetect". - # In Asterisk, "./configure --with-ssl" means "must be present". -- PJPROJECT_CONFIGURE_OPTS+="" -+ #PJPROJECT_CONFIGURE_OPTS+="" - ;; - *) -- PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}" -+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}" - ;; - esac - fi @@ -20351,6 +20349,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include + #include #include int main () @@ -29510,6 +29510,8 @@ fi for ver in 5.3 5.2 5.1; do +vernodot=`echo ${ver} | sed 's/\.//'` + if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="" # if --with-LUA=DIR has been specified, use it. @@ -29524,13 +29526,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5 -$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5 +$as_echo_n "checking for luaL_newstate in -llua-${ver}... " >&6; } if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS" +LIBS="-llua-${ver} ${pbxlibdir} -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29572,7 +29574,7 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then - LUA_LIB="${pbxlibdir} -llua${ver} -lm" + LUA_LIB="${pbxlibdir} -llua-${ver} -lm" # if --with-LUA=DIR has been specified, use it. if test "x${LUA_DIR}" != "x"; then LUA_INCLUDE="-I${LUA_DIR}/include" @@ -29582,8 +29584,8 @@ fi # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" - as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default" + as_ac_Header=`$as_echo "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : LUA_HEADER_FOUND=1 else @@ -29610,9 +29612,9 @@ fi if test "x${PBX_LUA}" = "x1" ; then if test x"${LUA_DIR}" = x; then - LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}" + LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${vernodot}" else - LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}" + LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${vernodot}" fi break; fi