diff options
| author | Todd Zullinger <tmzullinger@users.sourceforge.net> | 2007-02-27 21:34:14 +0000 |
|---|---|---|
| committer | Todd Zullinger <tmzullinger@users.sourceforge.net> | 2007-02-27 21:34:14 +0000 |
| commit | 56a6f268be0276976d6e140aa10467eb92aa646c (patch) | |
| tree | e0bbfdf006d36da050b8c5ec13ca54d7cb19de3a | |
| parent | e4650b1a4fe703337ee00324010340725ae68c8f (diff) | |
| download | libgpod-56a6f268be0276976d6e140aa10467eb92aa646c.tar.gz libgpod-56a6f268be0276976d6e140aa10467eb92aa646c.tar.xz libgpod-56a6f268be0276976d6e140aa10467eb92aa646c.zip | |
allow the use of nicer version strings in AM_CHECK_PYMOD
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1401 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/python.m4 | 7 |
3 files changed, 10 insertions, 3 deletions
@@ -7,6 +7,10 @@ * docs/reference/libgpod-sections.txt: include missing and newly added declarations, remove unused declarations + * configure.ac + m4/python.m4: allow the use of nicer version strings in + AM_CHECK_PYMOD + 2007-02-25 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/itdb.h diff --git a/configure.ac b/configure.ac index b0b4488..0a1409a 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,7 @@ dnl * optional python bindings dnl ************************************************** PYTHON_MIN_VERSION=2.1.1 -PYTHON_MUTAGEN_MIN_VERSION=1.8.-1 +PYTHON_MUTAGEN_MIN_VERSION=1.8 SWIG_MIN_VERSION=1.3.24 LIBGPOD_CHECK_PYTHON($PYTHON_MIN_VERSION) diff --git a/m4/python.m4 b/m4/python.m4 index cc5c6a0..685f4b6 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -47,10 +47,13 @@ sys.exit(0)"], [prog=" import sys, string, $1 curverstr = $3 # use method from AM_PYTHON_CHECK_VERSION -minver = map(int, string.split('$2', '.')) + [[0, 0, 0]] +minver = map(int, string.split('$2', '.')) +length = len[(minver)] +minver += [[0, 0, 0]] minverhex = 0 for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]] -curver = map(int, string.split(curverstr, '.')) + [[0, 0, 0]] +curver = map(int, string.split(curverstr, '.')[[:length]]) +curver += [[0, 0, 0]] curverhex = 0 for i in xrange(0, 4): curverhex = (curverhex << 8) + curver[[i]] if (curverhex >= minverhex): |