diff options
| author | Justin Bronn <jbronn@gmail.com> | 2008-12-26 16:04:48 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2008-12-26 16:04:48 +0000 |
| commit | 04ce539ad21e3faba1865625040499a3e4b7976a (patch) | |
| tree | 7bd86333072e4287e4987793a2550ce183f63608 | |
| parent | fd9ddb2dc10d962709f5f2de72addc702a1884b9 (diff) | |
[1.0.X] Fixed #9892 -- support additional binary packages for GEOS & GDAL libs on OSX & Ubuntu platforms.
Backport of r9686 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9687 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) |