fix up conflict, merge into configure patch

2bea2079 · Caolán McNamara · 78d81806 · 2bea2079 · 78d81806
Kaydet (Commit) 2bea2079 authored Eki 05, 2010 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 13 deletions

makefile.mk libxmlsec/makefile.mk +1 -2

xmlsec1-nspr.patch libxmlsec/xmlsec1-nspr.patch +0 -11

No files found.
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -65,8 +65,7 @@ PATCH_FILES=\
   xmlsec1-nssmangleciphers.patch \
   xmlsec1-noverify.patch \
   xmlsec1-mingw32.patch \
-   xmlsec1-mingw-keymgr-mscrypto.patch \
-   xmlsec1-nspr.patch
+   xmlsec1-mingw-keymgr-mscrypto.patch


 ADDITIONAL_FILES= \

--- a/libxmlsec/xmlsec1-nspr.patch
+++ b/libxmlsec/xmlsec1-nspr.patch
--- misc/xmlsec1-1.2.14/configure	2010-09-29 22:51:25.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/configure	2010-09-29 22:50:42.000000000 +0200
-@@ -13325,7 +13325,7 @@
- 
-     if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
-        OLD_CPPFLAGS=$CPPFLAGS
-       CPPFLAGS="$NSS_CFLAGS"
-+       CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-