commit 22fe53ca99a1011efcf849099e4ca0918e00e7f3
Author: Todd Zullinger <t...@pobox.com>
Date: Tue Jul 27 11:37:37 2010 -0400
Update SWIG m4 macros
The previous version improperly compared versions which gave fun output
like: SWIG version >= 1.3.24 is required. You have 2.0.0.
m4/ax_pkg_swig.m4 | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/m4/ax_pkg_swig.m4 b/m4/ax_pkg_swig.m4
index a14a46b..81226fb 100644
--- a/m4/ax_pkg_swig.m4
+++ b/m4/ax_pkg_swig.m4
@@ -1,5 +1,5 @@
# ===========================================================================
-# http://www.nongnu.org/autoconf-archive/ax_pkg_swig.html
+# http://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html
# ===========================================================================
#
# SYNOPSIS
@@ -62,7 +62,7 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 5
+#serial 7
AC_DEFUN([AX_PKG_SWIG],[
AC_PATH_PROG([SWIG],[swig])
@@ -105,9 +105,15 @@ AC_DEFUN([AX_PKG_SWIG],[
if test -z "$available_patch" ; then
[available_patch=0]
fi
- if test $available_major -ne $required_major \
- -o $available_minor -ne $required_minor \
- -o $available_patch -lt $required_patch ; then
+ # Convert the version tuple into a single number for
easier comparison.
+ # Using base 100 should be safe since SWIG internally
uses BCD values
+ # to encode its version number.
+ required_swig_vernum=`expr $required_major \* 10000 \
+ \+ $required_minor \* 100 \+ $required_patch`
+ available_swig_vernum=`expr $available_major \* 10000 \
+ \+ $available_minor \* 100 \+ $available_patch`
+
+ if test $available_swig_vernum -lt
$required_swig_vernum; then
AC_MSG_WARN([SWIG version >= $1 is required.
You have $swig_version.])
SWIG=''
m4_ifval([$3],[$3],[])
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://ad.doubleclick.net/clk;226879339;13503038;l?
http://clk.atdmt.com/CRS/go/247765532/direct/01/
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
