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 /binutils | |
| parent | db0f0fcbf35348272c6ad58e213610a78d3bc97a (diff) | |
| download | gdb-544c5619574318a6f9044c6aace524a9808ed1d6.zip gdb-544c5619574318a6f9044c6aace524a9808ed1d6.tar.gz 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 'binutils')
| -rwxr-xr-x | binutils/configure | 21 | ||||
| -rw-r--r-- | binutils/configure.ac | 15 |
2 files changed, 12 insertions, 24 deletions
diff --git a/binutils/configure b/binutils/configure index 1c51822..4c0c391 100755 --- a/binutils/configure +++ b/binutils/configure @@ -13507,8 +13507,7 @@ else fi - -if test "$with_msgpack" != no; then +if test "$with_msgpack" != no; then : pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msgpack" >&5 @@ -13592,29 +13591,23 @@ fi # Put the nasty error message in config.log where it belongs echo "$MSGPACK_PKG_ERRORS" >&5 - - if test "$with_msgpack" = yes; then - as_fn_error $? "--with-msgpack was given, but msgpack is missing or unusable." "$LINENO" 5 - fi - + if test "$with_msgpack" = yes; then : + as_fn_error $? "--with-msgpack was given, but msgpack is missing or unusable." "$LINENO" 5 +fi elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - - if test "$with_msgpack" = yes; then - as_fn_error $? "--with-msgpack was given, but msgpack is missing or unusable." "$LINENO" 5 - fi - + if test "$with_msgpack" = yes; then : + as_fn_error $? "--with-msgpack was given, but msgpack is missing or unusable." "$LINENO" 5 +fi else MSGPACK_CFLAGS=$pkg_cv_MSGPACK_CFLAGS MSGPACK_LIBS=$pkg_cv_MSGPACK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - $as_echo "#define HAVE_MSGPACK 1" >>confdefs.h - fi fi diff --git a/binutils/configure.ac b/binutils/configure.ac index ec002d3..0798d84 100644 --- a/binutils/configure.ac +++ b/binutils/configure.ac @@ -278,16 +278,11 @@ AC_ARG_WITH([msgpack], [], [with_msgpack=auto]) - -if test "$with_msgpack" != no; then - PKG_CHECK_MODULES(MSGPACK, msgpack, [ - AC_DEFINE([HAVE_MSGPACK], [1], [Define to 1 if msgpack is available.]) - ], [ - if test "$with_msgpack" = yes; then - AC_MSG_ERROR([--with-msgpack was given, but msgpack is missing or unusable.]) - fi - ]) -fi +AS_IF([test "$with_msgpack" != no], + [PKG_CHECK_MODULES(MSGPACK, msgpack, + [AC_DEFINE([HAVE_MSGPACK], [1], [Define to 1 if msgpack is available.])], + [AS_IF([test "$with_msgpack" = yes], + [AC_MSG_ERROR([--with-msgpack was given, but msgpack is missing or unusable.])])])]) # target-specific stuff: |