   NSS_CRYPTO_LIB="$PACKAGE-nss"
   NSS_FOUND="no"
 ***************
+*** 521,527 ****
+      AC_MSG_RESULT(no)
+      NSS_FOUND="without"
+  elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
+!     PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
+  	[NSS_FOUND=yes],
+  	[NSS_FOUND=no])
+  fi
+--- 524,530 ----
+      AC_MSG_RESULT(no)
+      NSS_FOUND="without"
+  elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
+!     PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
+  	[NSS_FOUND=yes],
+  	[NSS_FOUND=no])
+  fi
+***************
 *** 534,541 ****
           ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
       fi

  LIBXML_LIBS=""
  LIBXML_FOUND="no"
***************
*** 507,513 ****
  NSPR_MIN_VERSION="4.0"
  NSS_CFLAGS=""
  NSS_LIBS=""

  
      echo "$as_me:$LINENO: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5
  echo $ECHO_N "checking for nspr libraries >= $NSPR_MIN_VERSION... $ECHO_C" >&6
--- 25820,25827 ----
          ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
      fi
  
