Bug 620788 - Do not silently fall back to bundled NSS/NSPR if system ones can't be used. r=khuey a=bsmedberg

build/autoconf/nspr.m4

@@ -92,6 +92,7 @@ AC_ARG_WITH(nspr-exec-prefix,
 		ifelse([$2], , :, [$2])     
 	else
 		AC_MSG_RESULT(no)
+		ifelse([$3], , :, [$3])
 	fi
 
 

build/autoconf/nss.m4

@@ -73,6 +73,7 @@ AC_ARG_WITH(nss-exec-prefix,
 		ifelse([$2], , :, [$2])     
 	else
 		AC_MSG_RESULT(no)
+		ifelse([$3], , :, [$3])
 	fi
 
 

configure.in

@@ -4617,7 +4617,7 @@ MOZ_ARG_WITH_BOOL(system-nspr,
     _USE_SYSTEM_NSPR=1 )
 
 if test -n "$_USE_SYSTEM_NSPR"; then
-    AM_PATH_NSPR(4.8.7, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
+    AM_PATH_NSPR(4.8.7, [MOZ_NATIVE_NSPR=1], [AC_MSG_ERROR([your don't have NSPR installed or your version is too old])])
 fi
 
 if test -n "$MOZ_NATIVE_NSPR"; then
@@ -4694,7 +4694,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
     _USE_SYSTEM_NSS=1 )
 
 if test -n "$_USE_SYSTEM_NSS"; then
-    AM_PATH_NSS(3.12.9, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+    AM_PATH_NSS(3.12.9, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
 fi
 
 if test -n "$MOZ_NATIVE_NSS"; then

js/src/build/autoconf/nspr.m4

@@ -92,6 +92,7 @@ AC_ARG_WITH(nspr-exec-prefix,
 		ifelse([$2], , :, [$2])     
 	else
 		AC_MSG_RESULT(no)
+		ifelse([$3], , :, [$3])
 	fi
 
 

js/src/configure.in

@@ -4564,12 +4564,7 @@ fi
 dnl Top-level Mozilla switched to requiring NSPR 4.8.6 (bug 560582), but we don't need it in JS.
 if test -n "$_USE_SYSTEM_NSPR"; then
     MOZ_NATIVE_NSPR=
-    AM_PATH_NSPR(4.7.0, [MOZ_NATIVE_NSPR=1])
-    if test -z "$MOZ_NATIVE_NSPR"; then
-        AC_MSG_ERROR([--with-system-nspr given, but configure could not find a suitable NSPR.
-Pass --with-nspr-exec-prefix, --with-nspr-prefix, or --with-nspr-cflags/libs.
-See 'configure --help'.])
-    fi
+    AM_PATH_NSPR(4.7.0, [MOZ_NATIVE_NSPR=1], [AC_MSG_ERROR([your don't have NSPR installed or your version is too old])])
 fi
 
 if test -n "$MOZ_NATIVE_NSPR"; then