From e594ca7f937c12939b60c9f7d77f4752cb808412 Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Wed, 16 Mar 2011 04:45:00 +0000 Subject: [PATCH] [1.2.X] Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interfaces. Thanks, master for ticket and initial patch. Backport of r15852 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15853 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/gis/gdal/libgdal.py | 4 ++-- 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']