diff options
Diffstat (limited to 'ld')
| -rwxr-xr-x | ld/configure | 17 | ||||
| -rw-r--r-- | ld/configure.ac | 23 |
2 files changed, 10 insertions, 30 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 diff --git a/ld/configure.ac b/ld/configure.ac index eb55904..8a8bfc9 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -296,24 +296,15 @@ AC_ARG_ENABLE([jansson], [enable_jansson=$enableval], [enable_jansson="no"]) -if test "x$enable_jansson" != "xno"; then - PKG_PROG_PKG_CONFIG - AS_IF([test -n "$PKG_CONFIG"], +AS_IF([test "x$enable_jansson" != "xno"], + [PKG_CHECK_MODULES(JANSSON, [jansson], [ - PKG_CHECK_MODULES(JANSSON, [jansson], - [ - AC_DEFINE(HAVE_JANSSON, 1, [The jansson library is to be used]) - AC_SUBST([JANSSON_CFLAGS]) - AC_SUBST([JANSSON_LIBS]) - ], - [ - AC_MSG_ERROR([Cannot find jansson library]) - ]) + AC_DEFINE(HAVE_JANSSON, 1, [The jansson library is to be used]) + AC_SUBST([JANSSON_CFLAGS]) + AC_SUBST([JANSSON_LIBS]) ], - [ - AC_MSG_ERROR([Cannot find pkg-config]) - ]) -fi + [AC_MSG_ERROR([Cannot find jansson library])]) + ]) AM_BINUTILS_WARNINGS |