Changeset: 681b22192855 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=681b22192855
Modified Files:
Makefile.ag
MonetDB.spec
NT/rules.msc
buildtools/doc/HowToRelease.rst
buildtools/doc/windowsbuild.rst
configure.ag
debian/rules
geom/Makefile.ag
testing/Mtest.py.in
tools/Makefile.ag
tools/merovingian/Makefile.ag
Branch: Nov2019
Log Message:
Removed configure options --enable-gdk, --enable-monetdb5, --enable-sql.
These components are always included.
diffs (truncated from 337 to 300 lines):
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -5,9 +5,9 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
SUBDIRS = buildtools common clients \
- HAVE_GDK?gdk \
- HAVE_MONETDB5?monetdb5 \
- HAVE_SQL?sql \
+ gdk \
+ monetdb5 \
+ sql \
HAVE_GEOM?geom \
tools \
HAVE_TESTING?testing \
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -959,12 +959,10 @@ export CFLAGS
--enable-embedded=no \
--enable-embedded-r=no \
--enable-fits=%{?with_fits:yes}%{!?with_fits:no} \
- --enable-gdk=yes \
--enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
--enable-int128=%{?with_hugeint:yes}%{!?with_hugeint:no} \
--enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \
--enable-mapi=yes \
- --enable-monetdb5=yes \
--enable-netcdf=no \
--enable-odbc=yes \
--enable-py2integration=%{?with_py2integration:yes}%{!?with_py2integration:no} \
@@ -972,7 +970,6 @@ export CFLAGS
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
--enable-sanitizer=no \
--enable-shp=no \
- --enable-sql=yes \
--enable-static-analysis=no \
--enable-strict=no \
--enable-testing=yes \
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -297,11 +297,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_FITS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_GDK
- $(ECHO) HAVE_GDK_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_GDK_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_GEOM
$(ECHO) HAVE_GEOM_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -352,11 +347,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_LIDAR_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_MONETDB5
- $(ECHO) HAVE_MONETDB5_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_MONETDB5_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_NETCDF
$(ECHO) HAVE_NETCDF_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -392,11 +382,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_MAL_DEBUGGER_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_SQL
- $(ECHO) HAVE_SQL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_SQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_TESTING
$(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst
--- a/buildtools/doc/HowToRelease.rst
+++ b/buildtools/doc/HowToRelease.rst
@@ -117,10 +117,10 @@ Releasing
correct compiler, i.e., Microsoft Visual Studio 8, and options:
Use these ``nmake`` options for a 32 bit compile: ``NDEBUG=1
- HAVE_PYTHON=1 HAVE_PCRE=1 HAVE_MONETDB5=1``
+ HAVE_PYTHON=1 HAVE_PCRE=1``
Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1
- HAVE_MONETDB5=1 HAVE_PYTHON=1 HAVE_PCRE=1``
+ HAVE_PYTHON=1 HAVE_PCRE=1``
- Create PGP signatures and SHA1 checksums::
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -761,8 +761,6 @@ possible:
- ``DEBUG=1`` - compile with extra debugging information
- ``NDEBUG=1`` - compile without extra debugging information (this is
used for creating a binary release);
-- ``HAVE_MONETDB5=1`` - include the MonetDB5 component;
-- ``HAVE_SQL=1`` - include the sql component;
- ``HAVE_GEOM=1`` - include the geom component;
- ``HAVE_TESTING=1`` - include the testing component;
- ``HAVE_PYTHON=1`` - include the Python component;
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -180,50 +180,12 @@ AC_ARG_ENABLE([odbc],
[enable_odbc=$enableval],
[enable_odbc=$dft_odbc])
-dft_gdk=yes
-AC_ARG_ENABLE([gdk],
- [AS_HELP_STRING([--enable-gdk],
- [enable support for GDK (default=yes)])],
- [enable_gdk=$enableval],
- [enable_gdk=$dft_gdk])
-
-dft_monetdb5=yes
-AC_ARG_ENABLE([monetdb5],
- [AS_HELP_STRING([--enable-monetdb5],
- [enable support for MonetDB5 (default=yes)])],
- [enable_monetdb5=$enableval],
- [enable_monetdb5=$dft_monetdb5])
-AS_CASE([$enable_gdk-$enable_monetdb5],
- [no-yes], [AC_MSG_ERROR([MonetDB5 requires GDK.])],
- [no-auto], [
- enable_monetdb5=no
- why_not_monetdb5="(MonetDB5 requires GDK.)"])
-
-dft_sql=yes
-AC_ARG_ENABLE([sql],
- [AS_HELP_STRING([--enable-sql],
- [enable support for MonetDB/SQL (default=yes)])],
- [enable_sql=$enableval],
- [enable_sql=$dft_sql])
-AS_CASE([$enable_monetdb5-$enable_sql],
-[no-yes], [
- AC_MSG_ERROR([MonetDB/SQL requires MonetDB5.])],
-[no-auto], [
- enable_sql=no
- why_not_sql="(MonetDB/SQL requires MonetDB5.)"])
-
dft_geom=auto
AC_ARG_ENABLE([geom],
[AS_HELP_STRING([--enable-geom],
[enable support for geom module (default=auto)])],
[enable_geom=$enableval],
[enable_geom=$dft_geom])
-AS_CASE([$enable_monetdb5-$enable_geom],
-[no-yes], [
- AC_MSG_ERROR([geom module requires MonetDB5])],
-[no-auto], [
- enable_geom=no
- why_not_geom="(geom module requires MonetDB5)"])
dft_fits=auto
AC_ARG_ENABLE([fits],
@@ -1166,13 +1128,9 @@ AS_CASE([$YACC],
],
[
# in embedded mode, we ship the bison-generated files
- AS_VAR_IF([enable_embedded], [no], [
- AS_VAR_IF([enable_sql], [yes], [
- AC_MSG_ERROR([MonetDB/SQL requires bison])])
- enable_sql=no
- AS_VAR_IF([why_not_sql], [], [
- why_not_sql="(MonetDB/SQL requires bison)"])], [
- AC_MSG_WARN([ignoring missing bison in embedded
configuration])])
+ AS_VAR_IF([enable_embedded], [no],
+ [AC_MSG_ERROR([MonetDB/SQL requires bison])],
+ [AC_MSG_WARN([ignoring missing bison in embedded
configuration])])
])
INSTALL_BACKUP=""
@@ -1557,30 +1515,15 @@ AS_CASE([$host],
PKG_CHECK_MODULES([openssl], [openssl],
[have_openssl=yes],
[have_openssl=no; why_not_openssl="(OpenSSL
library not found)"])
- AS_CASE([$enable_monetdb5-$have_openssl],
- [yes-no], [
+ AS_VAR_IF([have_openssl], [no], [
AC_MSG_ERROR([OpenSSL library not found but required
for MonetDB5])],
- [auto-no], [
- enable_monetdb5=no
- AS_VAR_IF([why_not_monetdb5], [], [
- why_not_monetdb5="(OpenSSL library not found
but required for MonetDB5)"])],
- [*-yes], [
+ [
save_LIBS="$LIBS"
LIBS="$LIBS $openssl_LIBS"
AC_CHECK_FUNCS([MD5_Update RIPEMD160_Update SHA1_Update
SHA224_Update SHA256_Update SHA384_Update SHA512_Update])
LIBS="$save_LIBS"
AS_VAR_IF([ac_cv_func_${MONETDB5_PASSWDHASH}_Update],
[yes], [], [
- AS_CASE([$enable_monetdb5],
- [yes], [
- AC_MSG_ERROR([OpenSSL library found but
checksum algorithm required for MonetDB5 not found])],
- [auto], [
- enable_monetdb5=no
- AS_VAR_IF([why_not_monetdb5], [], [
- why_not_monetdb5="(OpenSSL
library found but checksum algorithm required for MonetDB5 not found)"])],
- [
- AC_MSG_WARN([OpenSSL library found but
required checksum algorithm not found, so disabling])])
- have_openssl=no
- why_not_openssl="(OpenSSL library found but
required checksum algorithm not found)"])])
+ AC_MSG_ERROR([OpenSSL library found but
checksum algorithm required for MonetDB5 not found])])])
AS_VAR_IF([have_openssl], [yes], [
AC_DEFINE([HAVE_OPENSSL], 1, [Define if you have the
OpenSSL library])])])])
@@ -1640,13 +1583,9 @@ AS_VAR_IF([have_pcre], [no], [
[AC_MSG_RESULT([no]); have_gnuregex=no])
])
-AS_CASE([$enable_monetdb5-$have_pcre-$have_gnuregex],
-[yes-no-no], [
- AC_MSG_ERROR([PCRE library or GNU regex library not found but required
for MonetDB5])],
-[auto-no-no], [
- enable_monetdb5=no
- AS_VAR_IF([why_not_monetdb5], [], [
- why_not_monetdb5="(PCRE library or GNU regex library not found
but required for MonetDB5)"])])
+AS_CASE([$have_pcre-$have_gnuregex],
+[no-no], [
+ AC_MSG_ERROR([PCRE library or GNU regex library not found but required
for MonetDB5])])
org_have_libxml2=yes
have_libxml2=$org_have_libxml2
@@ -2558,20 +2497,7 @@ AS_VAR_IF([mn_cv_have__sys_siglist], [ye
AC_STRUCT_TIMEZONE
-# check dependencies (might need more than just SQL)
-AS_VAR_IF([enable_sql], [yes],
- [AS_VAR_IF([enable_monetdb5], [no],
- [AC_MSG_ERROR([MonetDB/SQL requires
MonetDB5${why_not_monetdb5:+ $why_not_monetdb5}.])])])
-AS_VAR_IF([enable_sql], [auto],
- [AS_VAR_IF([enable_monetdb5], [no],
- [enable_sql=no
- AS_VAR_IF([why_not_sql], [],
- [why_not_sql="(MonetDB/SQL requires MonetDB5)"])])])
-
# output
-AM_CONDITIONAL([HAVE_GDK], [test "x$enable_gdk" = xyes -o "x$enable_gdk" =
xauto])
-AM_CONDITIONAL([HAVE_MONETDB5], [test "x$enable_monetdb5" = xyes -o
"x$enable_monetdb5" = xauto])
-AM_CONDITIONAL([HAVE_SQL], [test "x$enable_sql" = xyes -o "x$enable_sql" =
xauto])
AM_CONDITIONAL([HAVE_GEOM], [test "x$enable_geom" = xyes -o "x$enable_geom" =
xauto])
AM_CONDITIONAL([HAVE_EMBEDDED], [test "x$enable_embedded" = xyes])
AM_CONDITIONAL([HAVE_TESTING], [test "x$enable_testing" = xyes -o
"x$enable_testing" = xauto])
@@ -2857,9 +2783,6 @@ done
AS_ECHO([''])
AS_ECHO(["* Enabled/disabled components:"])
for comp in \
- 'gdk ' \
- 'monetdb5 ' \
- 'sql ' \
'geom ' \
'py2integration' \
'py3integration' \
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,9 @@ override_dh_auto_configure:
--enable-embedded=no \
--enable-embedded-r=no \
--enable-fits=yes \
- --enable-gdk=yes \
--enable-geom=yes \
--enable-lidar=yes \
--enable-mapi=yes \
- --enable-monetdb5=yes \
--enable-netcdf=no \
--enable-odbc=yes \
--enable-optimize=yes \
@@ -32,7 +30,6 @@ override_dh_auto_configure:
--enable-rintegration=yes \
--enable-sanitizer=no \
--enable-shp=no \
- --enable-sql=yes \
--enable-static-analysis=no \
--enable-strict=no \
--enable-testing=yes \
diff --git a/geom/Makefile.ag b/geom/Makefile.ag
--- a/geom/Makefile.ag
+++ b/geom/Makefile.ag
@@ -4,6 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
-SUBDIRS = lib HAVE_MONETDB5?monetdb5 sql
+SUBDIRS = lib monetdb5 sql
EXTRA_DIST_DIR = BugTracker
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -383,7 +383,6 @@ CONDITIONALS = {
'HAVE_CURL' : "@HAVE_CURL_FALSE@",
'HAVE_DEVELOPER' : "@HAVE_DEVELOPER_FALSE@",
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
