<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8720">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;">Build System: Fixes for configure script.<br><br>* Replace all 'else if' statements with 'elif'.<br>* Use loop to detect versioned lua headers and libraries.<br><br>The loop for detecting lua fixes a bug where LUA_INCLUDE would be<br>appended with the directory of every lua version after the first one is<br>found.<br><br>Change-Id: I3276f9aee955014108345be6092f51c932b43a0f<br>---<br>M configure<br>M configure.ac<br>2 files changed, 51 insertions(+), 274 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 8d04169..03197cd 100755<br>--- a/configure<br>+++ b/configure<br>@@ -7774,7 +7774,7 @@<br> DOWNLOAD=${WGET}<br> DOWNLOAD_TO_STDOUT="${WGET} -q -O-"<br> DOWNLOAD_TIMEOUT='--timeout=$1'<br>-else if test "${CURL}" != ":" ; then<br>+elif test "${CURL}" != ":" ; then<br> DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""<br> DOWNLOAD_TO_STDOUT="${CURL} -Ls"<br> DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'<br>@@ -7825,7 +7825,6 @@<br> DOWNLOAD_TO_STDOUT="${FETCH} -o-"<br> DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'<br> fi<br>-fi<br> fi<br> <br> <br>@@ -19444,15 +19443,15 @@<br> <br> $as_echo "#define TYPEOF_FD_SET_FDS_BITS int" >>confdefs.h<br> <br>-else if test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then<br>+elif test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then<br> <br> $as_echo "#define TYPEOF_FD_SET_FDS_BITS long" >>confdefs.h<br> <br>-else if test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then<br>+elif test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then<br> <br> $as_echo "#define TYPEOF_FD_SET_FDS_BITS long long" >>confdefs.h<br> <br>-fi ; fi ; fi<br>+fi<br> <br> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in dlfcn.h" >&5<br> $as_echo_n "checking for dladdr in dlfcn.h... " >&6; }<br>@@ -20614,15 +20613,13 @@<br> _ACEOF<br> <br> GSM_OK=1<br>- else<br>- if test "${GSM_GSM_HEADER_FOUND}" = "1" ; then<br>+ elif test "${GSM_GSM_HEADER_FOUND}" = "1" ; then<br> <br> cat >>confdefs.h <<_ACEOF<br> #define HAVE_GSM_GSM_HEADER 1<br> _ACEOF<br> <br>- GSM_OK=1<br>- fi<br>+ GSM_OK=1<br> fi<br> if test "${GSM_OK}" = "1" ; then<br> GSM_LIB="-lgsm"<br>@@ -28702,6 +28699,7 @@<br> <br> <br> <br>+for ver in 5.3 5.2 5.1; do<br> <br> if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then<br> pbxlibdir=""<br>@@ -28716,13 +28714,14 @@<br> <br> ast_ext_lib_check_save_CFLAGS="${CFLAGS}"<br> CFLAGS="${CFLAGS} "<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.3" >&5<br>-$as_echo_n "checking for luaL_newstate in -llua5.3... " >&6; }<br>-if ${ac_cv_lib_lua5_3_luaL_newstate+:} false; then :<br>+ as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`<br>+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5<br>+$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; }<br>+if eval \${$as_ac_Lib+:} false; then :<br> $as_echo_n "(cached) " >&6<br> else<br> ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-llua5.3 ${pbxlibdir} -lm $LIBS"<br>+LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS"<br> cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br> /* end confdefs.h. */<br> <br>@@ -28742,17 +28741,18 @@<br> }<br> _ACEOF<br> if ac_fn_c_try_link "$LINENO"; then :<br>- ac_cv_lib_lua5_3_luaL_newstate=yes<br>+ eval "$as_ac_Lib=yes"<br> else<br>- ac_cv_lib_lua5_3_luaL_newstate=no<br>+ eval "$as_ac_Lib=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_lua5_3_luaL_newstate" >&5<br>-$as_echo "$ac_cv_lib_lua5_3_luaL_newstate" >&6; }<br>-if test "x$ac_cv_lib_lua5_3_luaL_newstate" = xyes; then :<br>+eval ac_res=\$$as_ac_Lib<br>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5<br>+$as_echo "$ac_res" >&6; }<br>+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :<br> AST_LUA_FOUND=yes<br> else<br> AST_LUA_FOUND=no<br>@@ -28763,7 +28763,7 @@<br> <br> # now check for the header.<br> if test "${AST_LUA_FOUND}" = "yes"; then<br>- LUA_LIB="${pbxlibdir} -llua5.3 -lm"<br>+ LUA_LIB="${pbxlibdir} -llua${ver} -lm"<br> # if --with-LUA=DIR has been specified, use it.<br> if test "x${LUA_DIR}" != "x"; then<br> LUA_INCLUDE="-I${LUA_DIR}/include"<br>@@ -28773,8 +28773,9 @@<br> # check for the header<br> ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"<br> CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"<br>- ac_fn_c_check_header_mongrel "$LINENO" "lua5.3/lua.h" "ac_cv_header_lua5_3_lua_h" "$ac_includes_default"<br>-if test "x$ac_cv_header_lua5_3_lua_h" = xyes; then :<br>+ as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`<br>+ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"<br>+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :<br> LUA_HEADER_FOUND=1<br> else<br> LUA_HEADER_FOUND=0<br>@@ -28798,221 +28799,15 @@<br> fi<br> <br> <br>-if test "x${PBX_LUA}" = "x1" ; then<br>- if test x"${LUA_DIR}" = x; then<br>- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.3"<br>- else<br>- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.3"<br>+ if test "x${PBX_LUA}" = "x1" ; then<br>+ if test x"${LUA_DIR}" = x; then<br>+ LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}"<br>+ else<br>+ LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}"<br>+ fi<br>+ break;<br> fi<br>-fi<br>-<br>-<br>-if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then<br>- pbxlibdir=""<br>- # if --with-LUA=DIR has been specified, use it.<br>- if test "x${LUA_DIR}" != "x"; then<br>- if test -d ${LUA_DIR}/lib; then<br>- pbxlibdir="-L${LUA_DIR}/lib"<br>- else<br>- pbxlibdir="-L${LUA_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 luaL_newstate in -llua5.2" >&5<br>-$as_echo_n "checking for luaL_newstate in -llua5.2... " >&6; }<br>-if ${ac_cv_lib_lua5_2_luaL_newstate+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-else<br>- ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-llua5.2 ${pbxlibdir} -lm $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 luaL_newstate ();<br>-int<br>-main ()<br>-{<br>-return luaL_newstate ();<br>- ;<br>- return 0;<br>-}<br>-_ACEOF<br>-if ac_fn_c_try_link "$LINENO"; then :<br>- ac_cv_lib_lua5_2_luaL_newstate=yes<br>-else<br>- ac_cv_lib_lua5_2_luaL_newstate=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_lua5_2_luaL_newstate" >&5<br>-$as_echo "$ac_cv_lib_lua5_2_luaL_newstate" >&6; }<br>-if test "x$ac_cv_lib_lua5_2_luaL_newstate" = xyes; then :<br>- AST_LUA_FOUND=yes<br>-else<br>- AST_LUA_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_LUA_FOUND}" = "yes"; then<br>- LUA_LIB="${pbxlibdir} -llua5.2 -lm"<br>- # if --with-LUA=DIR has been specified, use it.<br>- if test "x${LUA_DIR}" != "x"; then<br>- LUA_INCLUDE="-I${LUA_DIR}/include"<br>- fi<br>- LUA_INCLUDE="${LUA_INCLUDE} "<br>-<br>- # check for the header<br>- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"<br>- ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"<br>-if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :<br>- LUA_HEADER_FOUND=1<br>-else<br>- LUA_HEADER_FOUND=0<br>-fi<br>-<br>-<br>- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"<br>-<br>- if test "x${LUA_HEADER_FOUND}" = "x0" ; then<br>- LUA_LIB=""<br>- LUA_INCLUDE=""<br>- else<br>-<br>- PBX_LUA=1<br>- cat >>confdefs.h <<_ACEOF<br>-#define HAVE_LUA 1<br>-_ACEOF<br>-<br>- fi<br>- fi<br>-fi<br>-<br>-<br>-if test "x${PBX_LUA}" = "x1" ; then<br>- if test x"${LUA_DIR}" = x; then<br>- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.2"<br>- else<br>- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.2"<br>- fi<br>-fi<br>-<br>-<br>-if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then<br>- pbxlibdir=""<br>- # if --with-LUA=DIR has been specified, use it.<br>- if test "x${LUA_DIR}" != "x"; then<br>- if test -d ${LUA_DIR}/lib; then<br>- pbxlibdir="-L${LUA_DIR}/lib"<br>- else<br>- pbxlibdir="-L${LUA_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 luaL_newstate in -llua5.1" >&5<br>-$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; }<br>-if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-else<br>- ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-llua5.1 ${pbxlibdir} -lm $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 luaL_newstate ();<br>-int<br>-main ()<br>-{<br>-return luaL_newstate ();<br>- ;<br>- return 0;<br>-}<br>-_ACEOF<br>-if ac_fn_c_try_link "$LINENO"; then :<br>- ac_cv_lib_lua5_1_luaL_newstate=yes<br>-else<br>- ac_cv_lib_lua5_1_luaL_newstate=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_lua5_1_luaL_newstate" >&5<br>-$as_echo "$ac_cv_lib_lua5_1_luaL_newstate" >&6; }<br>-if test "x$ac_cv_lib_lua5_1_luaL_newstate" = xyes; then :<br>- AST_LUA_FOUND=yes<br>-else<br>- AST_LUA_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_LUA_FOUND}" = "yes"; then<br>- LUA_LIB="${pbxlibdir} -llua5.1 -lm"<br>- # if --with-LUA=DIR has been specified, use it.<br>- if test "x${LUA_DIR}" != "x"; then<br>- LUA_INCLUDE="-I${LUA_DIR}/include"<br>- fi<br>- LUA_INCLUDE="${LUA_INCLUDE} "<br>-<br>- # check for the header<br>- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"<br>- ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"<br>-if test "x$ac_cv_header_lua5_1_lua_h" = xyes; then :<br>- LUA_HEADER_FOUND=1<br>-else<br>- LUA_HEADER_FOUND=0<br>-fi<br>-<br>-<br>- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"<br>-<br>- if test "x${LUA_HEADER_FOUND}" = "x0" ; then<br>- LUA_LIB=""<br>- LUA_INCLUDE=""<br>- else<br>-<br>- PBX_LUA=1<br>- cat >>confdefs.h <<_ACEOF<br>-#define HAVE_LUA 1<br>-_ACEOF<br>-<br>- fi<br>- fi<br>-fi<br>-<br>-<br>-if test "x${PBX_LUA}" = "x1" ; then<br>- if test x"${LUA_DIR}" = x; then<br>- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"<br>- else<br>- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"<br>- fi<br>-fi<br>+done<br> <br> # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.<br> <br>@@ -34831,9 +34626,9 @@<br> ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2<br> if test "x${ac_cv_path_CMP}" = "x:"; then<br> ( cd `pwd`/menuselect && ./configure )<br>-else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else<br>+elif ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else<br> ( cd `pwd`/menuselect && ./configure )<br>-fi ; fi<br>+fi<br> <br> rm makeopts.acbak makeopts.acbak2<br> <br>diff --git a/configure.ac b/configure.ac<br>index 524a6b3..9a026af 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -294,7 +294,7 @@<br> DOWNLOAD=${WGET}<br> DOWNLOAD_TO_STDOUT="${WGET} -q -O-"<br> DOWNLOAD_TIMEOUT='--timeout=$1'<br>-else if test "${CURL}" != ":" ; then<br>+elif test "${CURL}" != ":" ; then<br> DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""<br> DOWNLOAD_TO_STDOUT="${CURL} -Ls"<br> DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'<br>@@ -305,7 +305,6 @@<br> DOWNLOAD_TO_STDOUT="${FETCH} -o-"<br> DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'<br> fi<br>-fi<br> fi<br> AC_SUBST(DOWNLOAD)<br> AC_SUBST(DOWNLOAD_TO_STDOUT)<br>@@ -1430,11 +1429,11 @@<br> # correctly if the size is wrong.<br> if test $ac_cv_sizeof_int = $ac_cv_sizeof_fd_set_fds_bits; then<br> AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [int], [Define to a type of the same size as fd_set.fds_bits[[0]]])<br>-else if test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then<br>+elif test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then<br> AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long], [Define to a type of the same size as fd_set.fds_bits[[0]]])<br>-else if test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then<br>+elif test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then<br> AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long long], [Define to a type of the same size as fd_set.fds_bits[[0]]])<br>-fi ; fi ; fi<br>+fi<br> <br> AC_MSG_CHECKING(for dladdr in dlfcn.h)<br> PBX_DLADDR=0<br>@@ -1544,11 +1543,9 @@<br> if test "${GSM_HEADER_FOUND}" = "1" ; then<br> AC_DEFINE_UNQUOTED([HAVE_GSM_HEADER], 1, [Define to indicate that gsm.h has no prefix for its location])<br> GSM_OK=1<br>- else<br>- if test "${GSM_GSM_HEADER_FOUND}" = "1" ; then<br>- AC_DEFINE_UNQUOTED([HAVE_GSM_GSM_HEADER], 1, [Define to indicate that gsm.h is in gsm/gsm.h])<br>- GSM_OK=1<br>- fi<br>+ elif test "${GSM_GSM_HEADER_FOUND}" = "1" ; then<br>+ AC_DEFINE_UNQUOTED([HAVE_GSM_GSM_HEADER], 1, [Define to indicate that gsm.h is in gsm/gsm.h])<br>+ GSM_OK=1<br> fi<br> if test "${GSM_OK}" = "1" ; then<br> GSM_LIB="-lgsm"<br>@@ -2345,32 +2342,17 @@<br> fi<br> AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])<br> <br>-AST_EXT_LIB_CHECK([LUA], [lua5.3], [luaL_newstate], [lua5.3/lua.h], [-lm])<br>-if test "x${PBX_LUA}" = "x1" ; then<br>- if test x"${LUA_DIR}" = x; then<br>- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.3"<br>- else<br>- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.3"<br>+for ver in 5.3 5.2 5.1; do<br>+ AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])<br>+ if test "x${PBX_LUA}" = "x1" ; then<br>+ if test x"${LUA_DIR}" = x; then<br>+ LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}"<br>+ else<br>+ LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}"<br>+ fi<br>+ break;<br> fi<br>-fi<br>-<br>-AST_EXT_LIB_CHECK([LUA], [lua5.2], [luaL_newstate], [lua5.2/lua.h], [-lm])<br>-if test "x${PBX_LUA}" = "x1" ; then<br>- if test x"${LUA_DIR}" = x; then<br>- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.2"<br>- else<br>- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.2"<br>- fi<br>-fi<br>-<br>-AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h], [-lm])<br>-if test "x${PBX_LUA}" = "x1" ; then<br>- if test x"${LUA_DIR}" = x; then<br>- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"<br>- else<br>- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"<br>- fi<br>-fi<br>+done<br> <br> # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.<br> AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm])<br>@@ -2702,9 +2684,9 @@<br> ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2<br> if test "x${ac_cv_path_CMP}" = "x:"; then<br> ( cd `pwd`/menuselect && ./configure )<br>-else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else<br>+elif ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else<br> ( cd `pwd`/menuselect && ./configure )<br>-fi ; fi<br>+fi<br> <br> rm makeopts.acbak makeopts.acbak2<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8720">change 8720</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/8720"/><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: I3276f9aee955014108345be6092f51c932b43a0f </div>
<div style="display:none"> Gerrit-Change-Number: 8720 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.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>