<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8552">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Avoid an extra case for OpenBSD.<br><br>Nine years ago with Mantis 13639 (now ASTERISK-12841) an extra case for OpenBSD<br>was introduced: Vorbis required Ogg to be specified manually, because the shared<br>library libvorbis.so did not specify its required dependency on -logg itself.<br><br>Today with OpenBSD 6.2, all libvorbis*.so declare their dependencies correctly.<br>Therefore, an extra case is not required anymore.<br><br>Change-Id: Ifd04e0994ce9f1e4ad29c3948a0398b91d1e97bc<br>---<br>M configure<br>M configure.ac<br>2 files changed, 1 insertion(+), 106 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 62439c7..74a9444 100755<br>--- a/configure<br>+++ b/configure<br>@@ -33143,105 +33143,6 @@<br> <br> <br> <br>-if test "${OSARCH}" = "OpenBSD";<br>-then<br>-<br>-if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then<br>- pbxlibdir=""<br>- # if --with-VORBIS=DIR has been specified, use it.<br>- if test "x${VORBIS_DIR}" != "x"; then<br>- if test -d ${VORBIS_DIR}/lib; then<br>- pbxlibdir="-L${VORBIS_DIR}/lib"<br>- else<br>- pbxlibdir="-L${VORBIS_DIR}"<br>- fi<br>- fi<br>-<br>- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"<br>- CFLAGS="${CFLAGS} "<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_info_init in -lvorbis" >&5<br>-$as_echo_n "checking for vorbis_info_init in -lvorbis... " >&6; }<br>-if ${ac_cv_lib_vorbis_vorbis_info_init+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-else<br>- ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-lvorbis ${pbxlibdir} -lm -lvorbisenc -lvorbisfile -logg $LIBS"<br>-cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>-/* end confdefs.h. */<br>-<br>-/* Override any GCC internal prototype to avoid an error.<br>- Use char because int might match the return type of a GCC<br>- builtin and then its argument prototype would still apply. */<br>-#ifdef __cplusplus<br>-extern "C"<br>-#endif<br>-char vorbis_info_init ();<br>-int<br>-main ()<br>-{<br>-return vorbis_info_init ();<br>- ;<br>- return 0;<br>-}<br>-_ACEOF<br>-if ac_fn_c_try_link "$LINENO"; then :<br>- ac_cv_lib_vorbis_vorbis_info_init=yes<br>-else<br>- ac_cv_lib_vorbis_vorbis_info_init=no<br>-fi<br>-rm -f core conftest.err conftest.$ac_objext \<br>- conftest$ac_exeext conftest.$ac_ext<br>-LIBS=$ac_check_lib_save_LIBS<br>-fi<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5<br>-$as_echo "$ac_cv_lib_vorbis_vorbis_info_init" >&6; }<br>-if test "x$ac_cv_lib_vorbis_vorbis_info_init" = xyes; then :<br>- AST_VORBIS_FOUND=yes<br>-else<br>- AST_VORBIS_FOUND=no<br>-fi<br>-<br>- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"<br>-<br>-<br>- # now check for the header.<br>- if test "${AST_VORBIS_FOUND}" = "yes"; then<br>- VORBIS_LIB="${pbxlibdir} -lvorbis -lm -lvorbisenc -lvorbisfile -logg"<br>- # if --with-VORBIS=DIR has been specified, use it.<br>- if test "x${VORBIS_DIR}" != "x"; then<br>- VORBIS_INCLUDE="-I${VORBIS_DIR}/include"<br>- fi<br>- VORBIS_INCLUDE="${VORBIS_INCLUDE} "<br>-<br>- # check for the header<br>- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}"<br>- ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default"<br>-if test "x$ac_cv_header_vorbis_codec_h" = xyes; then :<br>- VORBIS_HEADER_FOUND=1<br>-else<br>- VORBIS_HEADER_FOUND=0<br>-fi<br>-<br>-<br>- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"<br>-<br>- if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then<br>- VORBIS_LIB=""<br>- VORBIS_INCLUDE=""<br>- else<br>-<br>- PBX_VORBIS=1<br>- cat >>confdefs.h <<_ACEOF<br>-#define HAVE_VORBIS 1<br>-_ACEOF<br>-<br>- fi<br>- fi<br>-fi<br>-<br>-<br>-else<br> <br> if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then<br> pbxlibdir=""<br>@@ -33338,7 +33239,6 @@<br> fi<br> <br> <br>-fi<br> <br> if test "x${PBX_VORBIS_OPEN_CALLBACKS}" != "x1" -a "${USE_VORBIS_OPEN_CALLBACKS}" != "no"; then<br> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OV_CALLBACKS_NOCLOSE declared in vorbis/vorbisfile.h" >&5<br>diff --git a/configure.ac b/configure.ac<br>index 6ec90f6..be99113 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -2569,12 +2569,7 @@<br> <br> AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra} ${DAHDI_INCLUDE}])<br> <br>-if test "${OSARCH}" = "OpenBSD";<br>-then<br>- AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -lvorbisfile -logg])<br>-else<br>- AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -lvorbisfile])<br>-fi<br>+AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -lvorbisfile])<br> AST_C_DECLARE_CHECK([VORBIS_OPEN_CALLBACKS], [OV_CALLBACKS_NOCLOSE], [vorbis/vorbisfile.h])<br> <br> AC_LANG_PUSH(C++)<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8552">change 8552</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8552"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ifd04e0994ce9f1e4ad29c3948a0398b91d1e97bc </div>
<div style="display:none"> Gerrit-Change-Number: 8552 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>