IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow m4 1.4.11 and 1.4.13 as well as 1.4.7. Should really parse the version

Browse Source 
number to ensure it is higher than some minimum value.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18385 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Phil Longstaff 2009-10-18 21:57:19 +00:00
parent 9d61ff898a
commit acdecdedb8
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packaging/win32/install.sh
View File

@ -90,6 +90,16 @@ function prepare() {
fi
}
function check_m4_version_ok() {
v=`m4 --version | grep -e '[0-9]*\.[0-9]*\.[0-9]*' | sed -e 's/[mM]4//g' -e 's/[^\.0-9]//g'`
if [ "$v" = "1.4.7" -o "$v" = "1.4.11" -o "$v" = "1.4.13" ];
then
return 1
else
return 0
fi
}
function inst_wget() {
setup Wget
_WGET_UDIR=`unix_path $WGET_DIR`
@ -108,8 +118,7 @@ function inst_wget() {
function inst_dtk() {
setup MSYS DTK
_MSYS_UDIR=`unix_path $MSYS_DIR`
if quiet ${_MSYS_UDIR}/bin/perl --help &&
[ "`m4 --version | sed '1!d;s,.* [Mm]4 ,,'`" = "1.4.7" ]
if quiet ${_MSYS_UDIR}/bin/perl --help && [ check_m4_version_ok ]
then
echo "msys dtk already installed. skipping."
else
@ -128,7 +137,7 @@ function inst_dtk() {
wget_unpacked $M4_URL $DOWNLOAD_DIR $TMP_DIR
mv $TMP_UDIR/usr/bin/m4.exe /bin
quiet ${_MSYS_UDIR}/bin/perl --help &&
[ "`m4 --version | sed '1!d;s,.* [Mm]4 ,,'`" = "1.4.7" ] || die "msys dtk not installed correctly"
[ check_m4_version_ok ] || die "msys dtk not installed correctly"
fi
}