mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '351-fix-with-cmocka=path-build' into 'master'

Browse Source 
Resolve "configure fails unless --enable-developer is specified"

Closes #351

See merge request isc-projects/bind9!393
This commit is contained in:
Ondřej Surý
2018-06-21 08:22:48 -04:00
parent 5ed0b0d852 0158c1a4ea
commit dfdc6d61aa
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure vendored
View File

@@ -22663,9 +22663,9 @@ fi
done done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cmocka_run_group_tests" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cmocka_set_message_output" >&5
$as_echo_n "checking for library containing cmocka_run_group_tests... " >&6; } $as_echo_n "checking for library containing cmocka_set_message_output... " >&6; }
if ${ac_cv_search_cmocka_run_group_tests+:} false; then : if ${ac_cv_search_cmocka_set_message_output+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_func_search_save_LIBS=$LIBS ac_func_search_save_LIBS=$LIBS
@@ -22678,11 +22678,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char cmocka_run_group_tests (); char cmocka_set_message_output ();
int int
main () main ()
{ {
return cmocka_run_group_tests (); return cmocka_set_message_output ();
; ;
return 0; return 0;
} }
@@ -22695,25 +22695,25 @@ for ac_lib in '' cmocka; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS" LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi fi
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_cmocka_run_group_tests=$ac_res ac_cv_search_cmocka_set_message_output=$ac_res
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest$ac_exeext
if ${ac_cv_search_cmocka_run_group_tests+:} false; then : if ${ac_cv_search_cmocka_set_message_output+:} false; then :
break break
fi fi
done done
if ${ac_cv_search_cmocka_run_group_tests+:} false; then : if ${ac_cv_search_cmocka_set_message_output+:} false; then :
else else
ac_cv_search_cmocka_run_group_tests=no ac_cv_search_cmocka_set_message_output=no
fi fi
rm conftest.$ac_ext rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS LIBS=$ac_func_search_save_LIBS
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cmocka_run_group_tests" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cmocka_set_message_output" >&5
$as_echo "$ac_cv_search_cmocka_run_group_tests" >&6; } $as_echo "$ac_cv_search_cmocka_set_message_output" >&6; }
ac_res=$ac_cv_search_cmocka_run_group_tests ac_res=$ac_cv_search_cmocka_set_message_output
if test "$ac_res" != no; then : if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

2
configure.in
View File

@@ -4569,7 +4569,7 @@ AS_CASE([$with_cmocka],
#include <stddef.h> #include <stddef.h>
#include <setjmp.h> #include <setjmp.h>
]) ])
AC_SEARCH_LIBS([cmocka_run_group_tests], AC_SEARCH_LIBS([cmocka_set_message_output],
[cmocka], [cmocka],
[ [
CMOCKA_CFLAGS="-Iwith_cmocka/include" CMOCKA_CFLAGS="-Iwith_cmocka/include"