sb126: merged in DEV300_m87

3 files changed, 62 insertions, 2 deletions

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 9a0e92acf91f..f721db3148a4 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -48,6 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
 TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
 
 #xmlsec1-configure.patch: Set up the build. Straightforward configuration
+#xmlsec1-configure-libxml-libxslt.patch: empty "$with_libxml" prepends /bin :-(
 #xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx
 #xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it
 #xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec
@@ -57,6 +58,7 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
 #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
 PATCH_FILES=\
    xmlsec1-configure.patch \
+   xmlsec1-configure-libxml-libxslt.patch \
    xmlsec1-olderlibxml2.patch \
    xmlsec1-nssdisablecallbacks.patch \
    xmlsec1-customkeymanage.patch \
@@ -102,7 +104,7 @@ CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozi
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 .ELSE
 CONFIGURE_DIR=win32
@@ -162,7 +164,7 @@ CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=n
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 .ENDIF
 
diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
new file mode 100644
index 000000000000..fdf39ad19554
--- /dev/null
+++ b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
@@ -0,0 +1,40 @@
+--- misc/xmlsec1-1.2.14/configure	Wed Jun 30 11:55:36 2010
++++ misc/build/xmlsec1-1.2.14/configure	Wed Jun 30 11:57:28 2010
+@@ -12077,7 +12077,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxml/bin:$PATH"
++as_dummy="$with_libxml${with_libxml:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+   IFS=$as_save_IFS
+@@ -12258,7 +12258,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxslt/bin:$PATH"
++as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+   IFS=$as_save_IFS
+--- misc/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:55:37 2010
++++ misc/build/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:53:55 2010
+@@ -231,7 +231,7 @@
+ if test "z$LIBXML_FOUND" = "zno" ; then
+     if test "z$with_libxml" != "zyes" ; then
+ 	AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
+-		     [$with_libxml/bin:$PATH])
++		     [$with_libxml${with_libxml:+/bin:}$PATH])
+     fi
+     AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
+     if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
+@@ -296,7 +296,7 @@
+ if test "z$LIBXSLT_FOUND" = "zno" ; then
+     if test "z$with_libxslt" != "zyes" ; then
+ 	AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
+-		     [$with_libxslt/bin:$PATH])
++		     [$with_libxslt${with_libxslt:+/bin:}:$PATH])
+     fi
+     AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) 
+     if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
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 @@