<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8558">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Remove unused dependency on libltdl.<br><br>Asterisk does not need the development package of libltdl, because it does not<br>use any symbol of -lltdl directly. Instead, it uses the runtime package via the<br>shared library -lodbc. On the supported platforms, that shared library declares<br>its dependency on -lltdl correctly, otherwise AST_EXT_LIB_CHECK would have<br>failed.<br><br>ASTERISK-27745<br><br>Change-Id: Icd315809b8e7978203431f3afb66240dd3a040ba<br>---<br>M apps/app_voicemail.c<br>M build_tools/menuselect-deps.in<br>M configure<br>M configure.ac<br>M contrib/scripts/install_prereq<br>M include/asterisk/autoconfig.h.in<br>M res/res_odbc.c<br>7 files changed, 7 insertions(+), 153 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c<br>index 95d0e8d..1e7a1d8 100644<br>--- a/apps/app_voicemail.c<br>+++ b/apps/app_voicemail.c<br>@@ -63,7 +63,6 @@<br> </member><br> <member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC"><br> <depend>generic_odbc</depend><br>- <depend>ltdl</depend><br> <conflict>IMAP_STORAGE</conflict><br> <conflict>FILE_STORAGE</conflict><br> <defaultenabled>no</defaultenabled><br>diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in<br>index 69e5f03..2c2bd53 100644<br>--- a/build_tools/menuselect-deps.in<br>+++ b/build_tools/menuselect-deps.in<br>@@ -32,7 +32,6 @@<br> LIBXML2=@PBX_LIBXML2@<br> XMLSTARLET=@PBX_XMLSTARLET@<br> BASH=@PBX_BASH@<br>-LTDL=@PBX_LTDL@<br> LUA=@PBX_LUA@<br> MISDN=@PBX_MISDN@<br> MYSQLCLIENT=@PBX_MYSQLCLIENT@<br>diff --git a/configure b/configure<br>index eeb7467..08b8df1 100755<br>--- a/configure<br>+++ b/configure<br>@@ -1019,10 +1019,6 @@<br> LUA_DIR<br> LUA_INCLUDE<br> LUA_LIB<br>-PBX_LTDL<br>-LTDL_DIR<br>-LTDL_INCLUDE<br>-LTDL_LIB<br> PBX_LIBXSLT_CLEANUP<br> LIBXSLT_CLEANUP_DIR<br> LIBXSLT_CLEANUP_INCLUDE<br>@@ -1376,7 +1372,6 @@<br> with_libedit<br> with_libxml2<br> with_libxslt<br>-with_ltdl<br> with_lua<br> with_misdn<br> with_mysqlclient<br>@@ -2129,7 +2124,6 @@<br> 'internal' Editline otherwise<br> --with-libxml2=PATH use LibXML2 files in PATH<br> --with-libxslt=PATH use LibXSLT files in PATH<br>- --with-ltdl=PATH use libtool files in PATH<br> --with-lua=PATH use Lua files in PATH<br> --with-misdn=PATH use mISDN user files in PATH<br> --with-mysqlclient=PATH use MySQL client files in PATH<br>@@ -10720,38 +10714,6 @@<br> LIBXSLT_CLEANUP_DIR=${LIBXSLT_DIR}<br> <br> PBX_LIBXSLT_CLEANUP=0<br>-<br>-<br>-<br>-<br>-<br>-<br>-<br>- LTDL_DESCRIP="libtool"<br>- LTDL_OPTION="ltdl"<br>- PBX_LTDL=0<br>-<br>-# Check whether --with-ltdl was given.<br>-if test "${with_ltdl+set}" = set; then :<br>- withval=$with_ltdl;<br>- case ${withval} in<br>- n|no)<br>- USE_LTDL=no<br>- # -1 is a magic value used by menuselect to know that the package<br>- # was disabled, other than 'not found'<br>- PBX_LTDL=-1<br>- ;;<br>- y|ye|yes)<br>- ac_mandatory_list="${ac_mandatory_list} LTDL"<br>- ;;<br>- *)<br>- LTDL_DIR="${withval}"<br>- ac_mandatory_list="${ac_mandatory_list} LTDL"<br>- ;;<br>- esac<br>-<br>-fi<br>-<br> <br> <br> <br>@@ -22136,104 +22098,6 @@<br> <br> fi<br> done<br>-<br>-<br>-# Needed by unixodbc<br>-<br>-if test "x${PBX_LTDL}" != "x1" -a "${USE_LTDL}" != "no"; then<br>- pbxlibdir=""<br>- # if --with-LTDL=DIR has been specified, use it.<br>- if test "x${LTDL_DIR}" != "x"; then<br>- if test -d ${LTDL_DIR}/lib; then<br>- pbxlibdir="-L${LTDL_DIR}/lib"<br>- else<br>- pbxlibdir="-L${LTDL_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 lt_dlinit in -lltdl" >&5<br>-$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }<br>-if ${ac_cv_lib_ltdl_lt_dlinit+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-else<br>- ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-lltdl ${pbxlibdir} $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 lt_dlinit ();<br>-int<br>-main ()<br>-{<br>-return lt_dlinit ();<br>- ;<br>- return 0;<br>-}<br>-_ACEOF<br>-if ac_fn_c_try_link "$LINENO"; then :<br>- ac_cv_lib_ltdl_lt_dlinit=yes<br>-else<br>- ac_cv_lib_ltdl_lt_dlinit=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_ltdl_lt_dlinit" >&5<br>-$as_echo "$ac_cv_lib_ltdl_lt_dlinit" >&6; }<br>-if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then :<br>- AST_LTDL_FOUND=yes<br>-else<br>- AST_LTDL_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_LTDL_FOUND}" = "yes"; then<br>- LTDL_LIB="${pbxlibdir} -lltdl "<br>- # if --with-LTDL=DIR has been specified, use it.<br>- if test "x${LTDL_DIR}" != "x"; then<br>- LTDL_INCLUDE="-I${LTDL_DIR}/include"<br>- fi<br>- LTDL_INCLUDE="${LTDL_INCLUDE} "<br>-<br>- # check for the header<br>- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} ${LTDL_INCLUDE}"<br>- ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"<br>-if test "x$ac_cv_header_ltdl_h" = xyes; then :<br>- LTDL_HEADER_FOUND=1<br>-else<br>- LTDL_HEADER_FOUND=0<br>-fi<br>-<br>-<br>- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"<br>-<br>- if test "x${LTDL_HEADER_FOUND}" = "x0" ; then<br>- LTDL_LIB=""<br>- LTDL_INCLUDE=""<br>- else<br>-<br>- PBX_LTDL=1<br>- cat >>confdefs.h <<_ACEOF<br>-#define HAVE_LTDL 1<br>-_ACEOF<br>-<br>- fi<br>- fi<br>-fi<br>-<br> <br> <br> <br>diff --git a/configure.ac b/configure.ac<br>index c920bae..785ce1b 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -484,7 +484,6 @@<br> AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])<br> AST_EXT_LIB_SETUP([LIBXSLT], [LibXSLT], [libxslt])<br> AST_EXT_LIB_SETUP_OPTIONAL([LIBXSLT_CLEANUP], [LibXSLT Library Cleanup Function], [LIBXSLT], [libxslt])<br>-AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])<br> AST_EXT_LIB_SETUP([LUA], [Lua], [lua])<br> AST_EXT_LIB_SETUP([MISDN], [mISDN user], [misdn])<br> AST_EXT_LIB_SETUP([MYSQLCLIENT], [MySQL client], [mysqlclient])<br>@@ -2102,9 +2101,6 @@<br> <br> # 64-bit version of kevent (from kqueue) on OS X<br> AC_CHECK_FUNCS([kevent64])<br>-<br>-# Needed by unixodbc<br>-AST_EXT_LIB_CHECK([LTDL], [ltdl], [lt_dlinit], [ltdl.h], [])<br> <br> AST_EXT_LIB_CHECK([LDAP], [ldap], [ldap_initialize], [ldap.h])<br> <br>diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq<br>index da04988..f01b332 100755<br>--- a/contrib/scripts/install_prereq<br>+++ b/contrib/scripts/install_prereq<br>@@ -24,7 +24,7 @@<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libedit-dev libjansson-dev libsqlite3-dev uuid-dev libxml2-dev"<br> # Asterisk: for addons:<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libspeex-dev libspeexdsp-dev libogg-dev libvorbis-dev libasound2-dev portaudio19-dev libcurl4-openssl-dev xmlstarlet bison flex"<br>-PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpq-dev unixodbc-dev libltdl-dev libneon27-dev libgmime-2.6-dev liblua5.2-dev liburiparser-dev libxslt1-dev libssl-dev"<br>+PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpq-dev unixodbc-dev libneon27-dev libgmime-2.6-dev liblua5.2-dev liburiparser-dev libxslt1-dev libssl-dev"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libvpb-dev libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libosptk-dev libjack-jackd2-dev bash"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libcorosync-common-dev libcpg-dev libcfg-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample1-dev libc-client2007e-dev binutils-dev libsrtp0-dev libsrtp2-dev libgsm1-dev doxygen graphviz zlib1g-dev libldap2-dev"<br>@@ -39,7 +39,7 @@<br> PACKAGES_RH="$PACKAGES_RH libedit-devel jansson-devel libuuid-devel sqlite-devel libxml2-devel"<br> # Asterisk: for addons:<br> PACKAGES_RH="$PACKAGES_RH speex-devel speexdsp-devel libogg-devel libvorbis-devel alsa-lib-devel portaudio-devel libcurl-devel xmlstarlet bison flex"<br>-PACKAGES_RH="$PACKAGES_RH postgresql-devel unixODBC-devel libtool-ltdl-devel neon-devel gmime-devel lua-devel uriparser-devel libxslt-devel openssl-devel"<br>+PACKAGES_RH="$PACKAGES_RH postgresql-devel unixODBC-devel neon-devel gmime-devel lua-devel uriparser-devel libxslt-devel openssl-devel"<br> PACKAGES_RH="$PACKAGES_RH mysql-devel bluez-libs-devel radcli-devel freetds-devel jack-audio-connection-kit-devel bash"<br> PACKAGES_RH="$PACKAGES_RH net-snmp-devel iksemel-devel corosynclib-devel newt-devel popt-devel libical-devel spandsp-devel"<br> PACKAGES_RH="$PACKAGES_RH libresample-devel uw-imap-devel binutils-devel libsrtp-devel gsm-devel doxygen graphviz zlib-devel openldap-devel hoard"<br>@@ -54,7 +54,7 @@<br> PACKAGES_SUSE="$PACKAGES_SUSE libedit-devel libjansson-devel libuuid-devel sqlite3-devel libxml2-devel"<br> # Asterisk: for addons:<br> PACKAGES_SUSE="$PACKAGES_SUSE speex-devel speexdsp-devel libogg-devel libvorbis-devel alsa-devel portaudio-devel libcurl-devel xmlstarlet bison flex"<br>-PACKAGES_SUSE="$PACKAGES_SUSE postgresql-devel unixODBC-devel libtool libneon-devel gmime-devel lua-devel liburiparser-devel libxslt-devel libopenssl-devel"<br>+PACKAGES_SUSE="$PACKAGES_SUSE postgresql-devel unixODBC-devel libneon-devel gmime-devel lua-devel liburiparser-devel libxslt-devel libopenssl-devel"<br> PACKAGES_SUSE="$PACKAGES_SUSE libmysqlclient-devel bluez-devel freeradius-client-devel freetds-devel bash"<br> PACKAGES_SUSE="$PACKAGES_SUSE net-snmp-devel iksemel-devel libcorosync-devel newt-devel popt-devel libical-devel spandsp-devel"<br> PACKAGES_SUSE="$PACKAGES_SUSE imap-devel libsrtp2-devel libgsm-devel doxygen graphviz zlib-devel openldap2-devel"<br>@@ -69,7 +69,7 @@<br> PACKAGES_ARCH="$PACKAGES_ARCH libedit jansson libutil-linux libxml2 sqlite"<br> # Asterisk: for addons:<br> PACKAGES_ARCH="$PACKAGES_ARCH speex speexdsp libogg libvorbis alsa-lib portaudio curl xmlstarlet bison flex"<br>-PACKAGES_ARCH="$PACKAGES_ARCH postgresql-libs unixodbc libtool neon gmime lua uriparser libxslt openssl"<br>+PACKAGES_ARCH="$PACKAGES_ARCH postgresql-libs unixodbc neon gmime lua uriparser libxslt openssl"<br> PACKAGES_ARCH="$PACKAGES_ARCH libmariadbclient bluez-libs radcli freetds bash"<br> PACKAGES_ARCH="$PACKAGES_ARCH net-snmp libnewt popt libical spandsp"<br> PACKAGES_ARCH="$PACKAGES_ARCH c-client binutils libsrtp gsm doxygen graphviz zlib libldap"<br>@@ -84,7 +84,7 @@<br> PACKAGES_NBSD="$PACKAGES_NBSD editline jansson sqlite3 libuuid libxml2"<br> # Asterisk: for addons:<br> PACKAGES_NBSD="$PACKAGES_NBSD speex speexdsp libogg libvorbis alsa-lib portaudio-devel curl bison flex"<br>-PACKAGES_NBSD="$PACKAGES_NBSD postgresql10-client unixodbc libltdl neon gmime lua52 uriparser libxslt openssl"<br>+PACKAGES_NBSD="$PACKAGES_NBSD postgresql10-client unixodbc neon gmime lua52 uriparser libxslt openssl"<br> PACKAGES_NBSD="$PACKAGES_NBSD mysql-client radiusclient-ng freetds bash"<br> PACKAGES_NBSD="$PACKAGES_NBSD net-snmp iksemel popt libical spandsp"<br> PACKAGES_NBSD="$PACKAGES_NBSD imap-uw srtp gsm doxygen graphviz libzip openldap-client"<br>@@ -99,7 +99,7 @@<br> PACKAGES_OBSD="$PACKAGES_OBSD libxml sqlite3 e2fsprogs jansson"<br> # Asterisk: for addons:<br> PACKAGES_OBSD="$PACKAGES_OBSD speex speexdsp libogg libvorbis portaudio-svn curl xmlstarlet bison"<br>-PACKAGES_OBSD="$PACKAGES_OBSD postgresql-client iodbc libltdl neon gmime lua%5.2 uriparser libxslt"<br>+PACKAGES_OBSD="$PACKAGES_OBSD postgresql-client iodbc neon gmime lua%5.2 uriparser libxslt"<br> PACKAGES_OBSD="$PACKAGES_OBSD mariadb-client radcli freetds"<br> PACKAGES_OBSD="$PACKAGES_OBSD net-snmp iksemel popt libical spandsp"<br> PACKAGES_OBSD="$PACKAGES_OBSD c-client libsrtp gsm doxygen graphviz"<br>@@ -114,7 +114,7 @@<br> PACKAGES_FBSD="$PACKAGES_FBSD libedit jansson e2fsprogs-libuuid sqlite3 libxml2"<br> # Asterisk: for addons:<br> PACKAGES_FBSD="$PACKAGES_FBSD speex speexdsp libogg libvorbis alsa-lib portaudio curl xmlstarlet bison flex"<br>-PACKAGES_FBSD="$PACKAGES_FBSD postgresql10-client unixODBC libltdl neon gmime26 lua52 uriparser libxslt openssl"<br>+PACKAGES_FBSD="$PACKAGES_FBSD postgresql10-client unixODBC neon gmime26 lua52 uriparser libxslt openssl"<br> PACKAGES_FBSD="$PACKAGES_FBSD mysql57-client radcli freetds"<br> PACKAGES_FBSD="$PACKAGES_FBSD net-snmp iksemel corosync newt popt libical spandsp"<br> PACKAGES_FBSD="$PACKAGES_FBSD cclient libbfd libsrtp gsm libilbc doxygen graphviz libzip openldap-client libhoard"<br>diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in<br>index 5c3bb67..e5cf7f9 100644<br>--- a/include/asterisk/autoconfig.h.in<br>+++ b/include/asterisk/autoconfig.h.in<br>@@ -459,9 +459,6 @@<br> than `double'. */<br> #undef HAVE_LONG_DOUBLE_WIDER<br> <br>-/* Define to 1 if you have the libtool library. */<br>-#undef HAVE_LTDL<br>-<br> /* Define to 1 if you have the Lua library. */<br> #undef HAVE_LUA<br> <br>diff --git a/res/res_odbc.c b/res/res_odbc.c<br>index 7395449..36e4829 100644<br>--- a/res/res_odbc.c<br>+++ b/res/res_odbc.c<br>@@ -42,7 +42,6 @@<br> /*** MODULEINFO<br> <depend>generic_odbc</depend><br> <depend>res_odbc_transaction</depend><br>- <depend>ltdl</depend><br> <support_level>core</support_level><br> ***/<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8558">change 8558</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/8558"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Icd315809b8e7978203431f3afb66240dd3a040ba </div>
<div style="display:none"> Gerrit-Change-Number: 8558 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>