--- basemap-0.8.1/setup.py.orig 2006-02-03 13:39:36.000000000 -0700
+++ basemap-0.8.1/setup.py 2006-02-24 15:49:37.000000000 -0700
@@ -12,7 +12,7 @@
DBFUpdateHeader is available, we scan shapefil.h for the string
'DBFUpdateHeader'.
"""
- f = open(convert_path("pyshapelib/shapelib/shapefil.h"))
+ f = open(convert_path("/usr/include/libshp/shapefil.h"))
contents = f.read()
f.close()
if contents.find("DBFUpdateHeader") >= 0:
@@ -20,35 +20,28 @@
else:
return [("HAVE_UPDATE_HEADER", "0")]
-deps = glob.glob('src/*.c')
-
-extensions = [Extension("proj4",deps,include_dirs = ['src'],)]
+extensions = [Extension("proj4",['proj4.c'],libraries=["proj"])]
packages = ['matplotlib.toolkits.basemap']
package_dirs = {'':'lib'}
-# don't build pyshapelib if it is already installed.
+# Always build pyshapelib for RPM consistency, uses system shapelib
-try:
- import shapelib
- import dbflib
-except:
- packages = packages + ['shapelib','dbflib']
- package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
- package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
- extensions = extensions + \
- [Extension("shapelibc",
- ["pyshapelib/shapelib_wrap.c",
- "pyshapelib/shapelib/shpopen.c",
- "pyshapelib/shapelib/shptree.c"],
- include_dirs = ["pyshapelib/shapelib"]),
- Extension("shptree",
- ["pyshapelib/shptreemodule.c"],
- include_dirs = ["pyshapelib/shapelib"]),
- Extension("dbflibc",
- ["pyshapelib/dbflib_wrap.c",
- "pyshapelib/shapelib/dbfopen.c"],
- include_dirs = ["pyshapelib/shapelib"],
- define_macros = dbf_macros()) ]
+packages = packages + ['shapelib','dbflib']
+package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
+package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
+extensions = extensions + \
+ [Extension("shapelibc",
+ ["pyshapelib/shapelib_wrap.c"],
+ include_dirs = ["/usr/include/libshp"],
+ libraries=["shp"]),
+ Extension("shptree",
+ ["pyshapelib/shptreemodule.c"],
+ include_dirs = ["/usr/include/libshp"]),
+ Extension("dbflibc",
+ ["pyshapelib/dbflib_wrap.c"],
+ include_dirs = ["/usr/include/libshp"],
+ libraries = ["shp"],
+ define_macros = dbf_macros()) ]
try:
additional_params # has setupegg.py provided