[postgis-commits] svn - r3646 - in spike/wktraster: . rt_core rt_pg

[postgis-commits at postgis.refractions.net]

Author: strk
Date: 2009-02-05 04:45:25 -0800 (Thu, 05 Feb 2009)
New Revision: 3646

Modified:
   spike/wktraster/README
   spike/wktraster/configure.ac
   spike/wktraster/rt_core/Makefile.in
   spike/wktraster/rt_pg/Makefile.in
Log:
add REQUIREMENT section in README, slithgly rework build script to allow testing other postgis versions (up to 1.3.5 the test failed)

Modified: spike/wktraster/README
===================================================================
--- spike/wktraster/README	2009-02-05 12:01:51 UTC (rev 3645)
+++ spike/wktraster/README	2009-02-05 12:45:25 UTC (rev 3646)
@@ -16,12 +16,18 @@
 rt_pg/ contains postgresql-specific wrappers, and SQL code to define
 the RASTER type.
 
+REQUIREMENTS
+------------
+
+WKTRaster depends on liblwgeom, as found in postgis source
+package as of SVN 2009-01 (latest 1.3.5 release won't work).
+
 BUILD
 -----
 
 To build:
 
-    $ ./configure --with-postgis-sources=/usr/src/postgis-xxx
+    $ ./configure --with-postgis-sources=/usr/src/postgis-svn
     $ make 
 
 CHECK

Modified: spike/wktraster/configure.ac
===================================================================
--- spike/wktraster/configure.ac	2009-02-05 12:01:51 UTC (rev 3645)
+++ spike/wktraster/configure.ac	2009-02-05 12:45:25 UTC (rev 3646)
@@ -331,17 +331,22 @@
 dnl Find postgis sources, as we rely on liblwgeom
 dnl ===========================================================================
 
-POSTGIS_SRCDIR=""
+LIBLWGEOM_CFLAGS=""
+LIBLWGEOM_LDFLAGS=""
 AC_ARG_WITH([postgis-sources],
     [AC_HELP_STRING([--with-postgis-sources=DIR],
         [specify location of postgis sources])],
     [POSTGIS_SRCDIR="$withval"], [POSTGIS_SRCDIR=""])
 
-if test ! -f "$POSTGIS_SRCDIR/liblwgeom/liblwgeom.h"; then
-    AC_MSG_ERROR([Please specify --with-postgis-sources=DIR so that DIR contains the liblwgeom/liblwgeom.h file])
+if test -f "$POSTGIS_SRCDIR/liblwgeom/liblwgeom.h"; then
+    LIBLWGEOM_CFLAGS="-I${POSTGIS_SRCDIR}/liblwgeom"
+    LIBLWGEOM_LDFLAGS="-L${POSTGIS_SRCDIR}/liblwgeom -llwgeom"
+else
+    AC_MSG_ERROR([${POSTGIS_SRCDIR} doesn't contain liblwgeom/liblwgeom.h or lwgeom/liblwgeom.h, try --with-postgis-sources=DIR (requires postgis svn version)])
 fi
 
-AC_SUBST([POSTGIS_SRCDIR])
+AC_SUBST([LIBLWGEOM_CFLAGS])
+AC_SUBST([LIBLWGEOM_LDFLAGS])
 
 
 dnl ===========================================================================

Modified: spike/wktraster/rt_core/Makefile.in
===================================================================
--- spike/wktraster/rt_core/Makefile.in	2009-02-05 12:01:51 UTC (rev 3645)
+++ spike/wktraster/rt_core/Makefile.in	2009-02-05 12:45:25 UTC (rev 3646)
@@ -10,9 +10,12 @@
 # *
 # **********************************************************************
 
-LDFLAGS = -L at POSTGIS_SRCDIR@/liblwgeom -llwgeom 
-CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ -I at POSTGIS_SRCDIR@/liblwgeom
+LIBLWGEOM_LDFLAGS=@LIBLWGEOM_LDFLAGS@
+LIBLWGEOM_CLAGS=@LIBLWGEOM_CFLAGS@
 
+LDFLAGS = $(LIBLWGEOM_LDFLAGS)
+CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ $(LIBLWGEOM_CLAGS) 
+
 # Standalone RTCORE objects
 RT_OBJS = \
 	rt_api.o 

Modified: spike/wktraster/rt_pg/Makefile.in
===================================================================
--- spike/wktraster/rt_pg/Makefile.in	2009-02-05 12:01:51 UTC (rev 3645)
+++ spike/wktraster/rt_pg/Makefile.in	2009-02-05 12:45:25 UTC (rev 3646)
@@ -32,9 +32,12 @@
 # supplied with newer versions of PostGIS
 #
 
-PG_CPPFLAGS+=@CPPFLAGS@ -I at POSTGIS_SRCDIR@/liblwgeom -I../rt_core
-SHLIB_LINK+=@SHLIB_LINK@ ../rt_core/librtcore.a @POSTGIS_SRCDIR@/liblwgeom/liblwgeom.a
+LIBLWGEOM_LDFLAGS=@LIBLWGEOM_LDFLAGS@
+LIBLWGEOM_CFLAGS=@LIBLWGEOM_CFLAGS@
 
+PG_CPPFLAGS+=@CPPFLAGS@ $(LIBLWGEOM_CFLAGS) -I../rt_core
+SHLIB_LINK+=@SHLIB_LINK@ ../rt_core/librtcore.a $(LIBLWGEOM_LDFLAGS)
+
 # Extra files to remove during 'make clean'
 EXTRA_CLEAN=$(SQL_OBJS) rtpostgis.sql