--- config_office/configure.in.mozilla-firefox	2006-01-05 21:17:37.000000000 +0100
+++ config_office/configure.in	2006-01-05 21:17:58.000000000 +0100
@@ -2844,7 +2844,7 @@
     SYSTEM_MOZILLA=YES
     AC_MSG_CHECKING([whether to use Mozilla or Firefox or XULRunner])
     if test -n "$with_firefox" && test "$with_firefox" != "no"; then
-      moz_flavour=firefox
+      moz_flavour=mozilla-firefox
     elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then
       moz_flavour=xulrunner
     else
--- libxmlsec/xmlsec1-1.2.6.patch.mozilla-firefox	2005-12-29 17:14:51.000000000 +0100
+++ libxmlsec/xmlsec1-1.2.6.patch	2006-01-05 21:17:58.000000000 +0100
@@ -14037,3 +14037,33 @@
   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
+--- misc/build/xmlsec1-1.2.6/configure.in.firefox	2005-06-19 18:43:48.000000000 +0200
++++ misc/build/xmlsec1-1.2.6/configure.in	2005-06-19 18:43:48.000000000 +0200
+@@ -502,9 +502,9 @@
+ dnl ==========================================================================
+     
+ XMLSEC_NO_NSS="1"
+-MOZILLA_MIN_VERSION="1.4"
+-NSS_MIN_VERSION="3.2"
+-NSPR_MIN_VERSION="4.0"
++MOZILLA_MIN_VERSION="1.0.2"
++NSS_MIN_VERSION="1.0.2"
++NSPR_MIN_VERSION="1.0.2"
+ NSS_CFLAGS=""
+ NSS_LIBS=""
+ NSS_LIBS_LIST="-lnss3 -lsoftokn3 -lsmime3"
+--- misc/build/xmlsec1-1.2.6/configure.firefox	2005-06-19 18:44:24.000000000 +0200
++++ misc/build/xmlsec1-1.2.6/configure	2005-06-19 18:44:24.000000000 +0200
+@@ -25677,9 +25677,9 @@
+ 
+ 
+ XMLSEC_NO_NSS="1"
+-MOZILLA_MIN_VERSION="1.4"
+-NSS_MIN_VERSION="3.2"
+-NSPR_MIN_VERSION="4.0"
++MOZILLA_MIN_VERSION="1.0.2"
++NSS_MIN_VERSION="1.0.2"
++NSPR_MIN_VERSION="1.0.2"
+ NSS_CFLAGS=""
+ NSS_LIBS=""
+ NSS_LIBS_LIST="-lnss3 -lsoftokn3 -lsmime3"
