diff options
| author | Justin Bronn <jbronn@gmail.com> | 2008-12-26 16:02:45 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2008-12-26 16:02:45 +0000 |
| commit | d39540af92b124992e495bd3cbc1449b2a027173 (patch) | |
| tree | c1f536ee5982ee2906097de7870a36e8dc79b22b | |
| parent | 89dc5b894a7c7ac1633f0c270ac249f302bccd1d (diff) | |
Fixed #9892 -- support additional binary packages for GEOS & GDAL libs on OSX & Ubuntu platforms.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/geos/libgeos.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 78a719a940..c1bb45c742 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -17,7 +17,7 @@ elif os.name == 'nt': lib_names = ['gdal15'] elif os.name == 'posix': # *NIX library names. - lib_names = ['gdal', 'gdal1.5.0'] + lib_names = ['gdal', 'GDAL', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0'] else: raise OGRException('Unsupported OS "%s"' % os.name) diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py index 840bd7df5d..c8e938cb00 100644 --- a/django/contrib/gis/geos/libgeos.py +++ b/django/contrib/gis/geos/libgeos.py @@ -33,7 +33,7 @@ elif os.name == 'nt': lib_names = ['libgeos_c-1'] elif os.name == 'posix': # *NIX libraries - lib_names = ['geos_c'] + lib_names = ['geos_c', 'GEOS'] else: raise ImportError('Unsupported OS "%s"' % os.name) |