<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9769">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Corey Farrell: 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: Enable Jansson in Solaris 11.<br><br>In Solaris, the header <jansson.h> is in /usr/include/jansson. To find<br>Jansson even in such a subdirectory, the tool pkg-config is queried via<br>AST_PKG_CONFIG_CHECK. For those platforms, which do not list Jansson via<br>pkg-config, the previous check remains and is executed thereafter.<br><br>Because the check for the NetBSD Editline library uses the tool pkg-config<br>conditionally PKG_PROG_PKG_CONFIG must be used. Because that check happens<br>earlier than Jansson, it must be placed in front of that.<br><br>The script configure does some pre-checks for the script configure of the<br>Asterisk internal NetBSD Editline library. The check for the library ncurses<br>should use not use the header <curses.h> but <ncurses.h>, because on some<br>platforms <curses.h> is not a drop-in replacement for <ncurses.h>: For example<br>in Solaris, the symbol initscr is a typedef in <curses.h> to a symbol which<br>does not exist in the library ncurses (initscr32). Simply use <ncurses.h> when<br>you link to ncurses.<br><br>ASTERISK-27991<br><br>Change-Id: I69ea0f379f87a50049654b2487c76ee1c04fa53a<br>---<br>M configure<br>M configure.ac<br>M include/asterisk/autoconfig.h.in<br>3 files changed, 117 insertions(+), 142 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index 8c7e9a7..3dc390b 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -704,15 +704,17 @@</span><br><span> LIBOBJS</span><br><span> DISABLE_XMLDOC</span><br><span> CONFIG_LIBXML2</span><br><span style="color: hsl(120, 100%, 40%);">+JANSSON_LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+JANSSON_CFLAGS</span><br><span> UUID_LIB</span><br><span> UUID_INCLUDE</span><br><span> EDITLINE_LIB</span><br><span> LIBEDIT_LIBS</span><br><span> LIBEDIT_CFLAGS</span><br><span style="color: hsl(120, 100%, 40%);">+LIBEDIT_INTERNAL</span><br><span> PKG_CONFIG_LIBDIR</span><br><span> PKG_CONFIG_PATH</span><br><span> PKG_CONFIG</span><br><span style="color: hsl(0, 100%, 40%);">-LIBEDIT_INTERNAL</span><br><span> ALLOCA</span><br><span> PBX_ZLIB</span><br><span> ZLIB_DIR</span><br><span>@@ -1475,6 +1477,8 @@</span><br><span> PKG_CONFIG_LIBDIR</span><br><span> LIBEDIT_CFLAGS</span><br><span> LIBEDIT_LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+JANSSON_CFLAGS</span><br><span style="color: hsl(120, 100%, 40%);">+JANSSON_LIBS</span><br><span> ILBC_CFLAGS</span><br><span> ILBC_LIBS</span><br><span> PJPROJECT_CFLAGS</span><br><span>@@ -2234,6 +2238,10 @@</span><br><span> C compiler flags for LIBEDIT, overriding pkg-config</span><br><span> LIBEDIT_LIBS</span><br><span> linker flags for LIBEDIT, overriding pkg-config</span><br><span style="color: hsl(120, 100%, 40%);">+ JANSSON_CFLAGS</span><br><span style="color: hsl(120, 100%, 40%);">+ C compiler flags for JANSSON, overriding pkg-config</span><br><span style="color: hsl(120, 100%, 40%);">+ JANSSON_LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+ linker flags for JANSSON, overriding pkg-config</span><br><span> ILBC_CFLAGS C compiler flags for ILBC, overriding pkg-config</span><br><span> ILBC_LIBS linker flags for ILBC, overriding pkg-config</span><br><span> PJPROJECT_CFLAGS</span><br><span>@@ -13467,18 +13475,6 @@</span><br><span> done</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Find required NetBSD Editline library (libedit).</span><br><span style="color: hsl(0, 100%, 40%);">-EDITLINE_LIB=""</span><br><span style="color: hsl(0, 100%, 40%);">-LIBEDIT_INTERNAL="yes"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-LIBEDIT_SYSTEM="yes"</span><br><span style="color: hsl(0, 100%, 40%);">-if test "${USE_LIBEDIT}" != "no"; then</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${LIBEDIT_DIR}" = "internal"; then</span><br><span style="color: hsl(0, 100%, 40%);">- LIBEDIT_SYSTEM="no"</span><br><span style="color: hsl(0, 100%, 40%);">- elif test "${LIBEDIT_DIR}" != ""; then</span><br><span style="color: hsl(0, 100%, 40%);">- LIBEDIT_INTERNAL="no"</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${LIBEDIT_SYSTEM}" = "yes"; then</span><br><span> </span><br><span> </span><br><span> </span><br><span>@@ -13600,6 +13596,19 @@</span><br><span> fi</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Find required NetBSD Editline library (libedit).</span><br><span style="color: hsl(120, 100%, 40%);">+EDITLINE_LIB=""</span><br><span style="color: hsl(120, 100%, 40%);">+LIBEDIT_INTERNAL="yes"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+LIBEDIT_SYSTEM="yes"</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${USE_LIBEDIT}" != "no"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${LIBEDIT_DIR}" = "internal"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ LIBEDIT_SYSTEM="no"</span><br><span style="color: hsl(120, 100%, 40%);">+ elif test "${LIBEDIT_DIR}" != ""; then</span><br><span style="color: hsl(120, 100%, 40%);">+ LIBEDIT_INTERNAL="no"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${LIBEDIT_SYSTEM}" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span>@@ -14186,8 +14195,8 @@</span><br><span> # check for the header</span><br><span> ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"</span><br><span> CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}"</span><br><span style="color: hsl(0, 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(0, 100%, 40%);">-if test "x$ac_cv_header_curses_h" = xyes; then :</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> NCURSES_HEADER_FOUND=1</span><br><span> else</span><br><span> NCURSES_HEADER_FOUND=0</span><br><span>@@ -14453,6 +14462,94 @@</span><br><span> # Find required JSON support if bundled is not enabled.</span><br><span> if test "$JANSSON_BUNDLED" = "no" ; then</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+pkg_failed=no</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for JANSSON... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test -n "$JANSSON_CFLAGS"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ elif test -n "$PKG_CONFIG"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test -n "$PKG_CONFIG" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ ($PKG_CONFIG --exists --print-errors "jansson") 2>&5</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_status=$?</span><br><span style="color: hsl(120, 100%, 40%);">+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ test $ac_status = 0; }; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson" 2>/dev/null`</span><br><span style="color: hsl(120, 100%, 40%);">+ test "x$?" != "x0" && pkg_failed=yes</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ pkg_failed=yes</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%);">+ pkg_failed=untried</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+if test -n "$JANSSON_LIBS"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pkg_cv_JANSSON_LIBS="$JANSSON_LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+ elif test -n "$PKG_CONFIG"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test -n "$PKG_CONFIG" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ ($PKG_CONFIG --exists --print-errors "jansson") 2>&5</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_status=$?</span><br><span style="color: hsl(120, 100%, 40%);">+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ test $ac_status = 0; }; then</span><br><span style="color: hsl(120, 100%, 40%);">+ pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson" 2>/dev/null`</span><br><span style="color: hsl(120, 100%, 40%);">+ test "x$?" != "x0" && pkg_failed=yes</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ pkg_failed=yes</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%);">+ pkg_failed=untried</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%);">+if test $pkg_failed = yes; then</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo "no" >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span style="color: hsl(120, 100%, 40%);">+ _pkg_short_errors_supported=yes</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ _pkg_short_errors_supported=no</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test $_pkg_short_errors_supported = yes; then</span><br><span style="color: hsl(120, 100%, 40%);">+ JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson" 2>&1`</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson" 2>&1`</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ # Put the nasty error message in config.log where it belongs</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$JANSSON_PKG_ERRORS" >&5</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%);">+ PBX_JANSSON=0</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%);">+elif test $pkg_failed = untried; then</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo "no" >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PBX_JANSSON=0</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%);">+ JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS</span><br><span style="color: hsl(120, 100%, 40%);">+ JANSSON_LIBS=$pkg_cv_JANSSON_LIBS</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo "yes" >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PBX_JANSSON=1</span><br><span style="color: hsl(120, 100%, 40%);">+ JANSSON_INCLUDE=$(echo ${JANSSON_CFLAGS} | $SED -e "s|-std=c99||g")</span><br><span style="color: hsl(120, 100%, 40%);">+ JANSSON_LIB="$JANSSON_LIBS"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo "#define HAVE_JANSSON 1" >>confdefs.h</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%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then</span><br><span> pbxlibdir=""</span><br><span> # if --with-JANSSON=DIR has been specified, use it.</span><br><span>@@ -19926,128 +20023,6 @@</span><br><span> conftest$ac_exeext conftest.$ac_ext</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# PKGCONFIG is used in later tests</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then</span><br><span style="color: hsl(0, 100%, 40%);">- if test -n "$ac_tool_prefix"; then</span><br><span style="color: hsl(0, 100%, 40%);">- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.</span><br><span style="color: hsl(0, 100%, 40%);">-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for $ac_word... " >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">-if ${ac_cv_path_PKG_CONFIG+:} false; then :</span><br><span style="color: hsl(0, 100%, 40%);">- $as_echo_n "(cached) " >&6</span><br><span style="color: hsl(0, 100%, 40%);">-else</span><br><span style="color: hsl(0, 100%, 40%);">- case $PKG_CONFIG in</span><br><span style="color: hsl(0, 100%, 40%);">- [\\/]* | ?:[\\/]*)</span><br><span style="color: hsl(0, 100%, 40%);">- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- *)</span><br><span style="color: hsl(0, 100%, 40%);">- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</span><br><span style="color: hsl(0, 100%, 40%);">-for as_dir in $PATH</span><br><span style="color: hsl(0, 100%, 40%);">-do</span><br><span style="color: hsl(0, 100%, 40%);">- IFS=$as_save_IFS</span><br><span style="color: hsl(0, 100%, 40%);">- test -z "$as_dir" && as_dir=.</span><br><span style="color: hsl(0, 100%, 40%);">- for ac_exec_ext in '' $ac_executable_extensions; do</span><br><span style="color: hsl(0, 100%, 40%);">- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then</span><br><span style="color: hsl(0, 100%, 40%);">- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"</span><br><span style="color: hsl(0, 100%, 40%);">- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5</span><br><span style="color: hsl(0, 100%, 40%);">- break 2</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span style="color: hsl(0, 100%, 40%);">- done</span><br><span style="color: hsl(0, 100%, 40%);">-IFS=$as_save_IFS</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">-esac</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CONFIG=$ac_cv_path_PKG_CONFIG</span><br><span style="color: hsl(0, 100%, 40%);">-if test -n "$PKG_CONFIG"; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo "$PKG_CONFIG" >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">-else</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo "no" >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-if test -z "$ac_cv_path_PKG_CONFIG"; then</span><br><span style="color: hsl(0, 100%, 40%);">- ac_pt_PKG_CONFIG=$PKG_CONFIG</span><br><span style="color: hsl(0, 100%, 40%);">- # Extract the first word of "pkg-config", so it can be a program name with args.</span><br><span style="color: hsl(0, 100%, 40%);">-set dummy pkg-config; ac_word=$2</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for $ac_word... " >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :</span><br><span style="color: hsl(0, 100%, 40%);">- $as_echo_n "(cached) " >&6</span><br><span style="color: hsl(0, 100%, 40%);">-else</span><br><span style="color: hsl(0, 100%, 40%);">- case $ac_pt_PKG_CONFIG in</span><br><span style="color: hsl(0, 100%, 40%);">- [\\/]* | ?:[\\/]*)</span><br><span style="color: hsl(0, 100%, 40%);">- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- *)</span><br><span style="color: hsl(0, 100%, 40%);">- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</span><br><span style="color: hsl(0, 100%, 40%);">-for as_dir in $PATH</span><br><span style="color: hsl(0, 100%, 40%);">-do</span><br><span style="color: hsl(0, 100%, 40%);">- IFS=$as_save_IFS</span><br><span style="color: hsl(0, 100%, 40%);">- test -z "$as_dir" && as_dir=.</span><br><span style="color: hsl(0, 100%, 40%);">- for ac_exec_ext in '' $ac_executable_extensions; do</span><br><span style="color: hsl(0, 100%, 40%);">- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then</span><br><span style="color: hsl(0, 100%, 40%);">- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"</span><br><span style="color: hsl(0, 100%, 40%);">- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5</span><br><span style="color: hsl(0, 100%, 40%);">- break 2</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span style="color: hsl(0, 100%, 40%);">- done</span><br><span style="color: hsl(0, 100%, 40%);">-IFS=$as_save_IFS</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">-esac</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG</span><br><span style="color: hsl(0, 100%, 40%);">-if test -n "$ac_pt_PKG_CONFIG"; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo "$ac_pt_PKG_CONFIG" >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">-else</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo "no" >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if test "x$ac_pt_PKG_CONFIG" = x; then</span><br><span style="color: hsl(0, 100%, 40%);">- PKG_CONFIG=""</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- case $cross_compiling:$ac_tool_warned in</span><br><span style="color: hsl(0, 100%, 40%);">-yes:)</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}</span><br><span style="color: hsl(0, 100%, 40%);">-ac_tool_warned=yes ;;</span><br><span style="color: hsl(0, 100%, 40%);">-esac</span><br><span style="color: hsl(0, 100%, 40%);">- PKG_CONFIG=$ac_pt_PKG_CONFIG</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-else</span><br><span style="color: hsl(0, 100%, 40%);">- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-if test -n "$PKG_CONFIG"; then</span><br><span style="color: hsl(0, 100%, 40%);">- _pkg_min_version=0.9.0</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo "yes" >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo "no" >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">- PKG_CONFIG=""</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> # do the package library checks now</span><br><span> </span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 4088019..de371b4 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -628,6 +628,8 @@</span><br><span> </span><br><span> AC_CHECK_HEADERS([arpa/inet.h libintl.h malloc.h netdb.h stddef.h strings.h sys/event.h utime.h])</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+PKG_PROG_PKG_CONFIG()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Find required NetBSD Editline library (libedit).</span><br><span> EDITLINE_LIB=""</span><br><span> LIBEDIT_INTERNAL="yes"</span><br><span>@@ -670,7 +672,7 @@</span><br><span> if test "x$CURSES_LIB" != "x" ; then</span><br><span> EDITLINE_LIB="$CURSES_LIB"</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [ncurses.h])</span><br><span> if test "x$NCURSES_LIB" != "x" ; then</span><br><span> EDITLINE_LIB="$NCURSES_LIB"</span><br><span> else</span><br><span>@@ -710,6 +712,7 @@</span><br><span> </span><br><span> # Find required JSON support if bundled is not enabled.</span><br><span> if test "$JANSSON_BUNDLED" = "no" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_PKG_CONFIG_CHECK([JANSSON], [jansson])</span><br><span> AST_EXT_LIB_CHECK([JANSSON], [jansson], [json_dumps], [jansson.h])</span><br><span> </span><br><span> if test "${PBX_JANSSON}" != 1; then</span><br><span>@@ -1527,9 +1530,6 @@</span><br><span> )</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# PKGCONFIG is used in later tests</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_PROG_PKG_CONFIG()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> # do the package library checks now</span><br><span> </span><br><span>diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in</span><br><span>index 4c07fc7..03e4e21 100644</span><br><span>--- a/include/asterisk/autoconfig.h.in</span><br><span>+++ b/include/asterisk/autoconfig.h.in</span><br><span>@@ -404,7 +404,7 @@</span><br><span> /* Define to 1 if you have the Jack Audio Connection Kit library. */</span><br><span> #undef HAVE_JACK</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Define to 1 if you have the Jansson JSON library library. */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Define if your system has the JANSSON libraries. */</span><br><span> #undef HAVE_JANSSON</span><br><span> </span><br><span> /* Define to 1 if you have the `kevent64' function. */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9769">change 9769</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/9769"/><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: I69ea0f379f87a50049654b2487c76ee1c04fa53a </div>
<div style="display:none"> Gerrit-Change-Number: 9769 </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: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>