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

configure could fail if cmocka was not detected

Browse Source
This commit is contained in:
Evan Hunt
2019-02-06 15:26:19 -08:00
parent afe73feae8
commit 15d41feb35
2 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
configure vendored
View File

@@ -1651,7 +1651,7 @@ Optional Packages:
--with-docbook-xsl=PATH specify path for Docbook-XSL stylesheets --with-docbook-xsl=PATH specify path for Docbook-XSL stylesheets
--with-libidn2=PATH enable IDN support using GNU libidn2 --with-libidn2=PATH enable IDN support using GNU libidn2
[yes|no(default)|path] [yes|no(default)|path]
--with-cmocka=detect enable cmocka based tests (default is detect) --with-cmocka=detect enable CMocka based tests (default is detect)
--with-tuning=ARG Specify server tuning (large or default) --with-tuning=ARG Specify server tuning (large or default)
--with-dlopen=ARG support dynamically loadable DLZ and DYNDB drivers --with-dlopen=ARG support dynamically loadable DLZ and DYNDB drivers
--with-dnsrps-libname DNSRPS provider library name (librpz.so) --with-dnsrps-libname DNSRPS provider library name (librpz.so)
@@ -19597,31 +19597,11 @@ fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$CMOCKA_PKG_ERRORS" >&5 echo "$CMOCKA_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (cmocka >= 1.0.0) were not met: with_cmocka=no
$CMOCKA_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables CMOCKA_CFLAGS
and CMOCKA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 with_cmocka=no
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables CMOCKA_CFLAGS
and CMOCKA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else else
CMOCKA_CFLAGS=$pkg_cv_CMOCKA_CFLAGS CMOCKA_CFLAGS=$pkg_cv_CMOCKA_CFLAGS
CMOCKA_LIBS=$pkg_cv_CMOCKA_LIBS CMOCKA_LIBS=$pkg_cv_CMOCKA_LIBS
@@ -19728,7 +19708,7 @@ $as_echo "#define HAVE_CMOCKA 1" >>confdefs.h
fi fi
UNITTESTS=tests ;; #( UNITTESTS=tests ;; #(
*) : *) :
as_fn_error $? "Use PKG_CONFIG_PATH to specify path to json-c library" "$LINENO" 5 as_fn_error $? "Use PKG_CONFIG_PATH to specify path to CMocka library" "$LINENO" 5
;; ;;
esac esac

10
configure.ac
View File

@@ -2318,18 +2318,18 @@ AC_SUBST([LIBIDN2_LIBS])
# #
AC_ARG_WITH([cmocka], AC_ARG_WITH([cmocka],
[AS_HELP_STRING([--with-cmocka=detect],[enable cmocka based tests (default is detect)])], [AS_HELP_STRING([--with-cmocka=detect],[enable CMocka based tests (default is detect)])],
[],[with_cmocka=detect]) [],[with_cmocka=detect])
AS_CASE([$with_cmocka], AS_CASE([$with_cmocka],
[no],[], [no],[],
[detect],[PKG_CHECK_MODULES([CMOCKA], [cmocka >= 1.0.0], [detect],[PKG_CHECK_MODULES([CMOCKA], [cmocka >= 1.0.0],
[AC_DEFINE([HAVE_CMOCKA], [1], [Use cmocka]) [AC_DEFINE([HAVE_CMOCKA], [1], [Use CMocka])
UNITTESTS=tests],[])], UNITTESTS=tests],[with_cmocka=no])],
[yes],[PKG_CHECK_MODULES([CMOCKA], [cmocka >= 1.0.0], [yes],[PKG_CHECK_MODULES([CMOCKA], [cmocka >= 1.0.0],
[AC_DEFINE([HAVE_CMOCKA], [1], [Use cmocka])]) [AC_DEFINE([HAVE_CMOCKA], [1], [Use CMocka])])
UNITTESTS=tests], UNITTESTS=tests],
[AC_MSG_ERROR([Use PKG_CONFIG_PATH to specify path to json-c library])] [AC_MSG_ERROR([Use PKG_CONFIG_PATH to specify path to CMocka library])]
) )
AC_SUBST([CMOCKA_CFLAGS]) AC_SUBST([CMOCKA_CFLAGS])
AC_SUBST([CMOCKA_LIBS]) AC_SUBST([CMOCKA_LIBS])