First fix for fdo#56902

Restrict moz to windows, and build vars also
impacts nss, connectivity

Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282
Reviewed-on: https://gerrit.libreoffice.org/1233
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

9 files changed, 105 insertions, 703 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index f2e4a1df87d9..03972128af9a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -39,7 +39,6 @@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
 export BSH_JAR=@BSH_JAR@
 export BUILD_DMAKE=@BUILD_DMAKE@
-export BUILD_MOZAB=@BUILD_MOZAB@
 export BUILD_PLATFORM=@build@
 export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
 export BUILD_TYPE=@BUILD_TYPE@
@@ -91,7 +90,6 @@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
 export debug=@ENABLE_DEBUG@
-export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DEVINSTALLDIR=@DEVINSTALLDIR@
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
@@ -170,6 +168,7 @@ export ENABLE_ZENITY=@ENABLE_ZENITY@
 export EPM=@EPM@
 export EPM_FLAGS=@EPM_FLAGS@
 export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
+export EXTMSV80=$(gb_Space)@EXTMSV80@
 @x_Cygwin@ export FIND=@WIN_FIND@
 export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
 export FLEX=@FLEX@
@@ -387,15 +386,11 @@ export MKDEPENDSOLVER=TRUE
 export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@
 export MOC=@MOC@
-export MOZILLABUILD=@MOZILLABUILD@
 export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@
-export MOZILLA_VERSION=@MOZILLA_VERSION@
-export MOZ_FLAVOUR=@MOZ_FLAVOUR@
-export MOZ_INC=@MOZ_INC@
-export MOZ_LIB=@MOZ_LIB@
-export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
 export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
 export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
+export MSVC80_MNFST=@MSVC80_MNFST@
+export MSVC80_DLL_DIR=@MSVC80_DLL_DIR@
 export MYSQL_DEFINES=@MYSQL_DEFINES@
 export MYSQL_INC=@MYSQL_INC@
 export MYSQL_LIB=@MYSQL_LIB@
@@ -408,6 +403,7 @@ export NM=@NM@
 export nodep=@nodep@
 export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@
 export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@
+export NSSBUILDTOOLS=@NSSBUILDTOOLS@
 export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
 @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
 @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@
@@ -444,7 +440,6 @@ export POPPLER_CFLAGS=$(gb_SPACE)@POPPLER_CFLAGS@
 export POPPLER_LIBS=$(gb_SPACE)@POPPLER_LIBS@
 export POSTGRESQL_INC=@POSTGRESQL_INC@
 export POSTGRESQL_LIB=@POSTGRESQL_LIB@
-export PREBUILD_MOZAB=@PREBUILD_MOZAB@
 export PREFIXDIR=@PREFIXDIR@
 export PRODUCT=@PRODUCT@
 export PRODUCTNAME=@PRODUCTNAME@
@@ -548,7 +543,6 @@ export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@
 export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@
 export SYSTEM_MDDS=@SYSTEM_MDDS@
 export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@
-export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@
 export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@
 export SYSTEM_MYSQL=@SYSTEM_MYSQL@
 export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@
@@ -611,7 +605,7 @@ export WITH_KRB5=@WITH_KRB5@
 export WITH_LANG=@WITH_LANG@
 export WITH_LANG_LIST=@WITH_LANG_LIST@
 export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
-export WITH_MOZILLA=@WITH_MOZILLA@
+export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
 export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
 export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
 export WITH_STLPORT=@WITH_STLPORT@
diff --git a/configure.ac b/configure.ac
index e0b834290cff..ff9572197fa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -687,10 +687,10 @@ AC_ARG_ENABLE(pch,
         [DEPRECATED : is ignored])
 )
 
-AC_ARG_ENABLE(mozilla,
-    AS_HELP_STRING([--enable-mozilla],
-        [LibreOffice can include a strangely hacked up Mozilla binary for your
-         platform, to build with this version, use this option.])
+AC_ARG_ENABLE(win-mozab-driver,
+    AS_HELP_STRING([--enable-win-mozab-driver],
+        [LibreOffice includes a driver to connect to Mozilla 
+         address books under Windows, to build with this version, use this option.])
 )
 
 AC_ARG_ENABLE(epm,
@@ -886,10 +886,11 @@ AC_ARG_ENABLE(telepathy,
         [Determines whether to enable Telepathy for collaboration.]),
 ,enable_telepathy=no)
 
-AC_ARG_ENABLE(build-mozilla,
-    AS_HELP_STRING([--disable-build-mozilla],
-        [Use this option if you do not want to build the Mozilla components from
-         the Mozilla source code but take precompiled zips.]),
+AC_ARG_ENABLE(build-mozab,
+    AS_HELP_STRING([--disable-build-mozab],
+        [Use this option if you do not want to build the Mozilla address book
+         components from the Mozilla source code but take precompiled zips.
+         Meaningful only after --enable-win-mozab-driver.]),
 ,)
 
 AC_ARG_ENABLE(tde,
@@ -1252,7 +1253,7 @@ AC_ARG_WITH(system-nss,
 
 AC_ARG_WITH(mozilla-toolkit,
     AS_HELP_STRING([--with-mozilla-toolkit],
-        [Choose which GUI toolkit to use while building Mozilla components. (default=gtk2)]),
+        [DEPRECATED : is ignored]),
 ,)
 
 AC_ARG_WITH(myspell-dicts,
@@ -1653,12 +1654,8 @@ AC_ARG_WITH(system-liblangtag,
 
 AC_ARG_WITH(system-mozilla,
     AS_HELP_STRING([--with-system-mozilla],
-        [Use Mozilla already on system. Note that some components cannot be built
-         against a contemporary Mozilla. The flavour used can be specified by
-         --with-system-mozilla=<flavour>. Supported are: libxul (default),
-         xulrunner, firefox, seamonkey, mozilla, iceape.]),
-    WITH_SYSTEM_MOZILLA=$withval ,
-WITH_SYSTEM_MOZILLA=no)
+        [DEPRECATED : is ignored]),,
+)
 
 AC_ARG_WITH(system-npapi-headers,
     AS_HELP_STRING([--with-system-npapi-headers],
@@ -1847,19 +1844,19 @@ AC_ARG_WITH(directx-home,
     ],
 ,)
 
-AC_ARG_WITH(mozilla-build,
-    AS_HELP_STRING([--with-mozilla-build],
-        [For Windows users, please supply the path to the Mozilla build tools.])
+AC_ARG_WITH(nss-build-tools,
+    AS_HELP_STRING([--with-nss-build-tools],
+        [For Windows users, please supply the path to the nss build tools.])
     [
-                          Usage:     --with-mozilla-build=<absolute path to
-                                                          Mozilla build tools>
+                          Usage:     --with-nss-build=<absolute path to
+                                                          nss build tools>
 
                           At the moment of this writing, an installer for the
                           mozilla build tools can be obtained from http://ftp.
                           mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
     ],
-    MOZILLABUILD=$withval ,
-)
+    NSSBUILDTOOLS=$withval ,
+) # NSSBUILDTOOLS
 
 AC_ARG_WITH(lang,
     AS_HELP_STRING([--with-lang],
@@ -4231,20 +4228,7 @@ SOURCEVERSION="OOO$UPD"
 AC_SUBST(UPD)
 AC_SUBST(SOURCEVERSION)
 
-dnl ===================================================================
-dnl Set the WITH_MOZILLA variable.
-dnl ===================================================================
 
-AC_MSG_CHECKING([whether to enable build of Mozilla])
-if test "$enable_mozilla" = "yes"; then
-    AC_MSG_RESULT([yes])
-    WITH_MOZILLA=YES
-else
-    AC_MSG_RESULT([no])
-    WITH_MOZILLA=NO
-    enable_mozilla=no
-fi
-AC_SUBST(WITH_MOZILLA)
 
 dnl ===================================================================
 dnl Set the ENABLE_CRASHDUMP variable.
@@ -4689,10 +4673,9 @@ AC_SUBST(WINDRES)
 
 dnl ===================================================================
 dnl pkg-config checks on Mac OS X
-dnl (but --enable-mozilla /does/ require a carefully crafted pkg-config)
 dnl ===================================================================
 
-if test $_os = Darwin -a "$enable_mozilla" = no; then
+if test $_os = Darwin; then
     AC_MSG_CHECKING([for bogus pkg-config])
     if test -n "$PKG_CONFIG"; then
         if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | $GREP -q Mono.framework; then
@@ -8009,21 +7992,6 @@ else
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
-AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
-if test "$_os" = "WINNT"; then
-   if test "$enable_mozilla" = "no"; then
-      AC_MSG_RESULT([no])
-   elif test "$with_system_mozilla" = "yes"; then
-      AC_MSG_RESULT([no, not possible with system-mozilla])
-   else
-      AC_MSG_RESULT([yes (old mozab driver)])
-   fi
-else
-# on all other platforms Mozilla addressbook connectivity
-# is unconditionally built
-# new and shiny mork driver
-   AC_MSG_RESULT([yes (new mork driver)])
-fi
 
 dnl ===================================================================
 dnl Check for system openldap
@@ -8046,199 +8014,71 @@ fi
 AC_SUBST(SYSTEM_OPENLDAP)
 
 dnl ===================================================================
-dnl Check for system mozilla
+dnl Check for mozilla ab connectivity for windows
 dnl ===================================================================
 
-AC_MSG_CHECKING([which Mozilla to use])
-if test -n "$with_system_mozilla" -a "$with_system_mozilla" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_MOZILLA=YES
-    AC_MSG_CHECKING([which Mozilla flavour to use])
-    if test -n "$with_system_mozilla" -a "$with_system_mozilla" = "libxul"; then
-        MOZ_FLAVOUR=libxul
-    elif test -n "$with_system_mozilla" -a "$with_system_mozilla" = "xulrunner"; then
-        MOZ_FLAVOUR=xulrunner
-    elif test -n "$with_system_mozilla" -a "$with_system_mozilla" = "seamonkey"; then
-        MOZ_FLAVOUR=seamonkey
-    elif test -n "$with_system_mozilla" -a "$with_system_mozilla" = "iceape"; then
-        MOZ_FLAVOUR=iceape
-    elif test -n "$with_system_mozilla" -a "$with_system_mozilla" = "firefox"; then
-        MOZ_FLAVOUR=firefox
-    elif test -n "$with_system_mozilla" -a "$with_system_mozilla" = "mozilla"; then
-        MOZ_FLAVOUR=mozilla
-    else
-        MOZ_FLAVOUR=libxul
-    fi
-    tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
-    AC_MSG_RESULT($tmp)
-
-    if test "$MOZ_FLAVOUR" != "libxul"; then
-        PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom, HASXPCOM="TRUE", HASXPCOM="" )
-        MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
-        MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
-    fi
-
-    if test -z "$HASXPCOM"; then
-        PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
-        MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
-        MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
-        if ! test -e "$MOZ_LIB/libxul.so"; then
-            MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
-            if test -e "$MOZ_LIB/sdk/lib/libxul.so"; then
-                MOZ_LIB="$MOZ_LIB/sdk/lib"
-            fi
-        fi
-    fi
-
-    MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
-
-    #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
-    #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-    if test "$MOZ_FLAVOUR" = "libxul"; then
-        MOZ_FLAVOUR="mozilla"
+AC_MSG_CHECKING([whether to enable build of Mozilla addressbook connectivity driver for Windows])
+if test "$enable_win_mozab_driver" = "yes" -a "$_os" = "WINNT" -a "$WITH_MINGW" != "YES" ; then
+    AC_MSG_RESULT([yes])
+    WITH_MOZAB4WIN=YES
+    BUILD_MOZAB=YES
+    if test "$enable_build_mozab" = "no" ; then
+        BUILD_MOZAB=NO
     fi
-
-elif test "$enable_mozilla" = "no"; then
-    AC_MSG_RESULT([none])
-    WITH_MOZILLA=NO
 else
-    AC_MSG_RESULT([internal])
-    SYSTEM_MOZILLA=NO
-    BUILD_TYPE="$BUILD_TYPE MOZ"
-    MOZILLA_VERSION=1.1.14
-    AC_SUBST(MOZILLA_VERSION)
-
-    AC_MSG_CHECKING([for toolkit Mozilla should use])
-    if test -z "$with_mozilla_toolkit"; then
-        if test "$_os" != "WINNT"; then
-            if test "$_os" = "Darwin"; then
-                MOZILLA_TOOLKIT=mac
-                AC_MSG_RESULT([mac])
-            else
-                MOZILLA_TOOLKIT=gtk2
-                AC_MSG_RESULT([gtk2])
-            fi
-        fi
-    else
-        MOZILLA_TOOLKIT=$with_mozilla_toolkit
-        enable_build_mozilla=1
-        AC_MSG_RESULT([$MOZILLA_TOOLKIT])
-    fi
-
-    AC_SUBST(MOZILLA_TOOLKIT)
-
-    # default to enabling build mozilla
-    if test "$enable_build_mozilla" != "no"; then
-        enable_build_mozilla=yes
-    else
-        enable_build_mozilla=
-    fi
+    AC_MSG_RESULT([no])
+    WITH_MOZAB4WIN=NO
+fi
+AC_SUBST(WITH_MOZAB4WIN)
+AC_SUBST(BUILD_MOZAB)
 
-    AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey])
-    if test -n "$enable_build_mozilla"; then
-        BUILD_MOZAB="TRUE"
-        AC_MSG_RESULT([yes])
-    else
-        BUILD_MOZAB=""
+if test "$_os" != "WINNT"; then
+# on all other platforms Mozilla addressbook connectivity
+# is unconditionally built
+# new and shiny mork driver
+   AC_MSG_RESULT([yes (new mork driver)])
+else
+    if test "WITH_MOZAB4WIN" = "NO"; then
         AC_MSG_RESULT([no])
-    fi
-
-    if test "$BUILD_MOZAB" = "TRUE"; then
-        if test "$_os" = "WINNT"; then
-            if test "$WITH_MINGW" != "yes"; then
-                # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
-                if test "$MSVSVER" != "2005"; then
-                    AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio 2005 only.])
-                fi
-            else
-                AC_MSG_WARN([Building SeaMonkey with MinGW is not tested, and likely to break.])
-                add_warning "Building SeaMonkey with MinGW is not tested, and likely to break."
-            fi
-        fi
-
-        if test "$_os" = "WINNT"; then
-            AC_MSG_CHECKING([for moztools binaries])
-            if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip"; then
-                AC_MSG_ERROR([The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)])
-            else
-                AC_MSG_RESULT([ok])
-            fi
-        elif test "$_os" = "Darwin"; then
-            PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3,  MOZIDL="TRUE", MOZIDL="")
-            if test -z "$MOZIDL"; then
-                AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build Mozilla with Mac toolkit.])
-            fi
-        else
-            # Generic Unix/Linux section
-            if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-                PKG_CHECK_MODULES(MOZLIBREQ, gtk+-2.0, MOZGTK="TRUE", MOZGTK="")
-                if test -z "$MOZGTK"; then
-                    AC_MSG_ERROR([GTK2 is needed to build Mozilla.])
-                fi
-                PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.8.0, MOZIDL="TRUE", MOZIDL="")
-                if test -z "$MOZIDL"; then
-                    AC_MSG_ERROR([libIDL >= 0.8.0 is needed when using GTK2 to build Mozilla.])
-                fi
-            else
-                PKG_CHECK_MODULES(MOZLIBREQ, gtk+ >= 1.2.3, MOZGTK="TRUE", MOZGTK="")
-                if test -z "$MOZGTK"; then
-                    AC_MSG_ERROR([GTK+ 1.2 is needed when not using GTK2 to build Mozilla.])
-                fi
-                PKG_CHECK_MODULES(MOZLIBREQ, libidl >= 0.6.3 libidl <= 0.6.8, MOZIDL="TRUE", MOZIDL="")
-                if test -z "$MOZIDL"; then
-                    AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build Mozilla.])
-                fi
-            fi
-        fi
     else
-        PREBUILD_MOZAB="YES"
-        if test "$_os" = "WINNT"; then
-            AC_MSG_CHECKING([for MSVC 2005 runtime needed for prebuilt Mozilla])
-            if test -e "$SRC_ROOT/external/msvcp80/Microsoft.VC80.CRT.manifest" -a \
-                    -e "$SRC_ROOT/external/msvcp80/msvcp80.dll" -a \
-                    -e "$SRC_ROOT/external/msvcp80/msvcr80.dll"; then
+        AC_MSG_RESULT([yes, internal (old windows mozab driver)])
+        BUILD_TYPE="$BUILD_TYPE MOZ"
+        EXTMSV80=`cygpath  -u "$SRC_ROOT/external/msvcp80"`
+        AC_MSG_CHECKING([for MSVC 2005 runtime needed for prebuilt Mozilla])
+        if test -e "$EXTMSV80/Microsoft.VC80.CRT.manifest" -a \
+                -e "$EXTMSV80/msvcp80.dll" -a \
+                -e "$EXTMSV80/msvcr80.dll"; then
+            AC_MSG_RESULT([Found])
+            EXTMSV80=
+        else
+            #uwin-prefixed paths are with no quotes to allow for mask, and uwin to not have spaces, btw
+            uwin=`cygpath -d "$WINDIR"`
+            uwin=`cygpath -u "$uwin"`
+            #if we have one we have all
+            if test -e $uwin/winsxs/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053* ; then
+                MSVC80_DLL_DIR=`ls -d $uwin/winsxs/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053*`
+                MSVC80_MNFST=`ls $uwin/winsxs/Manifests/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053_*.manifest`
                 AC_MSG_RESULT([Found])
             else
-                #uwin-prefixed paths are with no quotes to allow for mask, and uwin to not have spaces, btw
-                uwin=`cygpath -d "$WINDIR"`
-                uwin=`cygpath -u "$uwin"`
-                #if we have one we have all
-                if test -e $uwin/winsxs/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053*; then
-                    MSVC80_DLL_DIR=`cd $uwin/winsxs/; ls -d x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053*`
-                    MSVC80_MNFST=`ls $uwin/winsxs/Manifests/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053_*.manifest`
-                    AC_MSG_RESULT([Found])
-                else
-                    MSVC80_DLL_DIR=
-                    MSVC80_MNFST=
-                    AC_MSG_RESULT([Not Found])
-                    AC_MSG_ERROR([For the pre-built Mozilla libraries, you need MSVC 2005 runtime files
-Microsoft.VC80.CRT.manifest, msvcp80.dll, and msvcr80.dll
-in external/msvcp80.
-
-You can get them by installing:
-<http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE>
-and relaunch ./autogen.sh])
-                fi
+                EXTMSV80=
+                AC_MSG_RESULT([Not Found])
+                AC_MSG_ERROR([For the pre-built Mozilla libraries, you need MSVC 2005 runtime files
+    Microsoft.VC80.CRT.manifest, msvcp80.dll, and msvcr80.dll
+    in external/msvcp80.
+
+    You can get them by installing:
+    <http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE>
+    and relaunch ./autogen.sh])
             fi
         fi
     fi
 fi
 
-if test "$SYSTEM_MOZILLA" = "YES"; then
-    SOLARLIB="$SOLARLIB -L$MOZ_LIB"
-fi
 
-AC_SUBST(BUILD_MOZAB)
-AC_SUBST(PREBUILD_MOZAB)
-AC_SUBST(MOZILLABUILD)
-AC_SUBST(SYSTEM_MOZILLA)
-AC_SUBST(MOZ_FLAVOUR)
-AC_SUBST(MOZ_INC)
-AC_SUBST(MOZ_LIB)
-AC_SUBST(MOZ_LIB_XPCOM)
 AC_SUBST(MSVC80_DLL_DIR)
 AC_SUBST(MSVC80_MNFST)
+AC_SUBST(EXTMSV80)
+AC_SUBST(EXTMSV80)
 
 dnl ===================================================================
 dnl Check for system NSS
@@ -8260,25 +8100,18 @@ else
     BUILD_TYPE="$BUILD_TYPE NSS"
     AC_MSG_RESULT([internal])
     if test "$build_os" = "cygwin"; then
-        AC_MSG_CHECKING([for Mozilla build tooling. Required for nss and/or mozilla])
-        if test -z "$MOZILLABUILD"; then
-            AC_MSG_ERROR([Mozilla build tooling not found.
-Use the --with-mozilla-build option after installing the tools obtained
+        AC_MSG_CHECKING([for nss build tooling]) # coming from mozilla
+        if test -z "$NSSBUILDTOOLS"; then
+            AC_MSG_ERROR([nss build tooling not provided
+Use the --with-nss-build option after installing the tools obtained
 from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
         else
-            if test \( "$WITH_MINGW" = "yes" \); then
-                if test ! -d "$MOZILLABUILD"; then
-                    AC_MSG_ERROR([Mozilla build tooling incomplete!])
-                else
-                    AC_MSG_RESULT([ok])
-                fi
+            if test \( "$WITH_MINGW" = "yes" -a  ! -d "$NSSBUILDTOOLS" \) \
+                    -o ! -d "$NSSBUILDTOOLS/moztools" \
+                    -o ! -d "$NSSBUILDTOOLS/msys" ; then
+                AC_MSG_ERROR([nss build tooling incomplete!])
             else
-                if test ! -d "$MOZILLABUILD/moztools" \
-                        -o ! -d "$MOZILLABUILD/msys"; then
-                    AC_MSG_ERROR([Mozilla build tooling incomplete!])
-                else
-                    AC_MSG_RESULT([ok])
-                fi
+                AC_MSG_RESULT([ok])
             fi
         fi
     fi
@@ -8286,7 +8119,8 @@ fi # system nss
 AC_SUBST(SYSTEM_NSS)
 AC_SUBST(NSS_CFLAGS)
 AC_SUBST(NSS_LIBS)
-AC_SUBST([MINGW_SMIME3_DLL])
+AC_SUBST(NSSBUILDTOOLS)
+AC_SUBST(MINGW_SMIME3_DLL)
 
 dnl ===================================================================
 dnl Check for system mozilla headers
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 08cae215e1b3..701ddff01816 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -118,11 +118,7 @@ endif
 
 ifeq ($(OS),WNT)
 
-ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA))),YES),YES)
-$(eval $(call gb_Module_add_targets,connectivity,\
-	Library_mozbootstrap \
-))
-else
+ifeq ($(WITH_MOZAB4WIN),YES)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_mozab \
 	Library_mozab \
diff --git a/moz/README b/moz/README
index 939f8fcbe206..50a639abab63 100644
--- a/moz/README
+++ b/moz/README
@@ -1,6 +1,6 @@
-Used for security features, if nss is not available.
+Used only for building Windows Address book connectivity.
 
 Rebuild moz whenever changes have been made in the nss module. Those libs are
-merged into mozruntime.zip which is build in this project.
+merged into mozruntime.zip which is built in this project.
 
 Please read, please read about [[nss]].
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index 44822a6965ca..7c872a913ec2 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -35,23 +35,12 @@ INCLUDE_DIR=$(INCCOM)
 BIN_RUNTIMELIST= \
     xpcom \
     xpcom_core \
-    xpcom_compat	
-
-.IF "$(GUI)"=="WNT"
-BIN_RUNTIMELIST+=	\
+    xpcom_compat \
     js3250 	\
     mozz	\
     msgbsutl	\
     nsldap32v50		\
     nsldappr32v50
-.ELSE	#"$(GUI)"=="WNT"
-BIN_RUNTIMELIST+=	\
-    mozjs	\
-    mozz	\
-    msgbaseutil	\
-    ldap50	\
-    prldap50
-.ENDIF
 
 COMPONENT_RUNTIMELIST=	\
     addrbook	\
@@ -64,17 +53,9 @@ COMPONENT_RUNTIMELIST=	\
     uconv	\
     vcard	\
     i18n 	\
-    pipnss
-
-.IF "$(GUI)"=="WNT"
-COMPONENT_RUNTIMELIST+=	\
+    pipnss  \
     xppref32	\
     xpc3250
-.ELSE	#"$(GUI)"=="WNT"
-COMPONENT_RUNTIMELIST+=	\
-    pref	\
-    xpconnect
-.ENDIF
 
 COMREGISTRY_FILELIST=	\
     necko_dns.xpt	\
@@ -86,13 +67,8 @@ COMREGISTRY_FILELIST=	\
     xpcom_xpti.xpt	\
     addrbook.xpt	\
     mozldap.xpt \
-    pref.xpt
-
-.IF "$(GUI)"=="WNT"
-COMREGISTRY_FILELIST+=	xpcom_thread.xpt
-.ELSE	#"$(GUI)"=="WNT"
-COMREGISTRY_FILELIST+=	xpcom_threads.xpt
-.ENDIF
+    pref.xpt  \
+	xpcom_thread.xpt
 
 DEFAULTS_RUNTIMELIST=	\
     defaults$/pref$/browser-prefs.js	\
@@ -104,18 +80,6 @@ DEFAULTS_RUNTIMELIST=	\
     greprefs$/all.js	\
     greprefs$/security-prefs.js
 
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-
-LIBLIST=	\
-    libembed_base_s.a	\
-    libmozreg_s.a	\
-    libnslber32v50.a	\
-    libnsldap32v50.a	\
-    libxpcom_core.dll.a	\
-    libxpcom.dll.a
-
-.ELSE
 
 LIBLIST=	\
     embed_base_s.lib	\
@@ -125,30 +89,11 @@ LIBLIST=	\
     xpcom_core.lib	\
     xpcom.lib
 
-.ENDIF
-
-.ELSE   #"$(GUI)"=="WNT"
-
-LIBLIST=	\
-    libembed_base_s.a	\
-    libmozreg_s.a	\
-    liblber50.a	\
-    libxpcom_core$(DLLPOST)	\
-    libxpcom$(DLLPOST)	\
-    libmsgbaseutil$(DLLPOST)	\
-    libldap50$(DLLPOST)
-
-.ENDIF #"$(GUI)"=="WNT"
-
 INCLUDE_PATH=$(MOZ_DIST_DIR)$/include$/
 PUBLIC_PATH=$(MOZ_DIST_DIR)$/public$/
 
 
-.IF "$(GUI)"=="WNT"
 REG_SUBFIX=	.exe
-.ELSE	#"$(GUI)"=="WNT"
-REG_SUBFIX=
-.ENDIF
 
 # --- Targets ------------------------------------------------------
 
@@ -177,18 +122,6 @@ $(MISC)$/build$/so_moz_runtime_files: 	$(OUT)$/bin$/mozruntime.zip
     $(foreach,file,$(BIN_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$(file)$(DLLPOST) \
     $(RUNTIME_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
     echo >& $(NULLDEV)
-.IF "$(GUI)" == "UNX"
-    $(foreach,file,$(BIN_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$(file)$(DLLPOST) \
-    $(LIB_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
-    echo >& $(NULLDEV)
-.ENDIF # .IF "$(GUI)" == "UNX"
-
-# copy files in RES_FILELIST
-.IF "$(OS)"=="SOLARIS"
-    @$(COPY) $(MOZ_BIN_DIR)$/res$/charsetalias.properties $(RUNTIME_DIR)$/res$/charsetalias.properties
-.ELSE
-    @echo No Res Files to copy.
-.ENDIF
 
 # copy files in COMPONENT_RUNTIMELIST
     $(foreach,file,$(COMPONENT_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/components$/$(DLLPRE)$(file)$(DLLPOST) \
@@ -207,34 +140,6 @@ $(MISC)$/build$/so_moz_runtime_files: 	$(OUT)$/bin$/mozruntime.zip
     $(foreach,file,$(DEFAULTS_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(file) $(RUNTIME_DIR)$/$(file) &&) \
     echo >& $(NULLDEV)
 
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
-    cd $(RUNTIME_DIR) && strip *$(DLLPOST)
-    cd $(RUNTIME_DIR)$/components && strip *$(DLLPOST)
-.ENDIF
-.ENDIF
-.IF "$(OS)"=="MACOSX"
-    $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl shl OOO \
-        $(RUNTIME_DIR)$/*$(DLLPOST)
-# A crude hack to adapt all the absolute ("@executable_path") dependencies to
-# relative ("@loader_path") ones:
-    $(foreach,file,$(shell ls $(RUNTIME_DIR)$/components$/*$(DLLPOST)) \
-        install_name_tool \
-        -change @executable_path/libldap50.dylib \
-            @loader_path/../libldap50.dylib \
-        -change @executable_path/libmozjs.dylib @loader_path/../libmozjs.dylib \
-        -change @executable_path/libmozz.dylib @loader_path/../libmozz.dylib \
-        -change @executable_path/libmsgbaseutil.dylib \
-            @loader_path/../libmsgbaseutil.dylib \
-        -change @executable_path/libprldap50.dylib \
-            @loader_path/../libprldap50.dylib \
-        -change @executable_path/libxpcom.dylib @loader_path/../libxpcom.dylib \
-        -change @executable_path/libxpcom_compat.dylib \
-            @loader_path/../libxpcom_compat.dylib \
-        -change @executable_path/libxpcom_core.dylib \
-            @loader_path/../libxpcom_core.dylib \
-        $(file) &&) true
-.ENDIF
 
 # zip runtime files to mozruntime.zip
     cd $(RUNTIME_DIR) && zip -r ..$/..$/bin$/mozruntime.zip *
@@ -246,17 +151,8 @@ $(INCCOM)$/nsBuildID.h: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
 
 
 $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
-.IF "$(OS)"!="SOLARIS"
-    $(GNUCOPY) -pRL $(INCLUDE_PATH)* $(INCLUDE_DIR)
-    $(GNUCOPY) -pRL $(PUBLIC_PATH)* $(INCLUDE_DIR)
-.ELSE			# "$(OS)"!="SOLARIS"
     $(COPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
     $(COPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
-.ENDIF			# "$(OS)"!="SOLARIS"
-
-.IF "$(GUI)"=="UNX"
-    chmod -R 775 $(INCCOM)
-.ENDIF
     $(TOUCH) $@
 
 # On UNX the rules for so_moz_runtime_files copy files into the same directory
@@ -267,13 +163,6 @@ $(MISC)$/build$/so_moz_lib_files:		$(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file)
     $(foreach,file,$(LIBLIST) $(COPY) $(MOZ_DIST_DIR)$/lib$/$(file) \
     $(LIB_DIR)$/$(file) &&) \
     echo >& $(NULLDEV)
-.IF "$(OS)"=="MACOSX"
-    $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl shl OOO \
-        $(LIB_DIR)$/*$(DLLPOST)
-.ENDIF
-.IF "$(GUI)"=="UNX"
-    chmod -R 775 $(LB)
-.ENDIF
     $(TOUCH) $@
 
 $(BIN_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
@@ -288,23 +177,11 @@ $(COMREGISTRY_FILELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
 $(DEFAULTS_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
     @$(COPY) $(MOZ_BIN_DIR)$/$@ $(RUNTIME_DIR)$/$@
 
-RES_FILELIST: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
-.IF "$(OS)"=="SOLARIS"
-    @$(COPY) $(MOZ_BIN_DIR)$/res$/charsetalias.properties $(RUNTIME_DIR)$/res$/charsetalias.properties
-.ELSE
-    @echo No Res Files to copy.
-.ENDIF
-
 $(LIB_DIR)$/%: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
     noop
 
 $(MISC)$/CREATETARBALL:	extract_mozab_files
     @@-$(MKDIR)	$(OUT)$/zipped
     $(COPY) $(BIN)$/mozruntime.zip $(OUT)$/zipped$/$(MOZTARGET)runtime.zip
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"!="MACOSX"
-    cd $(LB) && strip *$(DLLPOST)
-.ENDIF
-.ENDIF
     cd $(LB) && zip -r ..$/zipped$/$(MOZTARGET)lib.zip *
     cd $(INCCOM) && zip -r ..$/zipped$/$(MOZTARGET)inc.zip *
diff --git a/moz/makefile.mk b/moz/makefile.mk
index a30c87ec1dcb..e7c8528d6516 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -53,20 +53,6 @@ LD_LIBRARY_PATH!:=$(LD_LIBRARY_PATH)$(PATH_SEPERATOR)$(PKGCONFIG_ROOT)$/lib
 DISABLE_MOZ_EXECUTABLE=TRUE
 .EXPORT : DISABLE_MOZ_EXECUTABLE
 
-.IF "$(OS)"=="AIX"
-LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
-.EXPORT : LDFLAGS
-.ENDIF
-
-.IF "$(SYSBASE)"!="" && "$(OS)" == "LINUX"
-## hmm... rather gcc specific switches...
-CFLAGS:=-isystem $(SYSBASE)/usr/include -B$(SYSBASE)/usr/lib
-LDFLAGS:= -Wl,--unresolved-symbols=ignore-in-shared-libs -L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -L$(SYSBASE)/usr/X11R6/lib
-SYSBASE_X11:=--x-includes=$(SYSBASE)/usr/include/X11 --x-libraries=$(SYSBASE)/usr/X11R6/lib
-MOZ_ENABLE_COREXFONTS=1
-MOZILLA_CONFIGURE_FLAGS +=--disable-xft
-.EXPORT : CFLAGS LDFLAGS MOZ_ENABLE_COREXFONTS
-.ENDIF         # "$(SYSBASE)"!="" && "$(OS)" == "LINUX"
 
 # ----- pkg-config end -------
 
@@ -79,34 +65,20 @@ PATCH_FILES = \
     seamonkey-source-$(MOZILLA_VERSION).patch \
     patches/dtoa.patch \
     patches/respect_disable_pango.patch \
-    patches/arm_build_fix.patch \
     patches/link_fontconfig.patch \
     patches/brokenmakefile.patch \
-    patches/aix_build_fix.patch \
     patches/libpr0n_build_fix.patch \
-    patches/macosx_build_fix.patch \
-    patches/nss-linux3.patch \
     patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
     patches/clang_missing_this_pointers.patch \
     patches/seamonkey-1.1.14.source-macosx10.6and7.patch \
-    patches/ssl-linux-no_as_needed_linker_option.patch
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
-.IF "$(COM)"=="GCC"
-LIBIDL_VC71_ZIPFILE_NAME*=vc71-libIDL-0.6.8-bin.zip
-LIBGLIB_VC71_ZIPFILE_NAME*=vc71-glib-1.2.10-bin.zip
-MOZTOOLS_ZIPFILE_NAME*=wintools.zip
-.ELSE
 MOZTOOLS_ZIPFILE_NAME*=vc8-moztools.zip
-.ENDIF
 
 ADDITIONAL_FILES=mailnews$/addrbook$/src$/nsAbMD5sum.cpp
 
 CONFIGURE_DIR=
-.IF "$(GUIBASE)"!="aqua"
-MOZILLA_CONFIGURE_FLAGS += $(SYSBASE_X11)
-.ENDIF
 
 MOZILLA_CONFIGURE_FLAGS +=  --disable-tests \
                 --enable-application=suite \
@@ -146,19 +118,6 @@ MOZILLA_CONFIGURE_FLAGS +=  --disable-tests \
 MOZILLA_CONFIGURE_FLAGS += \
                 --with-nss-prefix=$(OUTDIR) \
                 --with-nspr-prefix=$(OUTDIR)
-
-.IF "$(OS)"=="MACOSX"
-# help the linker to resolve @loader_path to the solver (needed at least for 10.4 / XCode 2.5)
-LDFLAGS+=$(foreach,name,$(echo nspr4 nss3 nssutil3 plc4 plds4) -Wl,-dylib_file,@loader_path/lib$(name).dylib:$(OUTDIR)/lib/lib$(name).dylib)
-.ENDIF
-.ENDIF
-
-# how can we do it only on Debian/Ubuntu?
-.IF "$(OS)"=="LINUX"
-.IF "$(COM)"=="GCC"
-LDFLAG_NO_AS_NEEDED=-Wl,--no-as-needed
-.EXPORT : LDFLAG_NO_AS_NEEDED
-.ENDIF
 .ENDIF
 
 #disable profilelocking to share profile with mozilla
@@ -166,25 +125,6 @@ LDFLAG_NO_AS_NEEDED=-Wl,--no-as-needed
 #disable gnomevfs to remove the needed of gnome develop files
 #disable others to save build times
 
-.IF "$(GUI)"=="UNX"
-.IF "$(GUIBASE)"=="aqua"
-MOZILLA_CONFIGURE_FLAGS+= \
-    --with-macos-sdk=$(MACOSX_SDK_PATH) \
-    --disable-glibtest \
-    --enable-macos-target=$(MACOSX_DEPLOYMENT_TARGET) \
-    --disable-libxul \
-    --prefix=/@.__________________________________________________$(EXTRPATH)
-DEFAULT_MOZILLA_TOOLKIT=mac
-
-.ELSE
-#We do not need mozilla ui, but libIDL version are decided by default toolkit.
-#default-toolkit=xlib need libIDL < 0.68
-#default-toolkit=gtk2 need libIDL > 0.8 (know as libIDL2)
-DEFAULT_MOZILLA_TOOLKIT*=gtk2
-.ENDIF # "$(GUIBASE)"=="aqua"
-MOZILLA_CONFIGURE_FLAGS+= --enable-default-toolkit=$(DEFAULT_MOZILLA_TOOLKIT)
-.ENDIF
-
 # create a objdir build = build files in a seperate directory, not in the sourcetree directly
 CONFIGURE_DIR=$(CPU)_objdir
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -194,42 +134,9 @@ CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(
 
 BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS)
 
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CXXFLAGS:=-features=tmplife
-.IF "$(CPU)"=="U"
-CXXFLAGS+=-m64
-.ENDIF
-.EXPORT : CXXFLAGS
-.ENDIF          # "$(COMNAME)"=="sunpro5"
-.ENDIF
-
-.IF "$(COM)" == "GCC"
-CXXFLAGS+=-fpermissive
-.IF "$(OS)$(CPUNAME)" == "LINUXPOWERPC64"
-CXXFLAGS+=-mminimal-toc
-.ENDIF
-.EXPORT : CXXFLAGS
-.ENDIF
-
-.IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
-PKG_CONFIG_PATH=/usr/lib/64/pkgconfig
-.EXPORT: PKG_CONFIG_PATH
-MAKE=/usr/sfw/bin/gmake
-.EXPORT: MAKE
-CFLAGS=-I/usr/sfw/include
-.EXPORT: CFLAGS
-.ENDIF
-.IF "$(COM)"=="C52" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
-CFLAGS=-m64
-ASFLAGS=-m64
-.EXPORT: CFLAGS ASFLAGS
-.ENDIF
-
 MOZDIR=$(MISC)$/build$/seamonkey
 MOZTARGET=$(OS)$(COM)$(CPU)
 
-.IF "$(GUI)"=="WNT"
 # "Our" build environment uses "NO" for the environment variable that
 # indicate if system libraries should be used, the mozilla build uses
 # "" in this case. This conflicts (at least for W32) with mozilla (1.7b)
@@ -245,67 +152,40 @@ SYSTEM_JPEG:=
 .EXPORT : SYSTEM_JPEG
 .ENDIF
 
-# For W32-tcsh CC and CXX must not contain the wrapper, and W32-4nt ( in
-# some cases ) doesn't work with DOS path notation when building mozilla.
-.IF "$(COM)"=="GCC"
-CC:=$(CC:s/guw.exe //:s/ -mno-cygwin//)
-CXX:=$(CXX:s/guw.exe //:s/ -mno-cygwin//)
-CPP:=$(CC) -E
-LD:=ld
-LIBS:=-lsupc++
-.EXPORT : CPP LIBS
-.ELSE
 CC:=cl.exe
 CXX:=cl.exe
-.ENDIF
 
 # Variables to install/use our own wintools
-.IF "$(COM)"=="GCC"
-MOZTOOLSUNPACK:=$(MISC)$/build$/moztoolsunpack
-MOZTOOLSINST:=$(MISC)$/build$/moztoolsinst
-.ELSE
 MOZTOOLS_EXTRACT:=$(MISC)$/build$/moztools
-.ENDIF
-.IF "$(COM)"=="GCC"
-MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztoolsinst
-PATH!:=$(PATH):$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(shell @cygpath $(MOZ_TOOLS_DOS))/vc71/bin
-SET_MOZ_TOOLS_INSTALL_BAT:=export "MOZ_TOOLS=$(MOZ_TOOLS_DOS)"
-.ELSE
 MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztools\vc8-moztools
 PATH!:=$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(PATH)
-.ENDIF
 
 MOZ_TOOLS:=$(subst,\,/ $(MOZ_TOOLS_DOS))
-.IF "$(COM)"=="GCC"
-GLIB_PREFIX:=$(MOZ_TOOLS)/vc71
-LIBIDL_PREFIX:=$(MOZ_TOOLS)/vc71
-.EXPORT : GLIB_PREFIX LIBIDL_PREFIX
-.ENDIF
 
 .EXPORT : PATH MOZ_TOOLS
-.ENDIF # "$(GUI)"=="WNT"
 
 # --- Targets ------------------------------------------------------
 
 .IF "$(BUILD_MOZAB)"==""
 all:
+    @echo "Never Build Mozilla but copy runtime files $(MSVC80_DLL_DIR) ."
     @echo "Never Build Mozilla but copy runtime files."
     @@-$(MKDIR) $(OUT)$/zipped
-    $(COPY) $(MOZ_ZIP_INC) $(OUT)$/zipped$/
-    $(COPY) $(MOZ_ZIP_LIB) $(OUT)$/zipped$/
-    $(COPY) $(MOZ_ZIP_RUNTIME) $(OUT)$/zipped$/
+    $(COPY) $(TARFILE_LOCATION)$/$(MOZ_ZIP_INC) $(PRJ)$/zipped$/
+    $(COPY) $(TARFILE_LOCATION)$/$(MOZ_ZIP_LIB) $(PRJ)$/zipped$/
+    $(COPY) $(TARFILE_LOCATION)$/$(MOZ_ZIP_RUNTIME) $(PRJ)$/zipped$/
+.IF "$(EXTMSV80)"!=""
     $(COPY) $(MSVC80_MNFST) $(EXTMSV80)$/Microsoft.VC80.CRT.manifest
     $(COPY) $(MSVC80_DLL_DIR)$/msvcp80.dll $(EXTMSV80)$/
     $(COPY) $(MSVC80_DLL_DIR)$/msvcr80.dll $(EXTMSV80)$/
 .ENDIF    
+.ENDIF    
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
-.IF "$(GUI)"=="WNT"
 NEEDWINTOOLSFLAGFILE:=$(MISC)$/build$/moztools.complete
-.ENDIF # "$(GUI)"=="WNT"
 
 ALLTAR: $(NEEDWINTOOLSFLAGFILE) \
     $(MISC)$/remove_build.flag \
@@ -321,32 +201,8 @@ $(MISC)$/remove_build.flag : $(PATCH_FILES)
     $(TOUCH) $(MISC)$/remove_build.flag
 
 # Unpack/setup Windows build tools
-.IF "$(GUI)"=="WNT"
 $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(MISC)$/build$/moztools.complete
 
-.IF "$(COM)"=="GCC"
-$(MISC)$/build$/moztools.unpack : $(PRJ)$/download$/$(MOZTOOLS_ZIPFILE_NAME)
-    -$(RENAME) $(MOZTOOLSUNPACK) $(MOZTOOLSUNPACK)_removeme
-    -$(RENAME) $(MOZTOOLSINST) $(MOZTOOLSINST)_removeme
-    -rm -rf $(MOZTOOLSUNPACK)_removeme $(MOZTOOLSINST)_removeme
-    @-$(MKDIRHIER) $(MOZTOOLSUNPACK)
-    unzip $(PRJ)$/download$/$(MOZTOOLS_ZIPFILE_NAME) -d $(MOZTOOLSUNPACK)
-    $(TOUCH) $(MISC)$/build$/moztools.unpack
-
-$(MISC)$/build$/moztools.install : $(MISC)$/build$/moztools.unpack
-    cd $(MOZTOOLSUNPACK)$/buildtools$/windows && $(SET_MOZ_TOOLS_INSTALL_BAT) && cmd /c install.bat
-    $(TOUCH) $(MISC)$/build$/moztools.install
-
-$(MISC)$/build$/moztools.complete : \
-  $(MISC)$/build$/moztools.install \
-  $(PRJ)$/download$/$(LIBIDL_VC71_ZIPFILE_NAME) \
-  $(PRJ)$/download$/$(LIBGLIB_VC71_ZIPFILE_NAME)
-    unzip $(PRJ)$/download$/$(LIBIDL_VC71_ZIPFILE_NAME) -d $(MOZTOOLSINST)
-    unzip $(PRJ)$/download$/$(LIBGLIB_VC71_ZIPFILE_NAME) -d $(MOZTOOLSINST)
-# chmod is also needed for W32-4nt build (when cygwin unzip is used)
-    -chmod -R +x $(MOZTOOLSINST)$/vc71$/bin
-    $(TOUCH) $(MISC)$/build$/moztools.complete
-.ELSE
 $(MISC)$/build$/moztools.unpack : $(PRJ)$/download$/$(MOZTOOLS_ZIPFILE_NAME)
     -$(RENAME) $(MOZTOOLS_EXTRACT) $(MOZTOOLS_EXTRACT)_removeme
     -rm -rf $(MOZTOOLS_EXTRACT)_removeme
@@ -358,100 +214,8 @@ $(MISC)$/build$/moztools.unpack : $(PRJ)$/download$/$(MOZTOOLS_ZIPFILE_NAME)
 
 $(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack
     $(TOUCH) $(MISC)$/build$/moztools.complete
-.ENDIF
-.ENDIF # "$(GUI)"=="WNT"
 
 zip:    \
     $(MISC)$/CREATETARBALL
 
-.IF "$(GUIBASE)"=="aqua" && "$(CREATE_UNIVERSAL_MAC_MOZ_ZIP)"!=""
-MOZ_ARCH=$(eq,$(CPU),I i386 ppc)
-MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8)
-
-force_clean :
-    @$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI)
-
-zip_intel .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL
-
-zip_ppc .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL
-
-# target-conditionals, when building target -> Macro is set
-zip_intel ?= MOZ_ARCH=i386
-zip_intel ?= MOZILLA_CONFIGURE_FLAGS+=--target=i386-apple-darwin8
-zip_intel ?= CPU=I
-
-zip_ppc ?= MOZ_ARCH=ppc
-zip_ppc ?= MOZILLA_CONFIGURE_FLAGS+=--target=powerpc-apple-darwin8
-zip_ppc ?= CPU=P
-
-zip_universal: $(OUT)$/zipped$/$(OS)$(COM)UBinc.zip $(OUT)$/zipped$/$(OS)$(COM)UBlib.zip $(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip
-    @echo "All zips created successfully - copy from $(OUT)$/zipped to \$$SRC_ROOT/moz/zipped and use --disable-build-mozilla to use them"
-
-$(OUT)$/zipped$/$(OS)$(COM)UBinc.zip : zipped$/$(OS)$(COM)Pinc.zip zipped$/$(OS)$(COM)Iinc.zip
-    @echo "setting up for $@"
-    @rm -rf $(MISC)$/UB_inc
-    @$(MKDIRHIER) $(MISC)$/UB_inc$/intel
-    @$(MKDIR) $(MISC)$/UB_inc$/ppc
-    @$(MKDIR) $(MISC)$/UB_inc$/uni
-    @unzip -q zipped$/$(OS)$(COM)Pinc.zip -d $(MISC)$/UB_inc$/ppc
-    @unzip -q zipped$/$(OS)$(COM)Iinc.zip -d $(MISC)$/UB_inc$/intel
-# use one of the two as basis for the universal one - (saves manually creating directories/copying identical files)
-    @unzip -q zipped$/$(OS)$(COM)Pinc.zip -d $(MISC)$/UB_inc$/uni
-# add safety-warning to host-autogenerated headers (aren't used anywhere in OOo currently, but doesn't hurt to be safe
-# bail out on everything that differs and is not a *.h file
-    @echo "flagging endian-specific headers with #error.."
-    @diff --brief -r $(MISC)$/UB_inc$/ppc $(MISC)$/UB_inc$/intel | awk \
-      '/^Only in/ {{print; print "ERROR - file sets differ!"; exit 1}} \
-       /^Files .*\.h differ$$/ {{target="$(MISC)$/UB_inc$/uni$/" substr($$2,length("$(MISC)$/UB_inc$/ppc")+2); \
-         system("echo \"#error use native moz-zips, this header is endian-specific!\" | cat - " $$2 " > " target); next}} \
-                  {{print; print "ERROR - unexpected files encountered!"; exit 2}}'
-    @cd $(MISC)$/UB_inc$/uni ; zip -q -r ..$/$(@:f) *
-    @$(MKDIRHIER) $(@:d)
-    @$(MV) $(MISC)$/UB_inc$/$(@:f) $@
-    @echo "successfully created $@"
-
-$(OUT)$/zipped$/$(OS)$(COM)UBlib.zip : zipped$/$(OS)$(COM)Plib.zip zipped$/$(OS)$(COM)Ilib.zip
-    @echo "setting up for $@"
-    @rm -rf $(MISC)$/UB_lib
-    @$(MKDIRHIER) $(MISC)$/UB_lib$/intel
-    @$(MKDIR) $(MISC)$/UB_lib$/ppc
-    @$(MKDIR) $(MISC)$/UB_lib$/uni
-    @unzip -q zipped$/$(OS)$(COM)Plib.zip -d $(MISC)$/UB_lib$/ppc
-    @unzip -q zipped$/$(OS)$(COM)Ilib.zip -d $(MISC)$/UB_lib$/intel
-# use lipo on .a and .dylib files - bail out on anything else
-    @echo "creating universal binaries from libs..."
-    @diff --brief -s -r $(MISC)$/UB_lib$/ppc $(MISC)$/UB_lib$/intel | awk \
-      '/^Only in/ {{print "ERROR - file sets differ!"; print; exit 1}} \
-       /^Files .*\.(a|dylib) differ$$/ {{target="$(MISC)$/UB_lib$/uni$/" substr($$2,length("$(MISC)$/UB_lib$/ppc")+2); \
-         if(0!=system("lipo -create -arch ppc "$$2" -arch i386 "$$4" -output " target)) exit 11; next}} \
-                  {{print; print "ERROR - unexpected files encountered!"; exit 2}}'
-    @cd $(MISC)$/UB_lib$/uni ; zip -q -r ..$/$(@:f) *
-    @$(MKDIRHIER) $(@:d)
-    @$(MV) $(MISC)$/UB_lib$/$(@:f) $@
-    @echo "successfully created $@"
-
-$(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip : zipped$/$(OS)$(COM)Pruntime.zip zipped$/$(OS)$(COM)Iruntime.zip
-    @echo "setting up for $@"
-    @rm -rf $(MISC)$/UB_runtime
-    @$(MKDIRHIER) $(MISC)$/UB_runtime$/intel
-    @$(MKDIR) $(MISC)$/UB_runtime$/ppc
-    @$(MKDIR) $(MISC)$/UB_runtime$/uni
-    @unzip -q zipped$/$(OS)$(COM)Pruntime.zip -d $(MISC)$/UB_runtime$/ppc
-    @unzip -q zipped$/$(OS)$(COM)Iruntime.zip -d $(MISC)$/UB_runtime$/intel
-# use one of the two as basis for the universal one - (saves manually creating directories/copying identical files)
-    @unzip -q zipped$/$(OS)$(COM)Pruntime.zip -d $(MISC)$/UB_runtime$/uni
-# @line -comments in autogenerated files: contains path of source-file, ignore different objdirs
-    @echo "creating universal binaries from libs..."
-    @diff --brief -I "^//@line [0-9][0-9]*" -r $(MISC)$/UB_runtime$/ppc $(MISC)$/UB_runtime$/intel | awk \
-      '/^Only in/ {{print; print "ERROR - file sets differ!"; exit 1}} \
-           /^Files .*\.dylib differ$$/ {{target="$(MISC)$/UB_runtime$/uni$/" substr($$2,length("$(MISC)$/UB_runtime$/ppc")+2); \
-             if(0!=system("lipo -create -arch ppc "$$2" -arch i386 "$$4" -output " target)) exit 11; next}} \
-                      {{print; print "ERROR - unexpected files encountered!"; exit 2}}'
-    @cd $(MISC)$/UB_lib$/uni ; zip -q -r ..$/$(@:f) *
-    @$(MKDIRHIER) $(@:d)
-    @$(MV) $(MISC)$/UB_lib$/$(@:f) $@
-    @echo "successfully created $@"
-
-.ENDIF # $(GUIBASE)=="aqua"
-
 .INCLUDE : extractfiles.mk
diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk
index 13c44acc69e0..58e0ab281f61 100644
--- a/moz/zipped/makefile.mk
+++ b/moz/zipped/makefile.mk
@@ -36,7 +36,7 @@ TARGET=moz_unzip
 
 # --- Files --------------------------------------------------------
 
-.IF "$(PREBUILD_MOZAB)" == "" || "$(SYSTEM_MOZILLA)" == "YES" || "$(WITH_MOZILLA)" == "NO"
+.IF "$(WITH_MOZAB4WIN)" == "NO"
 
 dummy:
     @echo "No need to unpack the prebuilt mozab packages"
@@ -44,7 +44,7 @@ dummy:
 .ELSE # unpack mozab zips
 .INCLUDE :  target.mk
 
-.IF "$(BUILD_MOZAB)"=="TRUE"
+.IF "$(BUILD_MOZAB)"=="NO"
 ALLTAR:
     @echo "Does not need build mozab zipped!"
 .ELSE
@@ -53,18 +53,7 @@ ALLTAR: \
     $(MISC)$/unpacked_$(TARGET)_lib \
     $(BIN)$/mozruntime.zip \
     $(MISC)$/remove_old_nss_libs
-.ENDIF
-.IF "$(GUI)" == "UNX"
-
-$(MISC)$/unpacked_%_lib : $(OS)$(COM)$(CPU)lib.zip '$(OS)$(COM)$(CPU)runtime.zip'
-    unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip && $(TOUCH) $@
-    chmod -R 775 $(LB)
-
-$(MISC)$/unpacked_%_inc : $(OS)$(COM)$(CPU)inc.zip
-    unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH)	$@
-    chmod -R 775 $(INCCOM)
-
-.ELSE
+.ENDIF # BUILD_MOZAB 
 
 $(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip
     unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && \
@@ -73,51 +62,14 @@ $(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip
 $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
     unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH)	$@
 
-.ENDIF
+.ENDIF # WITH_MOZAB4WIN
 
 $(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip
     $(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
 
-# add alternative rules for universal binary moz-zips
-.IF "$(GUIBASE)" == "aqua"
-$(MISC)$/unpacked_%_lib : $(OS)$(COM)UBlib.zip '$(OS)$(COM)UBruntime.zip'
-    unzip -o -d $(LB) $(OS)$(COM)UBlib.zip && unzip -o -d $(LB) $(OS)$(COM)UBruntime.zip && $(TOUCH) $@
-    chmod -R 775 $(LB)
-  
-$(MISC)$/unpacked_%_inc : $(OS)$(COM)UBinc.zip
-    unzip -o -d $(INCCOM) $(OS)$(COM)UBinc.zip && $(TOUCH)	$@
-    chmod -R 775 $(INCCOM)
-
-$(BIN)$/mozruntime%zip : $(OS)$(COM)UBruntime.zip
-    $(COPY) $(OS)$(COM)UBruntime.zip $(BIN)$/mozruntime.zip
-
-.ENDIF # "$(GUIBASE)"=="aqua"
-
-LIBLIST =
 
 # The old prebuilt moz files include all the old NSS stuff from moz but we
 # always build the toplevel nss module, so we must delete all these
-NSS_RUNTIMELIST= \
-    freebl3 \
-    nspr4 \
-    plc4 \
-    plds4 \
-    nss3 \
-    ssl3 \
-    softokn3 \
-    smime3
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-LIBLIST= \
-    libnspr4.a \
-    libnss3.a \
-    libsmime3.a \
-    libplc4.a \
-    libplds4.a \
-    libssl3.a
-
-.ELSE
 LIBLIST= \
     nspr4.lib \
     plc4.lib \
@@ -125,19 +77,6 @@ LIBLIST= \
     nss3.lib \
     ssl3.lib\
     smime3.lib
-.ENDIF
-.ELSE   #"$(GUI)"=="WNT"
-LIBLIST= \
-    libfreebl3$(DLLPOST) \
-    libnspr4$(DLLPOST) \
-    libsoftokn3$(DLLPOST) \
-    libplc4$(DLLPOST) \
-    libplds4$(DLLPOST) \
-    libnss3$(DLLPOST) \
-    libssl3$(DLLPOST) \
-    libsmime3$(DLLPOST)
-
-.ENDIF # .IF "$(GUI)"=="WNT"
 
 NSS_RUNTIMELIST:= \
     freebl3 \
@@ -165,5 +104,3 @@ $(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip
     rm -r -f $(INCCOM)$/nspr && \
         echo >& $(NULLDEV)
     $(TOUCH) $@
-
-.ENDIF   # unpack mozab zips
diff --git a/nss/README b/nss/README
index f11d2575ed15..18267ebcb3a0 100644
--- a/nss/README
+++ b/nss/README
@@ -6,7 +6,7 @@ nss contains the security libraries which are also part of moz. However nss is
 meant to be more current, that is it to be updated more often. This should be
 easier than doing this with moz.
 
-If nss is build depends on an environment variable (SYSTEM_NSS=NO) which
+If nss is built depends on an environment variable (SYSTEM_NSS=NO) which
 is per default set to YES. In this case nss is build before moz. The nss
 libraries/lib files/headers built in moz are then not delivered. Otherwise they
 would overwrite those from nss. That is, the nss libraries build in moz are
diff --git a/nss/makefile.mk b/nss/makefile.mk
index eed291a3289c..b1c38314f9e0 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -181,7 +181,7 @@ PATCH_FILES += \
 	       nss.patch.mingw \
 
 
-PATH!:=$(MOZILLABUILD)/bin:$(PATH)
+PATH!:=$(NSSBUILDTOOLS)/bin:$(PATH)
 
 nss_CC=$(CC)
 nss_CXX=$(CXX)
@@ -217,7 +217,7 @@ OUT2LIB= \
 .ELSE			# "$(COM)"=="GCC"
 MOZ_MSVCVERSION= 9
 .EXPORT : MOZ_MSVCVERSION
-moz_build:=$(shell cygpath -p $(MOZILLABUILD))
+nss_build:=$(shell cygpath -p $(NSSBUILDTOOLS))
 
 #Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll 
 #become libnspr4.dll, libplc4.dll, libplds4.dll
@@ -234,7 +234,7 @@ PASS_USE_64=USE_64=1
 .ENDIF
 
 NSS_BUILD_DIR=$(ABS_PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss
-BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && $(MOZILLABUILD)/msys/bin/bash -i \
+BUILD_ACTION= PATH="$(nss_build)/msys/bin:$(nss_build)/moztools/bin:$(PATH)" && $(NSSBUILDTOOLS)/msys/bin/bash -i \
     -c "cd $(NSS_BUILD_DIR) && make $(PASS_USE_64) nss_build_all"
 
 OUT2LIB= \