diff options
| author | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
| commit | cb852ad28436ec21b2783fbcf3e85d05e303cf8a (patch) | |
| tree | 5e40f4da0325c1d3546980f14e4c486bd9a1d413 /libxmlsec/xmlsec1-configure.patch | |
| parent | 15a4ec2c3ecdec697f7cf7cc6c39ed68bfc64489 (diff) | |
| parent | e97e1bf62b4b7de61edf760a77de7e55afa93d84 (diff) | |
sb126: merged in DEV300_m87
Diffstat (limited to 'libxmlsec/xmlsec1-configure.patch')
| -rw-r--r-- | libxmlsec/xmlsec1-configure.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch index 943ac98bf687..f2f5f4e8f642 100644 --- a/libxmlsec/xmlsec1-configure.patch +++ b/libxmlsec/xmlsec1-configure.patch @@ -590,6 +590,15 @@ if test "z$dir" = "z/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" else +@@ -13166,7 +13284,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. */ + @@ -15036,7 +15154,7 @@ # values after options handling. ac_log=" @@ -734,6 +743,15 @@ dnl do not add -L/usr/lib because compiler does it anyway if test "z$dir" = "z/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" +@@ -738,7 +761,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" + AC_EGREP_CPP(yes,[ + #include <nss.h> + #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2 --- misc/xmlsec1-1.2.14/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200 +++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2009-10-01 10:28:50.997747312 +0200 @@ -376,7 +376,7 @@ |