Changeset: 6b9f233d728b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b9f233d728b
Modified Files:
configure.ag
geom/lib/Makefile.ag
geom/monetdb5/Makefile.ag
Branch: geo
Log Message:
fixed includes and added proj library, everything should compile and link
correctly
diffs (79 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2388,6 +2388,36 @@ AC_SUBST(MSEED_CFLAGS, $MSEED_CFLAGS)
AC_SUBST(MSEED_LIBS, $MSEED_LIBS)
AM_CONDITIONAL(HAVE_MSEED, test x"$have_mseed" != xno)
+#proj only used in geom module
+have_proj=''
+PROJ_INCS=''
+PROJ_LIBS=''
+AC_ARG_WITH(proj,
+ AS_HELP_STRING([--with-proj=DIR],
+ [proj library is installed in DIR]),
+ have_proj="$withval")
+case "$enable_geom" in
+yes|auto)
+ if test "x$have_proj" != xno; then
+ PROJ_INCS="-I$have_proj/include"
+ PROJ_LIBS="-L$have_proj/lib -lproj"
+ fi
+ if test "x$have_proj" = xno; then
+ if test "x$enable_geon" = xyes; then
+ AC_MSG_ERROR([proj library required for geom module])
+ fi
+ # no proj, so don't compile geom
+ enable_geom=no
+ if test "x$disable_geom" = x; then
+ disable_geom="(proj library required for geom module)"
+ fi
+ fi
+ ;;
+esac
+AC_SUBST(PROJ_INCS)
+AC_SUBST(PROJ_LIBS)
+
+
# geos, only used in geom module
org_have_geos=auto
have_geos=$org_have_geos
diff --git a/geom/lib/Makefile.ag b/geom/lib/Makefile.ag
--- a/geom/lib/Makefile.ag
+++ b/geom/lib/Makefile.ag
@@ -16,7 +16,7 @@
# All Rights Reserved.
MTSAFE
-INCLUDES = ../../common/options ../../common/stream ../../gdk $(GEOS_INCS)
+INCLUDES = ../../common/options ../../common/stream ../../gdk $(GEOS_INCS)
$(PROJ_INCS)
lib_geom = {
NOINST
diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag
--- a/geom/monetdb5/Makefile.ag
+++ b/geom/monetdb5/Makefile.ag
@@ -17,22 +17,7 @@
MTSAFE
INCLUDES = ../lib \
- ../../common/options \
- ../../common/stream \
- ../../gdk \
- ../../monetdb5/modules/atoms \
- ../../monetdb5/modules/kernel \
- ../../monetdb5/mal \
- ../../monetdb5/modules/mal \
- ../../monetdb5/optimizer \
- ../../monetdb5/scheduler \
- ../../sql/backends/monet5 \
- ../../sql/include \
- ../../sql/server \
- ../../sql/common \
- ../../sql/storage \
- ../../clients/mapilib \
- $(GEOS_INCS)
+ $(GEOS_INCS) $(PROJ_INCS)
lib__geom = {
MODULE
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
