diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-05 20:30:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-05 20:30:56 +0100 |
| commit | c8c748b3e7bffcff2d4555f336667d6876d3d3d2 (patch) | |
| tree | e269c3b8813d279eae7bb49b582c93bf5cd5cd11 | |
| parent | d492ea7fd94dbe08b91dad1497e0ab306021a063 (diff) | |
fix up conflict, merge into configure patch
| -rw-r--r-- | libxmlsec/makefile.mk | 3 | ||||
| -rw-r--r-- | libxmlsec/xmlsec1-nspr.patch | 11 |
2 files changed, 1 insertions, 13 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 67dd8a5..b7dff3e 100644 --- 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= \ diff --git a/libxmlsec/xmlsec1-nspr.patch b/libxmlsec/xmlsec1-nspr.patch deleted file mode 100644 index 09f7b2f..0000000 --- a/libxmlsec/xmlsec1-nspr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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. */ - |