Bug 506493 - Resync' configure.in between c-c and m-c; (Fv1-192) Copy bug 545755.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 14 Mar 2010 14:28:55 +0100
changeset 5169 9a24c92bb357ff556173f1f4e3073fa1f22c65a3
parent 5168 89a8752677ffa8aede5a33bb305ddf3cc5f681cd
child 5170 37e3f6432a81c05bb55f5c7dc8576e738d91c993
push id3989
push usersgautherie.bz@free.fr
push dateSun, 14 Mar 2010 13:44:59 +0000
treeherdercomm-central@0f98de542f0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs506493, 545755
Bug 506493 - Resync' configure.in between c-c and m-c; (Fv1-192) Copy bug 545755. r=Callek. Bug 545755 - Update Mozilla stable branches to NSS 3.12.6 and minimal support for RFC 5746
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4266,21 +4266,17 @@ dnl = If NSS was not detected in the sys
 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
-    if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-    AM_PATH_NSS(3.12.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
-    else
     AM_PATH_NSS(3.12.6, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
-    fi
 fi
 
 if test -n "$MOZ_NATIVE_NSS"; then
    NSS_LIBS="$NSS_LIBS -lcrmf"
 else
    NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
    NSS_DEP_LIBS="\
         \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \