diff -p -up comm-release/mozilla/build/autoconf/nspr.m4.nspr-version comm-release/mozilla/build/autoconf/nspr.m4 --- comm-release/mozilla/build/autoconf/nspr.m4.nspr-version 2012-10-27 05:44:22.000000000 +0200 +++ comm-release/mozilla/build/autoconf/nspr.m4 2012-11-03 23:13:27.628955332 +0100 @@ -64,11 +64,14 @@ AC_ARG_WITH(nspr-exec-prefix, if test -z "$no_nspr"; then nspr_config_major_version=`echo $NSPR_VERSION_STRING | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\1/'` nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\2/'` nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\4/'` + if test -z "$nspr_config_micro_version"; then + nspr_config_micro_version=0 + fi min_nspr_major_version=`echo $min_nspr_version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` min_nspr_minor_version=`echo $min_nspr_version | \ diff -p -up comm-release/mozilla/build/autoconf/nss.m4.nspr-version comm-release/mozilla/build/autoconf/nss.m4 --- comm-release/mozilla/build/autoconf/nss.m4.nspr-version 2012-10-27 05:44:22.000000000 +0200 +++ comm-release/mozilla/build/autoconf/nss.m4 2012-11-03 23:14:37.835163513 +0100 @@ -45,11 +45,14 @@ AC_ARG_WITH(nss-exec-prefix, NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\1/'` nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\2/'` nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\4/'` + if test -z "nss_config_micro_version"; then + nss_config_micro_version=0 + fi min_nss_major_version=`echo $min_nss_version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` min_nss_minor_version=`echo $min_nss_version | \
