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

[1.0.X] Fixed #9892 -- support additional binary packages for GEOS & GDAL libs on OSX & Ubuntu platforms.

Browse Source 
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
This commit is contained in:
Justin Bronn 2008-12-26 16:04:48 +00:00
parent fd9ddb2dc1
commit 04ce539ad2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ elif os.name == 'nt':
lib_names = ['gdal15'] lib_names = ['gdal15']
elif os.name == 'posix': elif os.name == 'posix':
# *NIX library names. # *NIX library names.
lib_names = ['gdal', 'gdal1.5.0'] lib_names = ['gdal', 'GDAL', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0']
else: else:
raise OGRException('Unsupported OS "%s"' % os.name) raise OGRException('Unsupported OS "%s"' % os.name)

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

@ -33,7 +33,7 @@ elif os.name == 'nt':
lib_names = ['libgeos_c-1'] lib_names = ['libgeos_c-1']
elif os.name == 'posix': elif os.name == 'posix':
# *NIX libraries # *NIX libraries
lib_names = ['geos_c'] lib_names = ['geos_c', 'GEOS']
else: else:
raise ImportError('Unsupported OS "%s"' % os.name) raise ImportError('Unsupported OS "%s"' % os.name)