From: Ivan Maidanski Date: Mon, 29 May 2017 07:51:44 +0000 (+0300) Subject: Fix external libatomic_ops pkg-config-based detection X-Git-Tag: v7.6.2~151 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=401cbf852823942d737edcc6f212e08ddc08002e;p=gc Fix external libatomic_ops pkg-config-based detection Fall back to AC_CHECK_HEADER-based detection of libatomic_ops library if PKG_CHECK_MODULES failed to find the library. * configure.ac [missing_libatomic_ops=true]: Call AC_CHECK_HEADER(atomic_ops.h) and set missing_libatomic_ops=false if atomic_ops.h is found; add comment. --- diff --git a/configure.ac b/configure.ac index e6c06df6..da481a97 100644 --- a/configure.ac +++ b/configure.ac @@ -983,7 +983,10 @@ missing_libatomic_ops=false AS_IF([test x"$with_libatomic_ops" != xno -a x"$THREADS" != xnone], [ PKG_CHECK_MODULES([ATOMIC_OPS], [atomic_ops], [], [ missing_libatomic_ops=true ]) ]) -AS_IF([test x$missing_libatomic_ops = xtrue ], +# Retry with AC_CHECK_HEADER if PKG_CHECK_MODULES failed. +AS_IF([test x$missing_libatomic_ops = xtrue], + [ AC_CHECK_HEADER([atomic_ops.h], [missing_libatomic_ops=false]) ]) +AS_IF([test x$missing_libatomic_ops = xtrue], [ AS_IF([test x"$with_libatomic_ops" != xcheck], [ AC_MSG_ERROR([An external libatomic_ops was not found]) ]) with_libatomic_ops=no ])