Changeset: a1ed4d4d2fff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a1ed4d4d2fff
Modified Files:
configure.ag
Branch: Jun2016
Log Message:
Fix FITS configuration report
The --disable-fits flag of the configure does not have an effect in
the final report of the enabled features. Although it works correctly,
it always reports fits as enabled. This patch corrects this
behavior.
diffs (25 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2611,16 +2611,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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
