Commit e594ca7f authored by Justin Bronn's avatar Justin Bronn
Browse files

[1.2.X] Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL... 

[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
parent 1e2d896e

django/contrib/gis/gdal/libgdal.py

+2 −2
Original line number Diff line number Diff line
@@ -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']

django/contrib/gis/geos/libgeos.py

+1 −1
Original line number Diff line number Diff line
@@ -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']