Changeset: fcf8cce94fb2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fcf8cce94fb2
Modified Files:
configure.ag
testing/Makefile.ag
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (36 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2729,16 +2729,16 @@ AC_SUBST(GEOS_INCS)
AC_SUBST(GEOS_LIBS)
# fits, only used by sql
-org_have_cfitsio=no
-have_cfitsio=$org_have_cfitsio
+org_have_fits=no
+have_fits=$org_have_fits
if test "x$enable_fits" != xno; then
PKG_CHECK_MODULES([cfitsio], [cfitsio],
- [have_cfitsio=yes; AC_DEFINE(HAVE_FITS, 1, [Define if the fits
module is to be enabled])],
- [have_cfitsio=no; why_have_cfitsio="(cfitsio library not found)"
+ [have_fits="yes"; AC_DEFINE(HAVE_FITS, 1, [Define if the fits
module is to be enabled])],
+ [have_fits="no"; why_have_fits="(cfitsio library not found)"
if test "x$enable_fits" = xyes; then AC_MSG_ERROR([cfitsio
library required for FITS support]); fi;
enable_fits=no; disable_fits="(cfitsio library not found)"])
fi
-AM_CONDITIONAL(HAVE_FITS, test x"$have_cfitsio" != xno)
+AM_CONDITIONAL(HAVE_FITS, test x"$have_fits" != xno)
# netcdf, only used by sql
org_have_netcdf=no
diff --git a/testing/Makefile.ag b/testing/Makefile.ag
--- a/testing/Makefile.ag
+++ b/testing/Makefile.ag
@@ -14,6 +14,7 @@ bin_Mdiff = {
bin_Mtimeout = {
SOURCES = Mtimeout.c
COND = NOT_WIN32
+ LIBS = $(PTHREAD_LIBS)
}
bin_Mapprove.py = bin_Mtest.py
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
