configure: fix and cleanup nss and nspr detection

configure.ac

@@ -1647,9 +1647,9 @@
     fi
 
 # libnspr
-    enable_nspr="no"
     AC_ARG_ENABLE(nspr,
-            AS_HELP_STRING([--disable-nspr],[Disable libnspr support]))
+            AS_HELP_STRING([--disable-nspr],[Disable libnspr support]),
+            [enable_nspr=$enableval],[enable_nspr="yes"])
     AC_ARG_WITH(libnspr_includes,
             [  --with-libnspr-includes=DIR  libnspr include directory],
             [with_libnspr_includes="$withval"],[with_libnspr_includes=no])
@@ -1688,17 +1688,18 @@
                 echo
                 exit 1
             fi
-          enable_nspr="yes"
+        else
+            enable_nspr="no"
         fi
     fi
 
   # libnss
-    enable_nss="no"
     AC_ARG_ENABLE(nss,
-            AS_HELP_STRING([--disable-nss],[Disable libnss support]))
+            AS_HELP_STRING([--disable-nss],[Disable libnss support]),
+            [enable_nss=$enableval],[enable_nss="yes"])
     AC_ARG_WITH(libnss_includes,
             [  --with-libnss-includes=DIR  libnss include directory],
-            [with_libnss_includes="$withval"],[with_libnss_includes=no])
+            [with_libnss_includes="$withval"],[with_libnss_includes="no"])
     AC_ARG_WITH(libnss_libraries,
             [  --with-libnss-libraries=DIR    libnss library directory],
             [with_libnss_libraries="$withval"],[with_libnss_libraries="no"])
@@ -1710,7 +1711,6 @@
             CPPFLAGS="${CPPFLAGS} ${libnss_CFLAGS}"
             LIBS="${LIBS} ${libnss_LIBS}"
         fi
-
         if test "$with_libnss_includes" != "no"; then
             CPPFLAGS="${CPPFLAGS} -I${with_libnss_includes}"
         fi
@@ -1722,7 +1722,6 @@
             fi
 
             AC_CHECK_LIB(nss3, HASH_Begin,, NSS="no")
-
             if test "$NSS" = "no"; then
                 echo
                 echo "   ERROR!  libnss library not found, go get it"
@@ -1735,8 +1734,10 @@
                 exit 1
             fi
 
-          AC_DEFINE([HAVE_NSS],[1],[libnss available for md5])
+            AC_DEFINE([HAVE_NSS],[1],[libnss available for md5/sha1/sha256])
             enable_nss="yes"
+        else
+            enable_nss="no"
         fi
     fi