Changeset: 5616bf0302f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5616bf0302f2
Modified Files:
buildtools/conf/rules.mk
configure.ag
Branch: Nov2019
Log Message:
Fixes so that we can compile on newer systems.
diffs (23 lines):
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -11,6 +11,7 @@ MV=mv
%.tab.c: %.y
$(BISON) -o $*.tab.c --defines=$*.tmph.h $(YFLAGS) $(AM_YFLAGS) $<
+ $(SED) -i~ 's/$*\.tmph\.h/$*.tab.h/' $*.tab.c
rm -f $*.tmph.h
%.tab.h: %.y
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1885,7 +1885,7 @@ AC_ARG_WITH([proj],
[include proj support (default=auto)])],
[have_proj="$withval"])
AS_VAR_IF([have_proj], [no], [], [
- PKG_CHECK_MODULES([proj], [proj],
+ PKG_CHECK_MODULES([proj], [proj < 8.0.0],
[AC_DEFINE([HAVE_PROJ], 1, [Define if the proj library exists])
have_proj=yes],
[AS_VAR_IF([have_proj], [auto], [],
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
