mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Merge branch 'configure.in-cmocka-CFLAGS-fix' into 'master'

Browse Source 
Fix missing $ in CMOCKA_CFLAGS when --with-cmocka=<path> was used

See merge request isc-projects/bind9!665
This commit is contained in:
Ondřej Surý
2018-08-17 09:37:31 -04:00
parent 28cf1a7a9c ab9f12c7f4
commit bf98eb41bf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -22078,7 +22078,7 @@ 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"
CMOCKA_CFLAGS="-Iwith_cmocka/include" CMOCKA_CFLAGS="-I$with_cmocka/include"
CMOCKA_LIBS="-L$with_cmocka/lib -lcmocka" CMOCKA_LIBS="-L$with_cmocka/lib -lcmocka"
else else

2
configure.in
View File

@@ -3667,7 +3667,7 @@ AS_CASE([$with_cmocka],
AC_SEARCH_LIBS([cmocka_set_message_output], AC_SEARCH_LIBS([cmocka_set_message_output],
[cmocka], [cmocka],
[ [
CMOCKA_CFLAGS="-Iwith_cmocka/include" CMOCKA_CFLAGS="-I$with_cmocka/include"
CMOCKA_LIBS="-L$with_cmocka/lib -lcmocka" CMOCKA_LIBS="-L$with_cmocka/lib -lcmocka"
], ],
[AC_MSG_ERROR([cmocka unit testing framework not found in $with_cmocka path])]) [AC_MSG_ERROR([cmocka unit testing framework not found in $with_cmocka path])])