diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-01-02 18:10:13 -0500 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-07 09:22:15 +0000 |
| commit | 6eff6fae6272e8ed5d74553597bb4b73db3f2864 (patch) | |
| tree | fc6023495e56a2a512e28f421f9ba1f5d82e26fd /configure.ac | |
| parent | 85e36d2baa54eb7b65cc680389eacb2b5884c100 (diff) | |
Get rid of nsinstall hackery
This removes the need for using NSS Build Tools on windows.
It also removes the nees to build nss for the build system while cross
compiling.
Change-Id: I13c9fdb575223f2940d3e4eda00e77ba9158f2b7
Reviewed-on: https://gerrit.libreoffice.org/1534
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 29cc3929b1ac..0a1fd05a4184 100644 --- a/configure.ac +++ b/configure.ac @@ -8287,22 +8287,6 @@ else NSS_PATCH="5" BUILD_TYPE="$BUILD_TYPE NSS" AC_MSG_RESULT([internal]) - if test "$build_os" = "cygwin"; then - 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-tools option after installing the tools obtained -from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32]) - else - 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 - AC_MSG_RESULT([ok]) - fi - fi - fi fi # system nss AC_SUBST(SYSTEM_NSS) AC_SUBST(NSS_MAJOR) @@ -8310,7 +8294,6 @@ AC_SUBST(NSS_MINOR) AC_SUBST(NSS_PATCH) AC_SUBST(NSS_CFLAGS) AC_SUBST(NSS_LIBS) -AC_SUBST(NSSBUILDTOOLS) AC_SUBST(MINGW_SMIME3_DLL) dnl =================================================================== |