Update of /cvsroot/monetdb/geom
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9640
Modified Files:
configure.ag
Log Message:
propagated changes of Thursday Jun 05 2008 - Friday Jun 06 2008
from the Geom_0-4 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/05 - stmane: src/lib/libgeom.mx,1.5.4.4 src/monetdb5/geom.mx,1.13.4.5
undoing my "stupid" checkin of htis morning.
The problem on gento is actually not the gcc 4.3 compiler
but the geos 3.0.0 version that differs significantly from geos 2.2.3.
Basically, our code is not (yet?) ready for geos 3.0.0.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/05 - stmane: configure.ag,1.12.2.3
improved/extended check for Geos library:
The differences between Geos 2.2.3 (default on, e.g., Fedora 8 & 9)
and Geos 3.0.0 (e.g., on Gentoo) are significant and "incompatible".
Our code base does not support version 3.0.0, yet, hence, we now
check whether we find a Geos version >= 2.0.0 and < 3.0.0
(assuming that all 2.x.y vesions are "compatible" and similar to
the tested 2.2.3).
If no suitable version if found, we abandon compilation.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/05 - stmane: configure.ag,1.12.2.4
icc complains about Goes' header files, at least if Geos
is found in the default place and we set GEOS_INCS & GEOS_LIBS.
Since setting GEOS_INCS & GEOS_LIBS is not strictly required
in this case, we omit setting them in this case.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/geom/configure.ag,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- configure.ag 27 May 2008 14:20:21 -0000 1.14
+++ configure.ag 6 Jun 2008 10:50:27 -0000 1.15
@@ -92,7 +92,10 @@
fi
dnl geos
+GEOS_VERSION_REQUIRED_MIN=2.0.0
+GEOS_VERSION_REQUIRED_MAX=3.0.0
have_geos=auto
+GEOS_CONFIG=''
GEOS_INCS=''
GEOS_LIBS=''
AC_ARG_WITH(geos,
@@ -102,10 +105,47 @@
if test "x$have_geos" != xno; then
case "$have_geos" in
yes|auto)
+ XPATH="$PATH"
;;
*)
- GEOS_INCS="-I$have_geos/include"
- GEOS_LIBS="-L$have_geos/lib"
+ XPATH="$have_geos/bin"
+ ;;
+ esac
+ AC_PATH_PROG(GEOS_CONFIG,geos-config,,$XPATH)
+ if test "x$GEOS_CONFIG" = x; then
+ AC_MSG_ERROR([geos-config not found in $XPATH])
+ have_geos=no
+ fi
+fi
+if test "x$have_geos" != xno; then
+ AC_MSG_CHECKING([for Geos >= $GEOS_VERSION_REQUIRED_MIN, but <
$GEOS_VERSION_REQUIRED_MAX])
+ GEOS_VERSION="`$GEOS_CONFIG --version`"
+ AC_MSG_RESULT(found $GEOS_VERSION)
+ wrong=''
+ if test MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION) -lt
MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION_REQUIRED_MIN); then
+ wrong="too old"
+ fi
+ if test MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION_REQUIRED_MAX); then
+ wrong="not yet supported"
+ fi
+ if test "x$wrong" != x; then
+ AC_MSG_ERROR([Geos version $GEOS_VERSION is $wrong])
+ have_geos=no
+ fi
+fi
+if test "x$have_geos" != xno; then
+ case "$GCC-$CC-`$GEOS_CONFIG --prefix`-`$GEOS_CONFIG --includes`" in
+ -*icc*-/usr-/usr/include)
+ dnl icc complains about Goes' header file, at least if Geos
+ dnl is found in the default place and we set GEOS_INCS &
GEOS_LIBS.
+ dnl Since setting GEOS_INCS & GEOS_LIBS is not strictly
required
+ dnl in this case, we omit setting them in this case.
+ ;;
+ *)
+ dnl GEOS_INCS="-I`$GEOS_CONFIG --includes`"
+ dnl GEOS_LIBS="`$GEOS_CONFIG --libs`"
+ GEOS_INCS="`$GEOS_CONFIG --cflags`"
+ GEOS_LIBS="`$GEOS_CONFIG --ldflags`"
;;
esac
save_CPPFLAGS="$CPPFLAGS"
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
