diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-30 18:15:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:18:35 +0200 |
| commit | 9a74d53315e569171b4c4efa4ed5b278aa63f83c (patch) | |
| tree | 923779e514dcb882422df8362b938de128615520 /old-configure.in | |
| parent | e2a478072a0c814d4e83e6c46a01c901f1cf3a94 (diff) | |
| download | uxp-9a74d53315e569171b4c4efa4ed5b278aa63f83c.tar.gz | |
Issue #1342 - Remove support for system NSPR/NSS
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/old-configure.in b/old-configure.in index a989519376..530a704716 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2005,26 +2005,9 @@ esac MOZ_CONFIG_NSPR() -dnl ======================================================== -dnl = If NSS was not detected in the system, -dnl = use the one in the source tree (mozilla/security/nss) -dnl ======================================================== - -MOZ_ARG_WITH_BOOL(system-nss, -[ --with-system-nss Use system installed NSS], - _USE_SYSTEM_NSS=1 ) - -if test -n "$_USE_SYSTEM_NSS"; then - AC_MSG_ERROR([Building with system NSS is currently not supported.]) -fi - -if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.41, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) -fi - -if test -z "$MOZ_SYSTEM_NSS"; then - NSS_CFLAGS="-I${DIST}/include/nss" -fi +# TODO: We need to find a better place to define this include +NSS_CFLAGS="-I${DIST}/include/nss" +AC_SUBST(NSS_CFLAGS) if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support @@ -5403,10 +5386,6 @@ AC_SUBST_LIST(MOZ_BZ2_LIBS) AC_SUBST_LIST(MOZ_PNG_CFLAGS) AC_SUBST_LIST(MOZ_PNG_LIBS) -AC_SUBST(MOZ_SYSTEM_NSPR) - -AC_SUBST(MOZ_SYSTEM_NSS) - HOST_CMFLAGS=-fobjc-exceptions HOST_CMMFLAGS=-fobjc-exceptions OS_COMPILE_CMFLAGS=-fobjc-exceptions @@ -5586,8 +5565,6 @@ MC_BASILISK=$MC_BASILISK MC_PALEMOON=$MC_PALEMOON MOZ_EME=$MOZ_EME MOZ_WEBRTC=$MOZ_WEBRTC -MOZ_SYSTEM_NSS=$MOZ_SYSTEM_NSS -MOZ_SYSTEM_NSPR=$MOZ_SYSTEM_NSPR MOZ_SYSTEM_JPEG=$MOZ_SYSTEM_JPEG MOZ_SYSTEM_ZLIB=$MOZ_SYSTEM_ZLIB MOZ_SYSTEM_BZ2=$MOZ_SYSTEM_BZ2 |