mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 18:29:11 +00:00
Code Issues 32 Releases Wiki Activity

[1.2.X] Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interfaces. Thanks, master for ticket and initial patch.

Browse Source 
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
This commit is contained in:
Justin Bronn 2011-03-16 04:45:00 +00:00
parent 1e2d896e33
commit e594ca7f93
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/gis/gdal/libgdal.py
View File

@ -13,8 +13,8 @@ except (AttributeError, EnvironmentError, ImportError):
if lib_path: if lib_path:
lib_names = None lib_names = None
elif os.name == 'nt': elif os.name == 'nt':
# Windows NT shared library # Windows NT shared libraries
lib_names = ['gdal17', 'gdal16', 'gdal15'] lib_names = ['gdal18', 'gdal17', 'gdal16', 'gdal15']
elif os.name == 'posix': elif os.name == 'posix':
# *NIX library names. # *NIX library names.
lib_names = ['gdal', 'GDAL', 'gdal1.7.0', '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']

2
django/contrib/gis/geos/libgeos.py
View File

@ -23,7 +23,7 @@ if lib_path:
lib_names = None lib_names = None
elif os.name == 'nt': elif os.name == 'nt':
# Windows NT libraries # Windows NT libraries
lib_names = ['libgeos_c-1'] lib_names = ['geos_c', 'libgeos_c-1']
elif os.name == 'posix': elif os.name == 'posix':
# *NIX libraries # *NIX libraries
lib_names = ['geos_c', 'GEOS'] lib_names = ['geos_c', 'GEOS']