SF.net SVN: matplotlib: [5362] trunk/toolkits/basemap/setup.py

[<js...@us...>]

Revision: 5362
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5362&view=rev
Author:   jswhit
Date:     2008-06-02 10:36:29 -0700 (Mon, 02 Jun 2008)

Log Message:
-----------
add a more helpful error message if libgeos not found.

Modified Paths:
--------------
    trunk/toolkits/basemap/setup.py

Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py	2008-06-02 17:13:01 UTC (rev 5361)
+++ trunk/toolkits/basemap/setup.py	2008-06-02 17:36:29 UTC (rev 5362)
@@ -67,19 +67,20 @@
             break
 else:
     geos_version = checkversion(GEOS_dir)
-#if geos_version != '"2.2.3"':
-#    raise SystemExit("""
-#Can't find geos library version 2.2.3. Please set the
-#environment variable GEOS_DIR to point to the location
-#where geos 2.2.3 is installed (for example, if geos_c.h
-#is in /usr/local/include, and libgeos_c is in /usr/local/lib,
-#set GEOS_DIR to /usr/local), or edit the setup.py script
-#manually and set the variable GEOS_dir (right after the line
-#that says "set GEOS_dir manually here".""")
-#else:
-geos_include_dirs=[os.path.join(GEOS_dir,'include'),numpy.get_include()]
-geos_library_dirs=[os.path.join(GEOS_dir,'lib'),os.path.join(GEOS_dir,'lib64')]
 
+if geos_version != '"2.2.3"' or GEOS_dir is None:
+    raise SystemExit("""
+Can't find geos library version 2.2.3. Please set the
+environment variable GEOS_DIR to point to the location
+where geos 2.2.3 is installed (for example, if geos_c.h
+is in /usr/local/include, and libgeos_c is in /usr/local/lib,
+set GEOS_DIR to /usr/local), or edit the setup.py script
+manually and set the variable GEOS_dir (right after the line
+that says "set GEOS_dir manually here".""")
+else:
+    geos_include_dirs=[os.path.join(GEOS_dir,'include'),numpy.get_include()]
+    geos_library_dirs=[os.path.join(GEOS_dir,'lib'),os.path.join(GEOS_dir,'lib64')]
+
 # proj4 and geos extensions.
 deps = glob.glob('src/*.c')
 deps.remove(os.path.join('src','_proj.c'))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.