wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 88d41ff68289 (bug 1146869)

Browse Source
This commit is contained in:
Wes Kocher 2015-03-25 15:28:11 -07:00
parent bca2de3663
commit cbde48d64d
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/autoconf/nspr.m4
View File

@ -64,25 +64,17 @@ AC_ARG_WITH(nspr-exec-prefix,
if test -z "$no_nspr"; then if test -z "$no_nspr"; then
nspr_config_major_version=`echo $NSPR_VERSION_STRING | \ nspr_config_major_version=`echo $NSPR_VERSION_STRING | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \ nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \ nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test -z "$nspr_config_micro_version"; then
nspr_config_micro_version="0"
fi
min_nspr_major_version=`echo $min_nspr_version | \ min_nspr_major_version=`echo $min_nspr_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
min_nspr_minor_version=`echo $min_nspr_version | \ min_nspr_minor_version=`echo $min_nspr_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
min_nspr_micro_version=`echo $min_nspr_version | \ min_nspr_micro_version=`echo $min_nspr_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test -z "$min_nspr_micro_version"; then
min_nspr_micro_version="0"
fi
if test "$nspr_config_major_version" -ne "$min_nspr_major_version"; then if test "$nspr_config_major_version" -ne "$min_nspr_major_version"; then
no_nspr="yes" no_nspr="yes"
elif test "$nspr_config_major_version" -eq "$min_nspr_major_version" && elif test "$nspr_config_major_version" -eq "$min_nspr_major_version" &&

20
build/autoconf/nss.m4
View File

@ -45,25 +45,17 @@ AC_ARG_WITH(nss-exec-prefix,
NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test -z "$nss_config_micro_version"; then
nss_config_micro_version="0"
fi
min_nss_major_version=`echo $min_nss_version | \ min_nss_major_version=`echo $min_nss_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
min_nss_minor_version=`echo $min_nss_version | \ min_nss_minor_version=`echo $min_nss_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
min_nss_micro_version=`echo $min_nss_version | \ min_nss_micro_version=`echo $min_nss_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test -z "$min_nss_micro_version"; then
min_nss_micro_version="0"
fi
if test "$nss_config_major_version" -lt "$min_nss_major_version"; then if test "$nss_config_major_version" -lt "$min_nss_major_version"; then
no_nss="yes" no_nss="yes"
elif test "$nss_config_major_version" -eq "$min_nss_major_version" && elif test "$nss_config_major_version" -eq "$min_nss_major_version" &&