Changeset: 8d84f3e1011c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d84f3e1011c
Modified Files:
configure.ag
Branch: DataVaults
Log Message:
Re-organize configure options
diffs (112 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2408,7 +2408,8 @@ AC_SUBST(SAMTOOLS_LIBS, $SAMTOOLS_LIBS)
AM_CONDITIONAL(HAVE_SAMTOOLS, test x"$have_samtools" != xno)
# mseed, only used by sql
-have_mseed="auto"
+org_have_mseed="auto"
+have_mseed=$org_have_mseed
AC_ARG_WITH(mseed,
AS_HELP_STRING([--with-mseed=DIR],[mseed library is installed in DIR]),
[have_mseed="$withval"], [have_mseed="auto"])
@@ -2443,6 +2444,31 @@ AC_SUBST(MSEED_CFLAGS, $MSEED_CFLAGS)
AC_SUBST(MSEED_LIBS, $MSEED_LIBS)
AM_CONDITIONAL(HAVE_MSEED, test x"$have_mseed" != xno)
+# fits, only used by sql
+org_have_cfitsio=no
+have_cfitsio=$org_have_cfitsio
+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)"
+ 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)
+
+# netcdf, only used by sql
+org_have_netcdf=no
+have_netcdf=$org_have_netcdf
+if test "x$enable_netcdf" != xno; then
+ req_netcdf='4.2'
+ PKG_CHECK_MODULES([netcdf], [netcdf],
+ [have_netcdf="yes"; AC_DEFINE(HAVE_NETCDF, 1, [Define if the
netcdf module is to be enabled])],
+ [have_netcdf="no"; why_have_netcdf="(netcdf library not found)"
+ if test "x$enable_netcdf" = xyes; then AC_MSG_ERROR([netcdf
library required for NetCDF support]); fi
+ enable_netcdf=no; disable_netcdf="(netcdf library not found)"])
+fi
+AM_CONDITIONAL(HAVE_NETCDF, test x"$have_netcdf" != xno)
+
# geos, only used in geom module
org_have_geos=auto
have_geos=$org_have_geos
@@ -2512,30 +2538,6 @@ esac
AC_SUBST(GEOS_INCS)
AC_SUBST(GEOS_LIBS)
-org_have_cfitsio=no
-have_cfitsio=$org_have_cfitsio
-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)"
- 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)
-
-org_have_netcdf=no
-have_netcdf=$org_have_netcdf
-if test "x$enable_netcdf" != xno; then
- req_netcdf='4.2'
- PKG_CHECK_MODULES([netcdf], [netcdf],
- [have_netcdf="yes"; AC_DEFINE(HAVE_NETCDF, 1, [Define if the
netcdf module is to be enabled])],
- [have_netcdf="no"; why_have_netcdf="(netcdf library not found)"
- if test "x$enable_netcdf" = xyes; then AC_MSG_ERROR([netcdf
library required for NetCDF support]); fi
- enable_netcdf=no; disable_netcdf="(netcdf library not found)"])
-fi
-AM_CONDITIONAL(HAVE_NETCDF, test x"$have_netcdf" != xno)
-
-
PKG_CHECK_MODULES([atomic_ops], [atomic_ops], [have_atomic_ops="yes"],
[have_atomic_ops="no"; why_have_atomic_ops="(atomic_ops library not
found)"])
if test x"$have_atomic_ops" = x"yes" ; then
@@ -3324,19 +3326,12 @@ for comp in \
'geom ' \
'console ' \
'gsl ' \
- 'fits ' \
- 'netcdf ' \
'microhttpd ' \
'rintegration' \
'odbc ' \
'jdbc ' \
'control ' \
'testing ' \
- 'developer ' \
- 'strict ' \
- 'debug ' \
- 'assert ' \
- 'optimize ' \
; do
eval "dft=\$dft_$comp"
eval "enable=\$enable_$comp"
@@ -3354,12 +3349,15 @@ for comp in \
'atomic_ops ' \
'bz2 ' \
'curl ' \
+ 'fits ' \
'getaddrinfo ' \
'gsl ' \
'java ' \
'java_control ' \
'java_jdbc ' \
'libxml2 ' \
+ 'mseed ' \
+ 'netcdf ' \
'openssl ' \
'pcre ' \
'perl ' \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
