diff -Naur PyOpenGL-2.0.2.01.orig/setup/build_w.py PyOpenGL-2.0.2.01/setup/build_w.py --- PyOpenGL-2.0.2.01.orig/setup/build_w.py 2005-04-17 00:54:45 +0600 +++ PyOpenGL-2.0.2.01/setup/build_w.py 2005-04-17 01:38:23 +0600 @@ -11,6 +11,8 @@ # re for CVS keywords CVS_keyword = re.compile(r'[$][A-Za-z]+:\s+([^$]+?)\s+[$]') +# re for SWIG version +SWIG_version = re.compile('^SWIG Version (?P\d+)\.(?P\d+)\.(?P\d+)$', re.MULTILINE) def check_swig_version(swig_name): @@ -20,17 +22,25 @@ data = stderr.read() else: data = os.popen( "%s -version" % swig_name).read() - if string.find(data,"1.3.23") == -1: - return 0 - else: - return 1 + # Make SWIG version check more smart + version_check = SWIG_version.search(data) + if version_check: + major = int(version_check.group('f')) + minor = int(version_check.group('s')) + release = int(version_check.group('t')) + if major == 1 and (minor > 3 or (minor == 3 and release >=23)): + return 1 + else: + return 0 + else: + return 0 except: if __debug__: traceback.print_exc(file = sys.stderr) return 0 def handle_wrong_swig_version(): - print "WARNING!!! wrong swig version. Need 1.3.23, continuing anyway." + print "WARNING!!! wrong swig version. Need 1.3.23 or greater, continuing anyway." time.sleep(3)