diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-07-28 06:59:20 -0700 |
|---|---|---|
| committer | Arsen Arsenović <arsen@gcc.gnu.org> | 2023-08-07 22:59:41 +0200 |
| commit | 161252a84085daad28bbfccd52b6af0926dd7251 (patch) | |
| tree | 6772987f0463177acd91f1d1778a65d5b617862d /config | |
| parent | de9e7e9e4afb956710293ef73f6b53c41e10fcd4 (diff) | |
| download | gcc-161252a84085daad28bbfccd52b6af0926dd7251.zip gcc-161252a84085daad28bbfccd52b6af0926dd7251.tar.gz gcc-161252a84085daad28bbfccd52b6af0926dd7251.tar.bz2 | |
PKG_CHECK_MODULES: Properly check if $pkg_cv_[]$1[]_LIBS works
There is no need to check $pkg_cv_[]$1[]_LIBS works if package check
failed.
config/ChangeLog:
* pkg.m4 (PKG_CHECK_MODULES): Use AC_TRY_LINK only if
$pkg_failed = no.
Diffstat (limited to 'config')
| -rw-r--r-- | config/pkg.m4 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config/pkg.m4 b/config/pkg.m4 index 45587e9..7ebf517 100644 --- a/config/pkg.m4 +++ b/config/pkg.m4 @@ -148,10 +148,12 @@ _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) dnl Check whether $pkg_cv_[]$1[]_LIBS works. -pkg_save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $pkg_cv_[]$1[]_LIBS" -AC_TRY_LINK([],[return 0;], [pkg_failed=no], [pkg_failed=yes]) -LDFLAGS=$pkg_save_LDFLAGS +if test $pkg_failed = no; then + pkg_save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $pkg_cv_[]$1[]_LIBS" + AC_TRY_LINK([],[], [], [pkg_failed=yes]) + LDFLAGS=$pkg_save_LDFLAGS +fi m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS and $1[]_LIBS to avoid the need to call pkg-config. |