<p>Kevin Harwell <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/12731">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">menuselect: Fix curses build on Gentoo Linux<br><br>Because keypad() is exported by libtinfo, it needs to be explicitly<br>added to the linker options.<br><br>ASTERISK-28487 #close<br><br>Change-Id: I6c2ad5b95f422c263d078b5c0e84c111807dffc6<br>---<br>M menuselect/Makefile<br>M menuselect/autoconfig.h.in<br>M menuselect/configure<br>M menuselect/configure.ac<br>M menuselect/makeopts.in<br>5 files changed, 356 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/menuselect/Makefile b/menuselect/Makefile</span><br><span>index da4a6c0..c310c18 100644</span><br><span>--- a/menuselect/Makefile</span><br><span>+++ b/menuselect/Makefile</span><br><span>@@ -38,8 +38,8 @@</span><br><span> </span><br><span> ifdef NCURSES_LIB</span><br><span> C_OBJS += menuselect_curses.o</span><br><span style="color: hsl(0, 100%, 40%);">- C_LIBS +=$(NCURSES_LIB)</span><br><span style="color: hsl(0, 100%, 40%);">- C_INCLUDE += $(NCURSES_INCLUDE)</span><br><span style="color: hsl(120, 100%, 40%);">+ C_LIBS += $(NCURSES_LIB) $(TINFO_LIB)</span><br><span style="color: hsl(120, 100%, 40%);">+ C_INCLUDE += $(NCURSES_INCLUDE) $(TINFO_INCLUDE)</span><br><span> ALL_TGTS += cmenuselect</span><br><span> CFLAGS += -DHAVE_NCURSES</span><br><span> ifeq ($(HAVE_NCURSES_SUBDIR),yes)</span><br><span>@@ -48,8 +48,8 @@</span><br><span> else</span><br><span> ifdef CURSES_LIB</span><br><span> C_OBJS += menuselect_curses.o</span><br><span style="color: hsl(0, 100%, 40%);">- C_LIBS +=$(CURSES_LIB)</span><br><span style="color: hsl(0, 100%, 40%);">- C_INCLUDE += $(CURSES_INCLUDE)</span><br><span style="color: hsl(120, 100%, 40%);">+ C_LIBS += $(CURSES_LIB) $(TINFO_LIB)</span><br><span style="color: hsl(120, 100%, 40%);">+ C_INCLUDE += $(CURSES_INCLUDE) $(TINFO_INCLUDE)</span><br><span> ALL_TGTS += cmenuselect</span><br><span> endif</span><br><span> endif</span><br><span>diff --git a/menuselect/autoconfig.h.in b/menuselect/autoconfig.h.in</span><br><span>index f174551..8047d7a 100644</span><br><span>--- a/menuselect/autoconfig.h.in</span><br><span>+++ b/menuselect/autoconfig.h.in</span><br><span>@@ -79,6 +79,9 @@</span><br><span> /* Define to 1 if you have the <sys/types.h> header file. */</span><br><span> #undef HAVE_SYS_TYPES_H</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Define to 1 if you have the terminfo library. */</span><br><span style="color: hsl(120, 100%, 40%);">+#undef HAVE_TINFO</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Define to 1 if you have the <unistd.h> header file. */</span><br><span> #undef HAVE_UNISTD_H</span><br><span> </span><br><span>diff --git a/menuselect/configure b/menuselect/configure</span><br><span>index fd7d24b..9986b4f 100755</span><br><span>--- a/menuselect/configure</span><br><span>+++ b/menuselect/configure</span><br><span>@@ -635,6 +635,10 @@</span><br><span> CONFIG_LIBXML2</span><br><span> SED</span><br><span> HAVE_NCURSES_SUBDIR</span><br><span style="color: hsl(120, 100%, 40%);">+PBX_TINFO</span><br><span style="color: hsl(120, 100%, 40%);">+TINFO_DIR</span><br><span style="color: hsl(120, 100%, 40%);">+TINFO_INCLUDE</span><br><span style="color: hsl(120, 100%, 40%);">+TINFO_LIB</span><br><span> PBX_LIBXML2</span><br><span> LIBXML2_DIR</span><br><span> LIBXML2_INCLUDE</span><br><span>@@ -720,6 +724,7 @@</span><br><span> with_curses</span><br><span> with_ncurses</span><br><span> with_libxml2</span><br><span style="color: hsl(120, 100%, 40%);">+with_libtinfo</span><br><span> '</span><br><span> ac_precious_vars='build_alias</span><br><span> host_alias</span><br><span>@@ -1366,6 +1371,7 @@</span><br><span> --with-curses=PATH use curses files in PATH</span><br><span> --with-ncurses=PATH use ncurses files in PATH</span><br><span> --with-libxml2=PATH use LibXML2 files in PATH</span><br><span style="color: hsl(120, 100%, 40%);">+ --with-libtinfo=PATH use terminfo files in PATH</span><br><span> </span><br><span> Some influential environment variables:</span><br><span> CC C compiler command</span><br><span>@@ -3928,6 +3934,38 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_DESCRIP="terminfo"</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_OPTION="libtinfo"</span><br><span style="color: hsl(120, 100%, 40%);">+ PBX_TINFO=0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Check whether --with-libtinfo was given.</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${with_libtinfo+set}" = set; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ withval=$with_libtinfo;</span><br><span style="color: hsl(120, 100%, 40%);">+ case ${withval} in</span><br><span style="color: hsl(120, 100%, 40%);">+ n|no)</span><br><span style="color: hsl(120, 100%, 40%);">+ USE_TINFO=no</span><br><span style="color: hsl(120, 100%, 40%);">+ # -1 is a magic value used by menuselect to know that the package</span><br><span style="color: hsl(120, 100%, 40%);">+ # was disabled, other than 'not found'</span><br><span style="color: hsl(120, 100%, 40%);">+ PBX_TINFO=-1</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ y|ye|yes)</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_mandatory_list="${ac_mandatory_list} TINFO"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *)</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_DIR="${withval}"</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_mandatory_list="${ac_mandatory_list} TINFO"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> if test "x${PBX_NEWT}" != "x1" -a "${USE_NEWT}" != "no"; then</span><br><span> pbxlibdir=""</span><br><span>@@ -4320,6 +4358,302 @@</span><br><span> fi</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${PBX_NCURSES}" = 1; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${HAVE_NCURSES_SUBDIR}" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${PBX_TINFO}" != "x1" -a "${USE_TINFO}" != "no"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pbxlibdir=""</span><br><span style="color: hsl(120, 100%, 40%);">+ # if --with-TINFO=DIR has been specified, use it.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${TINFO_DIR}" != "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test -d ${TINFO_DIR}/lib; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pbxlibdir="-L${TINFO_DIR}/lib"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ pbxlibdir="-L${TINFO_DIR}"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_ext_lib_check_save_CFLAGS="${CFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="${CFLAGS} "</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keypad in -ltinfo" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for keypad in -ltinfo... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+if ${ac_cv_lib_tinfo_keypad+:} false; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ $as_echo_n "(cached) " >&6</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_check_lib_save_LIBS=$LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+LIBS="-ltinfo ${pbxlibdir} $LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext</span><br><span style="color: hsl(120, 100%, 40%);">+/* end confdefs.h. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Override any GCC internal prototype to avoid an error.</span><br><span style="color: hsl(120, 100%, 40%);">+ Use char because int might match the return type of a GCC</span><br><span style="color: hsl(120, 100%, 40%);">+ builtin and then its argument prototype would still apply. */</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __cplusplus</span><br><span style="color: hsl(120, 100%, 40%);">+extern "C"</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+char keypad ();</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+main ()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+return keypad ();</span><br><span style="color: hsl(120, 100%, 40%);">+ ;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+if ac_fn_c_try_link "$LINENO"; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_cv_lib_tinfo_keypad=yes</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_cv_lib_tinfo_keypad=no</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+rm -f core conftest.err conftest.$ac_objext \</span><br><span style="color: hsl(120, 100%, 40%);">+ conftest$ac_exeext conftest.$ac_ext</span><br><span style="color: hsl(120, 100%, 40%);">+LIBS=$ac_check_lib_save_LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo "$ac_cv_lib_tinfo_keypad" >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ac_cv_lib_tinfo_keypad" = xyes; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TINFO_FOUND=yes</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TINFO_FOUND=no</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="${ast_ext_lib_check_save_CFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # now check for the header.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${AST_TINFO_FOUND}" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_LIB="${pbxlibdir} -ltinfo "</span><br><span style="color: hsl(120, 100%, 40%);">+ # if --with-TINFO=DIR has been specified, use it.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${TINFO_DIR}" != "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_INCLUDE="-I${TINFO_DIR}/include"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_INCLUDE="${TINFO_INCLUDE} "</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # check for the header</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+ CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}"</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_fn_c_check_header_mongrel "$LINENO" "ncurses/ncurses.h" "ac_cv_header_ncurses_ncurses_h" "$ac_includes_default"</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ac_cv_header_ncurses_ncurses_h" = xyes; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_HEADER_FOUND=1</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_HEADER_FOUND=0</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${TINFO_HEADER_FOUND}" = "x0" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_LIB=""</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_INCLUDE=""</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PBX_TINFO=1</span><br><span style="color: hsl(120, 100%, 40%);">+ cat >>confdefs.h <<_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_TINFO 1</span><br><span style="color: hsl(120, 100%, 40%);">+_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${PBX_TINFO}" != "x1" -a "${USE_TINFO}" != "no"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pbxlibdir=""</span><br><span style="color: hsl(120, 100%, 40%);">+ # if --with-TINFO=DIR has been specified, use it.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${TINFO_DIR}" != "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test -d ${TINFO_DIR}/lib; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pbxlibdir="-L${TINFO_DIR}/lib"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ pbxlibdir="-L${TINFO_DIR}"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_ext_lib_check_save_CFLAGS="${CFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="${CFLAGS} "</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keypad in -ltinfo" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for keypad in -ltinfo... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+if ${ac_cv_lib_tinfo_keypad+:} false; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ $as_echo_n "(cached) " >&6</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_check_lib_save_LIBS=$LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+LIBS="-ltinfo ${pbxlibdir} $LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext</span><br><span style="color: hsl(120, 100%, 40%);">+/* end confdefs.h. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Override any GCC internal prototype to avoid an error.</span><br><span style="color: hsl(120, 100%, 40%);">+ Use char because int might match the return type of a GCC</span><br><span style="color: hsl(120, 100%, 40%);">+ builtin and then its argument prototype would still apply. */</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __cplusplus</span><br><span style="color: hsl(120, 100%, 40%);">+extern "C"</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+char keypad ();</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+main ()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+return keypad ();</span><br><span style="color: hsl(120, 100%, 40%);">+ ;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+if ac_fn_c_try_link "$LINENO"; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_cv_lib_tinfo_keypad=yes</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_cv_lib_tinfo_keypad=no</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+rm -f core conftest.err conftest.$ac_objext \</span><br><span style="color: hsl(120, 100%, 40%);">+ conftest$ac_exeext conftest.$ac_ext</span><br><span style="color: hsl(120, 100%, 40%);">+LIBS=$ac_check_lib_save_LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo "$ac_cv_lib_tinfo_keypad" >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ac_cv_lib_tinfo_keypad" = xyes; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TINFO_FOUND=yes</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TINFO_FOUND=no</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="${ast_ext_lib_check_save_CFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # now check for the header.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${AST_TINFO_FOUND}" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_LIB="${pbxlibdir} -ltinfo "</span><br><span style="color: hsl(120, 100%, 40%);">+ # if --with-TINFO=DIR has been specified, use it.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${TINFO_DIR}" != "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_INCLUDE="-I${TINFO_DIR}/include"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_INCLUDE="${TINFO_INCLUDE} "</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # check for the header</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+ CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}"</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ac_cv_header_ncurses_h" = xyes; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_HEADER_FOUND=1</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_HEADER_FOUND=0</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${TINFO_HEADER_FOUND}" = "x0" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_LIB=""</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_INCLUDE=""</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PBX_TINFO=1</span><br><span style="color: hsl(120, 100%, 40%);">+ cat >>confdefs.h <<_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_TINFO 1</span><br><span style="color: hsl(120, 100%, 40%);">+_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${PBX_TINFO}" != "x1" -a "${USE_TINFO}" != "no"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pbxlibdir=""</span><br><span style="color: hsl(120, 100%, 40%);">+ # if --with-TINFO=DIR has been specified, use it.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${TINFO_DIR}" != "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test -d ${TINFO_DIR}/lib; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pbxlibdir="-L${TINFO_DIR}/lib"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ pbxlibdir="-L${TINFO_DIR}"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_ext_lib_check_save_CFLAGS="${CFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="${CFLAGS} "</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keypad in -ltinfo" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for keypad in -ltinfo... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+if ${ac_cv_lib_tinfo_keypad+:} false; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ $as_echo_n "(cached) " >&6</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_check_lib_save_LIBS=$LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+LIBS="-ltinfo ${pbxlibdir} $LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext</span><br><span style="color: hsl(120, 100%, 40%);">+/* end confdefs.h. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Override any GCC internal prototype to avoid an error.</span><br><span style="color: hsl(120, 100%, 40%);">+ Use char because int might match the return type of a GCC</span><br><span style="color: hsl(120, 100%, 40%);">+ builtin and then its argument prototype would still apply. */</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __cplusplus</span><br><span style="color: hsl(120, 100%, 40%);">+extern "C"</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+char keypad ();</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+main ()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+return keypad ();</span><br><span style="color: hsl(120, 100%, 40%);">+ ;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+if ac_fn_c_try_link "$LINENO"; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_cv_lib_tinfo_keypad=yes</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_cv_lib_tinfo_keypad=no</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+rm -f core conftest.err conftest.$ac_objext \</span><br><span style="color: hsl(120, 100%, 40%);">+ conftest$ac_exeext conftest.$ac_ext</span><br><span style="color: hsl(120, 100%, 40%);">+LIBS=$ac_check_lib_save_LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo "$ac_cv_lib_tinfo_keypad" >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ac_cv_lib_tinfo_keypad" = xyes; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TINFO_FOUND=yes</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TINFO_FOUND=no</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="${ast_ext_lib_check_save_CFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # now check for the header.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${AST_TINFO_FOUND}" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_LIB="${pbxlibdir} -ltinfo "</span><br><span style="color: hsl(120, 100%, 40%);">+ # if --with-TINFO=DIR has been specified, use it.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${TINFO_DIR}" != "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_INCLUDE="-I${TINFO_DIR}/include"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_INCLUDE="${TINFO_INCLUDE} "</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # check for the header</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+ CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}"</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ac_cv_header_curses_h" = xyes; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_HEADER_FOUND=1</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_HEADER_FOUND=0</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${TINFO_HEADER_FOUND}" = "x0" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_LIB=""</span><br><span style="color: hsl(120, 100%, 40%);">+ TINFO_INCLUDE=""</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PBX_TINFO=1</span><br><span style="color: hsl(120, 100%, 40%);">+ cat >>confdefs.h <<_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_TINFO 1</span><br><span style="color: hsl(120, 100%, 40%);">+_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5</span><br><span> $as_echo_n "checking for a sed that does not truncate output... " >&6; }</span><br><span> if ${ac_cv_path_SED+:} false; then :</span><br><span>diff --git a/menuselect/configure.ac b/menuselect/configure.ac</span><br><span>index e2ae2cb..4629d52 100644</span><br><span>--- a/menuselect/configure.ac</span><br><span>+++ b/menuselect/configure.ac</span><br><span>@@ -65,6 +65,7 @@</span><br><span> AST_EXT_LIB_SETUP([CURSES], [curses], [curses])</span><br><span> AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])</span><br><span> AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])</span><br><span style="color: hsl(120, 100%, 40%);">+AST_EXT_LIB_SETUP([TINFO], [terminfo], [libtinfo])</span><br><span> </span><br><span> AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])</span><br><span> AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [ncurses.h])</span><br><span>@@ -78,6 +79,17 @@</span><br><span> fi</span><br><span> fi</span><br><span> AC_SUBST(HAVE_NCURSES_SUBDIR)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${PBX_NCURSES}" = 1; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${HAVE_NCURSES_SUBDIR}" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_EXT_LIB_CHECK([TINFO], [tinfo], [keypad], [ncurses/ncurses.h])</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_EXT_LIB_CHECK([TINFO], [tinfo], [keypad], [ncurses.h])</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_EXT_LIB_CHECK([TINFO], [tinfo], [keypad], [curses.h])</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,</span><br><span> [#include <libxml/tree.h></span><br><span> #include <libxml/parser.h>],</span><br><span>diff --git a/menuselect/makeopts.in b/menuselect/makeopts.in</span><br><span>index efafbab..fa2e8dd 100644</span><br><span>--- a/menuselect/makeopts.in</span><br><span>+++ b/menuselect/makeopts.in</span><br><span>@@ -19,6 +19,9 @@</span><br><span> NCURSES_LIB=@NCURSES_LIB@</span><br><span> HAVE_NCURSES_SUBDIR=@HAVE_NCURSES_SUBDIR@</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+TINFO_INCLUDE=@TINFO_INCLUDE@</span><br><span style="color: hsl(120, 100%, 40%);">+TINFO_LIB=@TINFO_LIB@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> NEWT_INCLUDE=@NEWT_INCLUDE@</span><br><span> NEWT_LIB=@NEWT_LIB@</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/12731">change 12731</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/12731"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I6c2ad5b95f422c263d078b5c0e84c111807dffc6 </div>
<div style="display:none"> Gerrit-Change-Number: 12731 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>