diff options
| author | Alan Modra <amodra@gmail.com> | 2022-09-26 14:12:05 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2022-09-26 14:23:29 +0930 |
| commit | 544c5619574318a6f9044c6aace524a9808ed1d6 (patch) | |
| tree | f3f9eeb61499013ac03832dffe1aeda976c40a03 /ld/configure | |
| parent | db0f0fcbf35348272c6ad58e213610a78d3bc97a (diff) | |
| download | fsf-binutils-gdb-544c5619574318a6f9044c6aace524a9808ed1d6.zip fsf-binutils-gdb-544c5619574318a6f9044c6aace524a9808ed1d6.tar.gz fsf-binutils-gdb-544c5619574318a6f9044c6aace524a9808ed1d6.tar.bz2 | |
PKG_CHECK_MODULES for msgpack and jansson
Using AS_IF rather than shell "if" is recommended for conditionals
that contain non-trivial autoconf macros, because autoconf will emit
any AC_REQUIREd autoconf macro expansions outside of the conditional.
This makes them available elsewhere in the configure script.
binutils/
* configure.ac (msgpack): Use "AS_IF" rather than "if".
* configure: Regenerate.
ld/
* configure.ac (jansson): Use "AS_IF" rather than "if".
* configure: Regenerate.
Diffstat (limited to 'ld/configure')
| -rwxr-xr-x | ld/configure | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/ld/configure b/ld/configure index a1a0700..4efe3ef 100755 --- a/ld/configure +++ b/ld/configure @@ -15585,7 +15585,6 @@ else fi -if test "x$enable_jansson" != "xno"; then @@ -15706,8 +15705,7 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi fi - if test -n "$PKG_CONFIG"; then : - +if test "x$enable_jansson" != "xno"; then : pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson" >&5 @@ -15791,15 +15789,11 @@ fi # Put the nasty error message in config.log where it belongs echo "$JANSSON_PKG_ERRORS" >&5 - - as_fn_error $? "Cannot find jansson library" "$LINENO" 5 - + as_fn_error $? "Cannot find jansson library" "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - - as_fn_error $? "Cannot find jansson library" "$LINENO" 5 - + as_fn_error $? "Cannot find jansson library" "$LINENO" 5 else JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS JANSSON_LIBS=$pkg_cv_JANSSON_LIBS @@ -15814,11 +15808,6 @@ $as_echo "#define HAVE_JANSSON 1" >>confdefs.h fi -else - - as_fn_error $? "Cannot find pkg-config" "$LINENO" 5 - -fi fi |