mirror of https://github.com/django/django.git
Fixed #9892 -- support additional binary packages for GEOS & GDAL libs on OSX & Ubuntu platforms.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
89dc5b894a
commit
d39540af92
|
@ -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)
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue