diff options
| author | Justin Bronn <jbronn@gmail.com> | 2011-03-16 04:44:26 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2011-03-16 04:44:26 +0000 |
| commit | 4da019ea19a2d36190fb0ffc887a11652296dad4 (patch) | |
| tree | 11c9822ac72b9b54de896483561c973f755587ca /django | |
| parent | ad55bb0f875d00c1bae8e6b144aaba0cc223395e (diff) | |
| download | django-4da019ea19a2d36190fb0ffc887a11652296dad4.tar.gz | |
Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interfaces. Thanks, master for ticket and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 4 | ||||
| -rw-r--r-- | django/contrib/gis/geos/libgeos.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index a7a5658c49..256ddb24ed 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -13,8 +13,8 @@ except (AttributeError, EnvironmentError, ImportError): if lib_path: lib_names = None elif os.name == 'nt': - # Windows NT shared library - lib_names = ['gdal17', 'gdal16', 'gdal15'] + # Windows NT shared libraries + lib_names = ['gdal18', 'gdal17', 'gdal16', 'gdal15'] elif os.name == 'posix': # *NIX library names. lib_names = ['gdal', 'GDAL', 'gdal1.7.0', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0'] diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py index 84299a0540..7e1dfa0dc5 100644 --- a/django/contrib/gis/geos/libgeos.py +++ b/django/contrib/gis/geos/libgeos.py @@ -23,7 +23,7 @@ if lib_path: lib_names = None elif os.name == 'nt': # Windows NT libraries - lib_names = ['libgeos_c-1'] + lib_names = ['geos_c', 'libgeos_c-1'] elif os.name == 'posix': # *NIX libraries lib_names = ['geos_c', 'GEOS'] |