From b76d4b6b096a1bee7e2c6f0d2a7bdf89e001203d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 18 Feb 2016 18:54:04 +0100 Subject: [PATCH] Revert "build: fix detection of NSS library on Debian" Sorry, it was not Debian's fault. It is only libnss-devel package on Ubuntu 12.04/Precise [1]. Revert the workaround and avoid the failure by dropping the version check altogether. NSS 3.11 is from 2006, it's unlikely a user tries to build current NetworkManager against such an old version of the library. [1] https://bugs.launchpad.net/ubuntu/+source/nss/+bug/1547147 This reverts commit d48790cbec7d19b20a10e1627dd8ee1c996425b1. --- configure.ac | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 46f3314778..db36cb3651 100644 --- a/configure.ac +++ b/configure.ac @@ -595,11 +595,7 @@ AC_ARG_WITH(crypto, AS_HELP_STRING([--with-crypto=nss|gnutls], [Cryptography lib with_nss=no with_gnutls=no if test x"$ac_crypto" = xnss; then - PKG_CHECK_MODULES(NSS, [nss >= 3.11], [have_nss=yes], [have_nss=no]) - if test "$have_nss" != yes; then - # workaround on Debian, where the NSS module bumped the epoch - PKG_CHECK_MODULES(NSS, [nss >= 2:3.11]) - fi + PKG_CHECK_MODULES(NSS, [nss]) # Work around a pkg-config bug (fdo #29801) where exists != usable FOO=`$PKG_CONFIG --cflags --libs nss`