| 1 |
diff -p -up comm-release/mozilla/build/autoconf/nspr.m4.nspr-version comm-release/mozilla/build/autoconf/nspr.m4 |
| 2 |
--- comm-release/mozilla/build/autoconf/nspr.m4.nspr-version 2012-10-27 05:44:22.000000000 +0200 |
| 3 |
+++ comm-release/mozilla/build/autoconf/nspr.m4 2012-11-03 23:13:27.628955332 +0100 |
| 4 |
@@ -64,11 +64,14 @@ AC_ARG_WITH(nspr-exec-prefix, |
| 5 |
|
| 6 |
if test -z "$no_nspr"; then |
| 7 |
nspr_config_major_version=`echo $NSPR_VERSION_STRING | \ |
| 8 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
| 9 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\1/'` |
| 10 |
nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \ |
| 11 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
| 12 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\2/'` |
| 13 |
nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \ |
| 14 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
| 15 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\4/'` |
| 16 |
+ if test -z "$nspr_config_micro_version"; then |
| 17 |
+ nspr_config_micro_version=0 |
| 18 |
+ fi |
| 19 |
min_nspr_major_version=`echo $min_nspr_version | \ |
| 20 |
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
| 21 |
min_nspr_minor_version=`echo $min_nspr_version | \ |
| 22 |
diff -p -up comm-release/mozilla/build/autoconf/nss.m4.nspr-version comm-release/mozilla/build/autoconf/nss.m4 |
| 23 |
--- comm-release/mozilla/build/autoconf/nss.m4.nspr-version 2012-10-27 05:44:22.000000000 +0200 |
| 24 |
+++ comm-release/mozilla/build/autoconf/nss.m4 2012-11-03 23:14:37.835163513 +0100 |
| 25 |
@@ -45,11 +45,14 @@ AC_ARG_WITH(nss-exec-prefix, |
| 26 |
NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` |
| 27 |
|
| 28 |
nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ |
| 29 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
| 30 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\1/'` |
| 31 |
nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ |
| 32 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
| 33 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\2/'` |
| 34 |
nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ |
| 35 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
| 36 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)?/\4/'` |
| 37 |
+ if test -z "nss_config_micro_version"; then |
| 38 |
+ nss_config_micro_version=0 |
| 39 |
+ fi |
| 40 |
min_nss_major_version=`echo $min_nss_version | \ |
| 41 |
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
| 42 |
min_nss_minor_version=`echo $min_nss_version | \ |
Parent Directory
| 
Revision Log