Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
673a2bb0
Commit
673a2bb0
authored
Aug 05, 2013
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3624. [bug] Look for 'json_object_new_int64' when looking for a
the json library. [RT #34449]
parent
e3c273a8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
15 deletions
+18
-15
CHANGES
CHANGES
+3
-0
configure
configure
+13
-13
configure.in
configure.in
+2
-2
No files found.
CHANGES
View file @
673a2bb0
3624. [bug] Look for 'json_object_new_int64' when looking for a
the json library. [RT #34449]
3623. [placeholder]
3622. [tuning] Eliminate an unnecessary lock when incrementing
...
...
configure
View file @
673a2bb0
...
...
@@ -16059,13 +16059,13 @@ case "$use_libjson" in
;;
esac
if test "
%
${have_libjson}" != "X"
if test "
X
${have_libjson}" != "X"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_new_int" >&5
$as_echo_n "checking for library containing json_object_new_int... " >&6; }
if ${ac_cv_search_json_object_new_int+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_new_int
64
" >&5
$as_echo_n "checking for library containing json_object_new_int
64
... " >&6; }
if ${ac_cv_search_json_object_new_int
64
+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
...
...
@@ -16078,11 +16078,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char json_object_new_int ();
char json_object_new_int
64
();
int
main ()
{
return json_object_new_int ();
return json_object_new_int
64
();
;
return 0;
}
...
...
@@ -16095,25 +16095,25 @@ for ac_lib in '' json json-c; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_json_object_new_int=$ac_res
ac_cv_search_json_object_new_int
64
=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_json_object_new_int+:} false; then :
if ${ac_cv_search_json_object_new_int
64
+:} false; then :
break
fi
done
if ${ac_cv_search_json_object_new_int+:} false; then :
if ${ac_cv_search_json_object_new_int
64
+:} false; then :
else
ac_cv_search_json_object_new_int=no
ac_cv_search_json_object_new_int
64
=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_json_object_new_int" >&5
$as_echo "$ac_cv_search_json_object_new_int" >&6; }
ac_res=$ac_cv_search_json_object_new_int
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_json_object_new_int
64
" >&5
$as_echo "$ac_cv_search_json_object_new_int
64
" >&6; }
ac_res=$ac_cv_search_json_object_new_int
64
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
...
...
configure.in
View file @
673a2bb0
...
...
@@ -1535,10 +1535,10 @@ case "$use_libjson" in
;;
esac
if test "
%
${have_libjson}" != "X"
if test "
X
${have_libjson}" != "X"
then
AC_MSG_RESULT(yes)
AC_SEARCH_LIBS([json_object_new_int], [json json-c], [],
AC_SEARCH_LIBS([json_object_new_int
64
], [json json-c], [],
[AC_MSG_WARN([found libjson include but not library.])
have_libjson=""])
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment