From d986998536465ad4244f5b2936bf704485f8906c Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 4 Mar 2016 16:06:19 +0100
Subject: [PATCH] xmlsec1-configure.patch

Conflicts:
	Makefile.am
	Makefile.in
	configure.ac
	win32/Makefile.msvc
---
 configure.ac        | 35 ++++++++++++++++++++++++++++++-----
 win32/Makefile.msvc |  2 +-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 951b3ebe..83fe34cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -863,15 +863,28 @@ NSS_MIN_VERSION="3.11.1"
 NSPR_MIN_VERSION="4.4.1"
 SEAMONKEY_MIN_VERSION="1.0"
 MOZILLA_MIN_VERSION="1.4"
+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
+    MOZILLA_MIN_VERSION="1.0"
+fi
 NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
 NSPR_PACKAGE=mozilla-nspr
 NSS_PACKAGE=mozilla-nss
-NSPR_INCLUDE_MARKER="nspr/nspr.h"
+NSPR_INCLUDE_MARKER="nspr.h"
 NSPR_LIB_MARKER="libnspr4$shrext"
-NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
 NSS_INCLUDE_MARKER="nss/nss.h"
 NSS_LIB_MARKER="libnss3$shrext"
-NSS_LIBS_LIST="-lnss3 -lsmime3"
+
+case $host_os in
+cygwin* | pw32*)
+    NSS_LIBS_LIST="-lnss3 -lsmime3"
+    NSPR_LIBS_LIST="-lnspr4"
+    ;;
+
+*)
+    NSS_LIBS_LIST="-lnss3 -lsmime3"
+    NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
+    ;;
+esac
 
 XMLSEC_NO_NSS="1"
 NSPR_INCLUDE_PATH=
@@ -907,8 +921,8 @@ if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes
 fi
 if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then
     AC_MSG_CHECKING(for nss library installation in "$with_nss" folder)
-    if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then
-        NSS_INCLUDE_PATH="$with_nss/include"
+    if test -f "$with_nss/$NSS_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSS_LIB_MARKER" ; then
+        NSS_INCLUDE_PATH="$with_nss"
         NSS_LIB_PATH="$with_nss/lib"
         NSS_FOUND="yes"
         AC_MSG_RESULT([yes])
@@ -935,6 +950,16 @@ dnl     seamonkey-nspr and seamonkey-nss
 dnl     mozilla-nspr and mozilla-nss
 dnl     xulrunner-nspr and xulrunner-nss
 dnl     nspr and nss
+if test "z$NSS_FOUND" = "zno" ; then
+    PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION,
+        [NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss],
+        [NSS_FOUND=no])
+fi
+if test "z$NSS_FOUND" = "zno" ; then
+    PKG_CHECK_MODULES(NSS, nss >= 3.9.3 nspr >= 4.8,
+        [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss],
+        [NSS_FOUND=no])
+fi
 if test "z$NSPR_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" ; then
     if test "z$NSPR_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(NSPR, seamonkey-nspr >= $NSPR_MIN_VERSION,
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 0689f11b..e7cd5c38 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -451,7 +451,7 @@ XMLSEC_OPENSSL_SOLIBS   = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32
 XMLSEC_OPENSSL_ALIBS    = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib crypt32.lib advapi32.lib
 !endif
 
-XMLSEC_NSS_SOLIBS       = smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
+XMLSEC_NSS_SOLIBS       = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib
 XMLSEC_NSS_ALIBS        = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
 
 XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
-- 
2.16.3

diff --git a/configure.ac b/configure.ac
index 951b3ebe..b66bdc10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,7 +165,10 @@ dnl ==========================================================================
 dnl Hack for autoconf version mismatch
 dnl ==========================================================================
 if test "z$shrext" = "z" ; then
-    shrext=$shrext_cmds
+    AC_MSG_CHECKING(for shared library suffix)
+    module=no
+    eval shrext=$shrext_cmds
+    AC_MSG_RESULT($shrext)
 fi
 
 dnl ==========================================================================