diff options
| author | Justin Bronn <jbronn@gmail.com> | 2010-06-23 17:19:56 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2010-06-23 17:19:56 +0000 |
| commit | 1b5f812aad107e2ce12fe7c81773113fe39a46c1 (patch) | |
| tree | f5faa8fdafe064447badfcebeb910d0985d229d8 | |
| parent | 71cecc49525263494a19e37788124e3275323745 (diff) | |
[1.2.X] Fixed #13779 -- Can now discover GDAL 1.7 from debian-based packages. Thanks to Leo for bug report and patch.
Backport of r13396 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 6589c5647c..a7a5658c49 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -14,10 +14,10 @@ if lib_path: lib_names = None elif os.name == 'nt': # Windows NT shared library - lib_names = ['gdal16', 'gdal15'] + lib_names = ['gdal17', 'gdal16', 'gdal15'] elif os.name == 'posix': # *NIX library names. - lib_names = ['gdal', 'GDAL', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0'] + lib_names = ['gdal', 'GDAL', 'gdal1.7.0', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0'] else: raise OGRException('Unsupported OS "%s"' % os.name) |