jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate AC_COMPARE_VERSION

Browse source 
We also have AX_COMPARE_VERSION which does essentially the same job.
This commit is contained in:
Olly Betts 2015-03-18 12:39:57 +13:00
commit c7c6f2381e
2 changed files with 1 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Tools/config/ac_compare_version.m4
View file

@ -1,40 +0,0 @@
dnl @synopsis AC_COMPARE_VERSION\
dnl (version-a, version-b, action-if-greater, action-if-equal, action-if-less)
dnl
dnl This macro compares two version numbers and executes the indicated action
dnl based on whether they're equal or one is greater than the other.
dnl It's needed to determine whether ocaml is new enough that the incompatible
dnl change 'loc' -> '_loc' is present in this version of camlp4.
dnl
dnl It's implemented from scratch just for SWIG by arty.
dnl
dnl @category Misc
dnl @author arty
dnl @version 2006-11-02
dnl @license GPLWithACException
AC_DEFUN([AC_COMPARE_VERSION], [
# Split the version into units.
ver_a="[$1]"
ver_b="[$2]"
nodots_a=`echo $ver_a | sed -e 's/\./ /g'`
condition="equal"
isolate_b_regex='\([[0-9]]\+\).*'
for ver_part in $nodots_a ; do
b_ver_part=`echo "$ver_b" | sed -e 's/'"$isolate_b_regex"'/\1/'`
if test \( "$ver_part" -lt "$b_ver_part" \) -a \( "x$condition" = "xequal" \) ; then
condition=less
elif test \( "$ver_part" -gt "$b_ver_part" \) -a \( "x$condition" = "xequal" \) ; then
condition=greater
fi
isolate_b_regex='[[0-9]]\+\.'"$isolate_b_regex"
done
if test "x$condition" = "xequal" ; then
[$4]
elif test "x$condition" = "xless" ; then
[$3]
elif test "x$condition" = "xgreater" ; then
[$5]
fi
])

2
configure.ac
View file

@ -1805,7 +1805,7 @@ else
AC_MSG_CHECKING(if Ocaml version is greater than 3.08.2)
OCAMLVER=`$OCAMLC -version | sed -e 's/.*version //g'`
AC_COMPARE_VERSION([$OCAMLVER],[3.08.2],[:],[:],[OCAMLLOC=_loc])
AX_COMPARE_VERSION([$OCAMLVER], [ge], [3.08.2], [OCAMLLOC=_loc])
AC_MSG_RESULT($OCAMLVER)
fi
fi # Disabling ocaml