Changeset: 5b1503d8d455 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b1503d8d455
Modified Files:
        configure.ag
Branch: Mar2018
Log Message:

Just use one type of variable to specify why a feature is not included.
Use why_not_XXX instead of disable_XXX and why_have_XXX.


diffs (truncated from 745 to 300 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -198,7 +198,7 @@ AS_CASE([$enable_gdk-$enable_monetdb5],
        [no-yes], [AC_MSG_ERROR([MonetDB5 requires GDK.])],
        [no-auto], [
                enable_monetdb5=no
-               disable_monetdb5="(MonetDB5 requires GDK.)"])
+               why_not_monetdb5="(MonetDB5 requires GDK.)"])
 
 dft_sql=yes
 AC_ARG_ENABLE([sql],
@@ -211,7 +211,7 @@ AS_CASE([$enable_monetdb5-$enable_sql],
        AC_MSG_ERROR([MonetDB/SQL requires MonetDB5.])],
 [no-auto], [
        enable_sql=no
-       disable_sql="(MonetDB/SQL requires MonetDB5.)"])
+       why_not_sql="(MonetDB/SQL requires MonetDB5.)"])
 
 dft_geom=auto
 AC_ARG_ENABLE([geom],
@@ -224,7 +224,7 @@ AS_CASE([$enable_monetdb5-$enable_geom],
        AC_MSG_ERROR([geom module requires MonetDB5])],
 [no-auto], [
        enable_geom=no
-       disable_geom="(geom module requires MonetDB5)"])
+       why_not_geom="(geom module requires MonetDB5)"])
 
 dft_fits=auto
 AC_ARG_ENABLE([fits],
@@ -258,7 +258,7 @@ AS_CASE([$enable_geom-$have_shp],
        AC_MSG_ERROR([ESRI Shapefile vault requires the geom module])],
 [no-auto], [
        have_shp=no
-       disable_shp="(ESRI Shapefile vault requires the geom module)"])
+       why_not_shp="(ESRI Shapefile vault requires the geom module)"])
 
 dft_embedded=no
 AC_ARG_ENABLE([embedded],
@@ -813,7 +813,7 @@ AS_CASE([x$enable_debug.$enable_optimize
        [xyes.*], [
                enable_debug=yes
                AS_VAR_IF([enable_optimize], [no], [],
-                       [disable_optimize="(as debug is enabled)"])
+                       [why_not_optimize="(as debug is enabled)"])
                enable_optimize=no
                ],
        [x*.*no], [
@@ -824,7 +824,7 @@ AS_CASE([x$enable_debug.$enable_optimize
                # enable-optimize overrules other defaults
                enable_optimize=yes
                AS_VAR_IF([enable_debug], [no], [],
-                       [disable_debug="(as optimize is enabled)"])
+                       [why_not_debug="(as optimize is enabled)"])
                enable_debug=no
                ],
        [x*],
@@ -1091,13 +1091,13 @@ AS_VAR_IF([have_python2], [no],
                                 have_python2=yes],
                                [AS_VAR_IF([have_python], [auto],
                                        [have_python2=no
-                                        why_have_python2="(Python 2 executable 
not found)"],
+                                        why_not_python2="(Python 2 executable 
not found)"],
                                        [AC_MSG_ERROR([Python 2 executable not 
found])])])],
                        [AS_CASE([`"$PYTHON2" -V 2>&1`],
                                ["Python 2."[[67]]*], [],
                                [AS_VAR_IF([have_python2], [auto], [
                                        have_python2=no
-                                       why_have_python2="(Python 2 executable 
too old)"], [
+                                       why_not_python2="(Python 2 executable 
too old)"], [
                                        AC_MSG_ERROR([Python 2 executable too 
old])])])])])])
 
 AS_VAR_IF([have_python2], [no],
@@ -1155,7 +1155,7 @@ AS_VAR_IF([have_python3], [no],
                                 have_python3=yes],
                                [AS_VAR_IF([have_python3], [auto],
                                        [have_python3=no
-                                        why_have_python3="(Python 3 executable 
not found)"],
+                                        why_not_python3="(Python 3 executable 
not found)"],
                                        [AC_MSG_ERROR([Python3 executable not 
found])])])])])])
 
 AS_VAR_IF([have_python3], [no],
@@ -1232,8 +1232,8 @@ AS_CASE([$YACC],
                        AS_VAR_IF([enable_sql], [yes], [
                                AC_MSG_ERROR([MonetDB/SQL requires bison])])
                        enable_sql=no
-                       AS_VAR_IF([disable_sql], [], [
-                               disable_sql="(MonetDB/SQL requires bison)"])], [
+                       AS_VAR_IF([why_not_sql], [], [
+                               why_not_sql="(MonetDB/SQL requires bison)"])], [
                        AC_MSG_WARN([ignoring missing bison in embedded 
configuration])])
        ])
 
@@ -1320,9 +1320,9 @@ AS_VAR_IF([have_bz2], [no], [], [
                [AC_CHECK_LIB([bz2], [BZ2_bzopen],
                        [AC_DEFINE([HAVE_LIBBZ2], 1, [Define if you have the 
bz2 library])],
                        [AS_VAR_IF([have_bz2], [auto], [], [AC_MSG_ERROR([-lbz2 
library not found])])
-                        have_bz2=no; why_have_bz2="(bz2 library not found)"])],
+                        have_bz2=no; why_not_bz2="(bz2 library not found)"])],
                [AS_VAR_IF([have_bz2], [auto], [], [AC_MSG_ERROR([bzlib.h 
header not found])])
-                        have_bz2=no; why_have_bz2="(bzlib.h header not 
found)"])
+                        have_bz2=no; why_not_bz2="(bzlib.h header not found)"])
        LDFLAGS="$save_LDFLAGS"
        CPPFLAGS="$save_CPPFLAGS"])
 AS_VAR_IF([have_bz2], [no], [BZ_CFLAGS=""; BZ_LIBS=""])
@@ -1357,9 +1357,9 @@ AS_VAR_IF([have_snappy], [no], [], [
                [AC_CHECK_LIB([snappy], [snappy_max_compressed_length],
                        [AC_DEFINE([HAVE_LIBSNAPPY], 1, [Define if you have the 
snappy library])],
                        [AS_VAR_IF([have_snappy], [auto], [], 
[AC_MSG_ERROR([-lsnappy library not found])])
-                        have_snappy=no; why_have_snappy="(snappy library not 
found)"])],
+                        have_snappy=no; why_not_snappy="(snappy library not 
found)"])],
                [AS_VAR_IF([have_snappy], [auto], [], [AC_MSG_ERROR([snappy-c.h 
header not found])])
-                        have_snappy=no; why_have_snappy="(snappy-c.h header 
not found)"])
+                        have_snappy=no; why_not_snappy="(snappy-c.h header not 
found)"])
        LDFLAGS="$save_LDFLAGS"
        CPPFLAGS="$save_CPPFLAGS"])
 AS_VAR_IF([have_snappy], [no], [snappy_CFLAGS=""; snappy_LIBS=""])
@@ -1393,9 +1393,9 @@ AS_VAR_IF([have_lz4], [no], [], [
                [AC_CHECK_LIB([lz4], [LZ4_compress_fast],
                        [AC_DEFINE([HAVE_LIBLZ4], 1, [Define if you have the 
lz4 library])],
                        [AS_VAR_IF([have_lz4], [auto], [], [AC_MSG_ERROR([-llz4 
library not found])])
-                        have_lz4=no; why_have_lz4="(lz4 library not found)"])],
+                        have_lz4=no; why_not_lz4="(lz4 library not found)"])],
                [AS_VAR_IF([have_lz4], [auto], [], [AC_MSG_ERROR([lz4.h header 
not found])])
-                        have_lz4=no; why_have_lz4="(lz4.h header not found)"])
+                        have_lz4=no; why_not_lz4="(lz4.h header not found)"])
        LDFLAGS="$save_LDFLAGS"
        CPPFLAGS="$save_CPPFLAGS"])
 AS_VAR_IF([have_lz4], [no], [lz4_CFLAGS=""; lz4_LIBS=""])
@@ -1500,7 +1500,7 @@ AS_VAR_IF([have_pthread], [no], [], [
                                AS_VAR_IF([have_pthread], [auto], [], [
                                        AC_MSG_ERROR([pthread library not 
found])])
                                have_pthread=no
-                               why_have_pthread="(pthread library not found)"])
+                               why_not_pthread="(pthread library not found)"])
                        PTHREAD_LIBS="$LIBS"])
 
        AC_SEARCH_LIBS([pthread_kill], [],
@@ -1563,14 +1563,14 @@ AS_VAR_IF([have_readline], [no], [], [
                                        [AS_VAR_IF([have_readline], [yes], [
                                                AC_MSG_ERROR([readline library 
not found])])
                                          have_readline=no
-                                         why_have_readline="(readline library 
not found)" ],
+                                         why_not_readline="(readline library 
not found)" ],
                                        [-lncurses])],
                                [-ltermcap])],
                        ),
                [AS_VAR_IF([have_readline], [yes], [
                        AC_MSG_ERROR([readline header file not found])])
                  have_readline=no
-                 why_have_readline="(readline header file not found)" ])])
+                 why_not_readline="(readline header file not found)" ])])
 
 AS_VAR_IF([have_readline], [no],
        [],
@@ -1588,12 +1588,12 @@ AS_VAR_IF([have_readline], [no],
                        [AS_VAR_IF([have_readline], [auto],
                                [AC_MSG_RESULT([no])
                                 have_readline=no
-                                why_have_readline="(readline/readline.h does 
not contain rl_completion_func_t, is it GNU readline?)"],
+                                why_not_readline="(readline/readline.h does 
not contain rl_completion_func_t, is it GNU readline?)"],
                                [AC_MSG_ERROR([readline/readline.h does not 
contain rl_completion_func_t, is it GNU readline?])])])],
                [AS_VAR_IF([have_readline], [auto], [], [
                        AC_MSG_ERROR([readline library does not contain 
rl_completion_matches])])
                 have_readline=no
-                why_have_readline="(readline library does not contain 
rl_completion_matches)" ],
+                why_not_readline="(readline library does not contain 
rl_completion_matches)" ],
                [$READLINE_LIBS])])
 CPPFLAGS="$save_CPPFLAGS"
 LIBS="$save_LIBS"
@@ -1656,14 +1656,14 @@ AS_CASE([$host],
        AS_VAR_IF([have_openssl], [no], [], [
                PKG_CHECK_MODULES([openssl], [openssl],
                                [have_openssl=yes],
-                               [have_openssl=no; why_have_openssl="(OpenSSL 
library not found)"])
+                               [have_openssl=no; why_not_openssl="(OpenSSL 
library not found)"])
                AS_CASE([$enable_monetdb5-$have_openssl],
                [yes-no], [
                        AC_MSG_ERROR([OpenSSL library not found but required 
for MonetDB5])],
                [auto-no], [
                        enable_monetdb5=no
-                       AS_VAR_IF([disable_monetdb5], [], [
-                               disable_monetdb5="(OpenSSL library not found 
but required for MonetDB5)"])],
+                       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"
@@ -1675,12 +1675,12 @@ AS_CASE([$host],
                                        AC_MSG_ERROR([OpenSSL library found but 
checksum algorithm required for MonetDB5 not found])],
                                [auto], [
                                        enable_monetdb5=no
-                                       AS_VAR_IF([disable_monetdb5], [], [
-                                               disable_monetdb5="(OpenSSL 
library found but checksum algorithm required for MonetDB5 not found)"])],
+                                       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_have_openssl="(OpenSSL library found but 
required checksum algorithm not found)"])])
+                               why_not_openssl="(OpenSSL library found but 
required checksum algorithm not found)"])])
                AS_VAR_IF([have_openssl], [yes], [
                        AC_DEFINE([HAVE_OPENSSL], 1, [Define if you have the 
OpenSSL library])])])])
 
@@ -1698,7 +1698,7 @@ AC_ARG_WITH([regex],
        [have_regex=$dft_regex])
 
 AS_VAR_IF([have_regex], [posix],
-       [have_pcre=no; why_have_pcre="(PCRE disabled)"],
+       [have_pcre=no; why_not_pcre="(PCRE disabled)"],
        [
        # PCRE library
        # required on Windows, optional on POSIX systems with GNU regex
@@ -1707,7 +1707,7 @@ AS_VAR_IF([have_regex], [posix],
                [have_pcre=yes],
                [AS_VAR_IF([have_regex], [pcre],
                        [AC_MSG_ERROR([PCRE library not found or not usable])],
-                       [have_pcre=no; why_have_pcre="(libpcre >= $req_pcre_ver 
not found)"])])
+                       [have_pcre=no; why_not_pcre="(libpcre >= $req_pcre_ver 
not found)"])])
        AS_VAR_IF([have_pcre], [yes], [
                AC_MSG_CHECKING([whether pcre comes with UTF-8 support])
                save_LIBS="$LIBS"
@@ -1718,7 +1718,7 @@ AS_VAR_IF([have_regex], [posix],
                        [[@%:@include <pcre.h>]],
                        [[int rc; pcre_config(PCRE_CONFIG_UTF8, &rc); 
exit(!rc);]])],
                        [AC_MSG_RESULT([yes])],
-                       [have_pcre=no; why_have_pcre="(libpcre found but no 
UTF-8 support)"; AC_MSG_RESULT([no])],
+                       [have_pcre=no; why_not_pcre="(libpcre found but no 
UTF-8 support)"; AC_MSG_RESULT([no])],
                        [AC_MSG_RESULT([assuming yes])])
                LIBS="$save_LIBS"
                CFLAGS="$save_CFLAGS"
@@ -1745,8 +1745,8 @@ AS_CASE([$enable_monetdb5-$have_pcre-$ha
        AC_MSG_ERROR([PCRE library or GNU regex library not found but required 
for MonetDB5])],
 [auto-no-no], [
        enable_monetdb5=no
-       AS_VAR_IF([disable_monetdb5], [], [
-               disable_monetdb5="(PCRE library or GNU regex library not found 
but required for MonetDB5)"])])
+       AS_VAR_IF([why_not_monetdb5], [], [
+               why_not_monetdb5="(PCRE library or GNU regex library not found 
but required for MonetDB5)"])])
 
 org_have_libxml2=yes
 have_libxml2=$org_have_libxml2
@@ -1755,7 +1755,7 @@ AC_ARG_WITH([libxml2],
                [include libxml2 support (default=yes)])],
        [have_libxml2=$withval])
 AS_VAR_IF([have_libxml2], [no], [], [
-       PKG_CHECK_MODULES([libxml2], [libxml-2.0], [have_libxml2="yes"], 
[have_libxml2="no"; why_have_libxml2="(libxml2 not found)"])
+       PKG_CHECK_MODULES([libxml2], [libxml-2.0], [have_libxml2="yes"], 
[have_libxml2="no"; why_not_libxml2="(libxml2 not found)"])
        AS_VAR_IF([have_libxml2], [yes], [
                AC_DEFINE([HAVE_LIBXML], 1, [Define if you have the xml 
library])])])
 AM_CONDITIONAL([HAVE_LIBXML], [test x"$have_libxml2" != xno])
@@ -1768,14 +1768,14 @@ AC_ARG_WITH([curl],
                [include cURL support (default=yes)])],
        [have_curl=$withval])
 AS_VAR_IF([have_curl], [no], [], [
-       PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], 
[have_curl="no"; why_have_curl="(libcurl not found)"])
+       PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], 
[have_curl="no"; why_not_curl="(libcurl not found)"])
        AS_VAR_IF([have_curl], [yes], [
                AC_DEFINE([HAVE_CURL], 1, [Define if you have the cURL library])
                AC_SUBST([PKG_CURL], [libcurl])])])
 AM_CONDITIONAL([HAVE_CURL], [test x"$have_curl" != xno])
 
 
-PKG_CHECK_MODULES([zlib], [zlib], [have_zlib="yes"], [have_zlib="no"; 
why_have_zlib="(zlib not found)"])
+PKG_CHECK_MODULES([zlib], [zlib], [have_zlib="yes"], [have_zlib="no"; 
why_not_zlib="(zlib not found)"])
 AS_CASE([$have_zlib],
        [no],
                [# Solaris doesn't provide zlib.pc, but zlib may well be present
@@ -1793,7 +1793,7 @@ AC_ARG_WITH([lzma],
                [include lzma support (default=yes)])],
        [have_lzma=$withval])
 AS_VAR_IF([have_lzma], [no], [], [
-       PKG_CHECK_MODULES([liblzma], [liblzma], [have_liblzma="yes"], 
[have_liblzma="no"; why_have_liblzma="(liblzma not found, install xz-libs and 
xz-devel)"])
+       PKG_CHECK_MODULES([liblzma], [liblzma], [have_liblzma="yes"], 
[have_liblzma="no"; why_not_liblzma="(liblzma not found, install xz-libs and 
xz-devel)"])
        AS_VAR_IF([have_liblzma], [yes], [
                AC_SUBST([PKG_LIBLZMA], [liblzma])])
        AS_VAR_IF([have_liblzma], [yes], [
@@ -1824,9 +1824,9 @@ AS_VAR_IF([enable_rintegration], [no], [
                [AS_VAR_IF([enable_rintegration], [yes],
                        [AC_MSG_ERROR([libR library required for R integration 
support])],
                        [have_libr="no"
-                        why_have_libr="(libR library not found)"
+                        why_not_libr="(libR library not found)"
                         enable_rintegration=no
-                        disable_rintegration="(libR library not found)"])],
+                        why_not_rintegration="(libR library not found)"])],
                [AS_IF([RHOME=`$RCMD RHOME` && libr_CFLAGS=`$RCMD CMD config 
--cppflags` && libr_LIBS=`$RCMD CMD config --ldflags | sed -e 's|-fopenmp 
|-fopenmp=libgomp |'`],
                        [have_libr=yes
                         AC_DEFINE([HAVE_LIBR], 1, [Define if you have libR 
installed])
@@ -1852,9 +1852,9 @@ AS_VAR_IF([enable_pyintegration], [no], 
                                AS_VAR_IF([enable_pyintegration], [yes],
                                [AC_MSG_ERROR([python2-config library required 
for Python integration support])],
                                [have_libpy="no"
-                               why_have_libpy="(python2-config command not 
found)"
+                               why_not_libpy="(python2-config command not 
found)"
                                enable_pyintegration="no"
-                               disable_pyintegration="(python2-config command 
not found)"
+                               why_not_pyintegration="(python2-config command 
not found)"
                                ])
                        ], [PY2CONFIG="$PYCMD2"])
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to