Update of /cvsroot/monetdb/geom
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30752/geom
Modified Files:
Tag: Geom_0-4
configure.ag
Log Message:
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.
U configure.ag
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/geom/configure.ag,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -d -r1.12.2.3 -r1.12.2.4
--- configure.ag 5 Jun 2008 16:23:53 -0000 1.12.2.3
+++ configure.ag 5 Jun 2008 17:36:06 -0000 1.12.2.4
@@ -134,10 +134,20 @@
fi
fi
if test "x$have_geos" != xno; then
- dnl GEOS_INCS="-I`$GEOS_CONFIG --includes`"
- dnl GEOS_LIBS="`$GEOS_CONFIG --libs`"
- GEOS_INCS="`$GEOS_CONFIG --cflags`"
- GEOS_LIBS="`$GEOS_CONFIG --ldflags`"
+ 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"
CPPFLAGS="$CPPFLAGS $GEOS_INCS"
AC_CHECK_HEADER(geos_c.h, AC_DEFINE(HAVE_GEOS_C_H, 1, [Define to 1 if
you have the <geos_c.h> header file.]), [AC_MSG_ERROR([geos_c.h not found]);
have_geos=no])
-------------------------------------------------------------------------
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
