[geos-commits] r2935 - trunk

[svn_geos at osgeo.org]

Author: strk
Date: 2010-03-07 06:39:03 -0500 (Sun, 07 Mar 2010)
New Revision: 2935

Modified:
   trunk/README
Log:
Apply slightly modified patch by mwtoews (#344)


Modified: trunk/README
===================================================================
--- trunk/README	2010-03-06 01:49:44 UTC (rev 2934)
+++ trunk/README	2010-03-07 11:39:03 UTC (rev 2935)
@@ -2,13 +2,20 @@
 =============================
 
 Unix
------
+----
 
-	# ./configure
-	# make
-	# make check
-	# make install
+Using Autotools:
+  ./autogen.sh  # in ${srcdir}, if obtained from SVN
+  ${srcdir}/configure # in build dir
 
+Using CMake:
+  cmake ${srcdir} # in build dir
+
+Now, all versions:
+  make
+  make check
+  make install
+
 Win32
 -----
 
@@ -38,47 +45,46 @@
 
 To compile programs against the C lib (recommended):
 
-	CFLAGS += `geos-config --cflags`
-	LDFLAGS += `geos-config --ldflags` -lgeos_c
-	#include <geos_c.h>
+  CFLAGS += `geos-config --cflags`
+  LDFLAGS += `geos-config --ldflags` -lgeos_c
+  #include <geos_c.h>
 
 Example usage:
 
-	capi/geostest.c contains basic usage
-	examples.
+  capi/geostest.c contains basic usage examples.
 
 Using the C++ interface (discouraged)
 -------------------------------------
 
 To compile programs against the C++ lib:
 
-	CFLAGS += `geos-config --cflags`
-	LDFLAGS += `geos-config --ldflags` -lgeos
-	#include <geos.h>
+  CFLAGS += `geos-config --cflags`
+  LDFLAGS += `geos-config --ldflags` -lgeos
+  #include <geos.h>
 
 Example usage:
 
-	doc/example.cpp contains basic usage
-	examples.
+  doc/example.cpp contains basic usage examples.
 
 Scripting language bindings
 ---------------------------
 
-Ruby bindings are fully supported. To build, use the --enable-ruby option when 
-configuring:
+Ruby bindings are fully supported. To build, use the --enable-ruby option
+when configuring:
 
-    # ./configure ... --enable-ruby
+  ./configure ... --enable-ruby
     
 Since version 3.0, the Python bindings are unsupported. Recommended options:
 
  1. Become or recruit a new maintainer.
- 2. Use Shapely (http://pypi.python.org/pypi/Shapely) with Python versions 2.4 or greater.
+ 2. Use Shapely (http://pypi.python.org/pypi/Shapely) with Python
+    versions 2.4 or greater.
  3. Simply call functions from libgeos_c via Python ctypes.
 
 DOCUMENTATION
 =============
 
-	# cd doc; make doxygen-html
+  cd doc; make doxygen-html
 
-	http://trac.osgeo.org/geos
+  http://trac.osgeo.org/geos