it-nss-softokn-config

# DP: Fix configure check for the SunEC security provider.

# DP: Fix configure check for the SunEC security provider.

Gbp-Pq: Name it-nss-softokn-config.diff

diff --git a/acinclude.m4 b/acinclude.m4
index 4a274a7a93e8ef97ecdb3797e65055c95149452c..92bc6f201118b9154e3087df0d88ac35ee1f83a5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2809,9 +2809,12 @@ AC_DEFUN_ONCE([IT_ENABLE_SUNEC],
   if test x"${ENABLE_SUNEC}" = "xyes"; then
     PKG_CHECK_MODULES(NSS_SOFTOKN, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
     PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
+    NSS_SOFTOKN_FOUND=yes
+    NSS_SOFTOKN_CFLAGS=$NSS_CFLAGS
     if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
+      nsslibdir="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/nss"
       SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
-      SUNEC_LIBS="$NSS_LIBS -lfreebl";
+      SUNEC_LIBS="$NSS_LIBS -L$nsslibdir -Xlinker -rpath=$nsslibdir -lfreebl";
     elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
       SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
       SUNEC_LIBS=$NSS_JAVA_LIBS;