Changeset: b14c4bcbf142 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b14c4bcbf142
Added Files:
        sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
Removed Files:
        debian/libmonetdb5-server-gsl.install
        sql/backends/monet5/gsl/46_gsl.sql
        sql/backends/monet5/gsl/73_gsl.mal
        sql/backends/monet5/gsl/Makefile.ag
        sql/backends/monet5/gsl/Tests/All
        sql/backends/monet5/gsl/Tests/gsl00.malC
        sql/backends/monet5/gsl/Tests/gsl00.stable.err
        sql/backends/monet5/gsl/Tests/gsl00.stable.out
        sql/backends/monet5/gsl/Tests/gsl01.sql
        sql/backends/monet5/gsl/Tests/gsl01.stable.err
        sql/backends/monet5/gsl/Tests/gsl01.stable.out
        sql/backends/monet5/gsl/gsl.c
        sql/backends/monet5/gsl/gsl.mal
        sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
        sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128
Modified Files:
        .hgtags
        MonetDB.spec
        NT/installer32/MonetDB-ODBC-Installer.vdproj
        NT/installer32/MonetDB5-Geom-Module.vdproj
        NT/installer32/MonetDB5-SQL-Installer.vdproj
        NT/installer64/MonetDB-ODBC-Installer.vdproj
        NT/installer64/MonetDB5-Geom-Module.vdproj
        NT/installer64/MonetDB5-SQL-Installer.vdproj
        NT/monetdb_config.h.in
        NT/rules.msc
        clients/Tests/All
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/mapilib/mapi.rc
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        configure.ag
        debian/changelog
        debian/control
        debian/rules
        gdk/libbat.rc
        libversions
        monetdb5/mal/mal_resource.h
        monetdb5/tools/libmonetdb5.rc
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/sql.c
        sql/test/BugTracker-2013/Tests/All
        sql/test/BugTracker-2015/Tests/All
        sql/test/BugTracker-2016/Tests/storagemodel.sql
        sql/test/BugTracker-2016/Tests/storagemodel.stable.err
        sql/test/BugTracker-2016/Tests/storagemodel.stable.out
        sql/test/Tests/All
        sql/test/Tests/systemfunctions.stable.out
        sql/test/Tests/systemfunctions.stable.out.int128
        sql/test/emptydb-upgrade-chain-hge/Tests/All
        sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/All
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-hge/Tests/All
        sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade/Tests/All
        sql/test/emptydb-upgrade/Tests/check.stable.out
        sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
        sql/test/emptydb-upgrade/Tests/check.stable.out.int128
        sql/test/emptydb/Tests/All
        sql/test/emptydb/Tests/check.stable.out
        sql/test/emptydb/Tests/check.stable.out.32bit
        sql/test/emptydb/Tests/check.stable.out.int128
        sql/test/leaks/Tests/All
        sql/test/leaks/Tests/check1.stable.out
        sql/test/leaks/Tests/check1.stable.out.int128
        sql/test/leaks/Tests/check2.stable.out
        sql/test/leaks/Tests/check2.stable.out.int128
        sql/test/leaks/Tests/check3.stable.out
        sql/test/leaks/Tests/check3.stable.out.int128
        sql/test/leaks/Tests/check4.stable.out
        sql/test/leaks/Tests/check4.stable.out.int128
        sql/test/leaks/Tests/check5.stable.out
        sql/test/leaks/Tests/check5.stable.out.int128
        sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql
        sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
        sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
        
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
        sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql
        sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
        testing/Mtest.py.in
        vertoo.data
Branch: queryid2
Log Message:

merge with default


diffs (truncated from 3384 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -649,3 +649,5 @@ ea0fe76e0095771bccca626b39e3e839a90ba320
 afc859894553ef804cded49a83b035d9d2cda73b Dec2016_release
 bf4b58d202645774b75c7f508c84b30e3be78a49 Dec2016_5
 bf4b58d202645774b75c7f508c84b30e3be78a49 Dec2016_SP1_release
+3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_7
+3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -78,6 +78,14 @@
 %endif
 %endif
 
+# If the _without_pcre macro is not set, the PCRE library is used for
+# the implementation of the SQL LIKE and ILIKE operators.  Otherwise
+# the POSIX regex functions are used.  The macro can be set when using
+# mock by passing it the flag --without=pcre.
+%if %{?_without_pcre:0}%{!?_without_pcre:1}
+%define with_pcre 1
+%endif
+
 %if %{fedpkgs}
 # If the _without_rintegration macro is not set, the MonetDB-R RPM
 # will be created.  The macro can be set when using mock by passing it
@@ -124,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
 Group: Applications/Databases
 License: MPLv2.0
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Dec2016-SP1/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Dec2016-SP2/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
@@ -140,7 +148,6 @@ BuildRequires: gcc
 %if %{?with_geos:1}%{!?with_geos:0}
 BuildRequires: geos-devel >= 3.4.0
 %endif
-BuildRequires: gsl-devel
 %if %{?with_lidar:1}%{!?with_lidar:0}
 BuildRequires: liblas-devel >= 1.8.0
 BuildRequires: gdal-devel
@@ -156,7 +163,9 @@ BuildRequires: xz-devel
 BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel
 BuildRequires: openssl-devel
+%if %{?with_pcre:1}%{!?with_pcre:0}
 BuildRequires: pcre-devel >= 4.5
+%endif
 BuildRequires: readline-devel
 BuildRequires: unixODBC-devel
 # BuildRequires: uriparser-devel
@@ -468,27 +477,6 @@ This package contains support for readin
 %{_libdir}/monetdb5/lib_lidar.so
 %endif
 
-%package gsl-MonetDB5
-Summary: MonetDB5 SQL interface to the gsl library
-Group: Applications/Databases
-Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
-
-%description gsl-MonetDB5
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators.  It also has an SQL frontend.
-
-This package contains the interface to the GNU Scientific Library for
-numerical analysis (gsl).
-
-%files gsl-MonetDB5
-%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/*_gsl.mal
-%{_libdir}/monetdb5/createdb/*_gsl.sql
-%{_libdir}/monetdb5/gsl.mal
-%{_libdir}/monetdb5/lib_gsl.so
-
 %if %{?with_samtools:1}%{!?with_samtools:0}
 %package bam-MonetDB5
 Summary: MonetDB5 SQL interface to the bam library
@@ -647,7 +635,6 @@ fi
 %if %{?with_geos:1}%{!?with_geos:0}
 %exclude %{_libdir}/monetdb5/geom.mal
 %endif
-%exclude %{_libdir}/monetdb5/gsl.mal
 %if %{?with_lidar:1}%{!?with_lidar:0}
 %exclude %{_libdir}/monetdb5/lidar.mal
 %endif
@@ -666,7 +653,6 @@ fi
 %if %{?with_geos:1}%{!?with_geos:0}
 %exclude %{_libdir}/monetdb5/autoload/*_geom.mal
 %endif
-%exclude %{_libdir}/monetdb5/autoload/*_gsl.mal
 %if %{?with_lidar:1}%{!?with_lidar:0}
 %exclude %{_libdir}/monetdb5/autoload/*_lidar.mal
 %endif
@@ -681,7 +667,6 @@ fi
 %if %{?with_geos:1}%{!?with_geos:0}
 %exclude %{_libdir}/monetdb5/lib_geom.so
 %endif
-%exclude %{_libdir}/monetdb5/lib_gsl.so
 %if %{?with_lidar:1}%{!?with_lidar:0}
 %exclude %{_libdir}/monetdb5/lib_lidar.so
 %endif
@@ -800,7 +785,6 @@ systemd-tmpfiles --create %{_sysconfdir}
 %if %{?with_geos:1}%{!?with_geos:0}
 %exclude %{_libdir}/monetdb5/createdb/*_geom.sql
 %endif
-%exclude %{_libdir}/monetdb5/createdb/*_gsl.sql
 %if %{?with_lidar:1}%{!?with_lidar:0}
 %exclude %{_libdir}/monetdb5/createdb/*_lidar.sql
 %endif
@@ -904,7 +888,6 @@ developer, but if you do want to test, t
        --enable-fits=%{?with_fits:yes}%{!?with_fits:no} \
        --enable-gdk=yes \
        --enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
-       --enable-gsl=yes \
        --enable-instrument=no \
        --enable-int128=%{?with_int128:yes}%{!?with_int128:no} \
        --enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \
@@ -928,6 +911,7 @@ developer, but if you do want to test, t
        --with-libxml2=yes \
        --with-lzma=yes \
        --with-openssl=yes \
+       --with-regex=%{?with_pcre:PCRE}%{!?with_pcre:POSIX} \
        --with-proj=no \
        --with-pthread=yes \
        --with-python2=yes \
@@ -962,6 +946,49 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Feb 16 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 
11.25.7-20170216
+- Rebuilt.
+- BZ#4034: argnames array in rapi.c has fixed length (that was too short)
+- BZ#6080: mserver5: rel_bin.c:2391: rel2bin_project: Assertion `0'
+  failed.
+- BZ#6081: Segmentation fault (core dumped)
+- BZ#6082: group.subgroup is undefined if group by is used on an
+  expression involving only constants
+- BZ#6111: Maximum number of digits for hge decimal is listed as 39 in
+  sys.types. Should be 38 as DECIMAL(39) is not supported.
+- BZ#6112: Crash upgrading Jul2015->Jun2016
+- BZ#6130: Query rewriter crashes on a NULL pointer when having a
+  correlated subquery
+- BZ#6133: A crash occurs when preparing an INSERT on joined tables
+  during the query semantic phase
+- BZ#6141: Getting an error message regarding a non-GROUP-BY column
+  rather than an unknown identifier
+- BZ#6177: Server crashes
+- BZ#6186: Null casting causes no results (silent server crash?)
+- BZ#6189: Removing a NOT NULL constraint from a PKey column should NOT
+  be allowed
+- BZ#6190: CASE query crashes database
+- BZ#6191: MT_msync failed with "Cannot allocate memory"
+- BZ#6192: Numeric column stores wrong values after adding large numbers
+- BZ#6193: converting to a smaller precision (fewer or no decimals after
+  decimal point) should round/truncate consistently
+- BZ#6194: splitpart returns truncated last part if it contains non
+  ascii caracters
+- BZ#6195: Cast from huge decimal type to smaller returns wrong results
+- BZ#6196: Database crashes after generate_series query
+- BZ#6198: COALESCE could be more optimized
+- BZ#6201: MonetDB completely giving up on certain queries - no error
+  and no result
+- BZ#6202: querying a table with an ordered index on string/varchar
+  column crashes server and makes server unrestartable!
+- BZ#6203: copy into: Failed to import table Leftover data 'False'
+- BZ#6205: Integer addition overflow
+- BZ#6206: casting strings with more than one trailing zero ('0') to
+  decimal goes wrong
+- BZ#6209: Aggregation over complex OR expressions produce wrong results
+- BZ#6210: Upgrading a database from Jun2015 or older crashes the server
+- BZ#6213: SQLsmith causes server to crash
+
 * Fri Jan 13 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 
11.25.5-20170113
 - Rebuilt.
 - BZ#4039: Slow mserver5 start after drop of tables (> 1 hour)
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -311,11 +311,6 @@ create_winconfig_conds_new_py:
 !ELSE
        $(ECHO) HAVE_GEOM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ENDIF
-!IFDEF HAVE_GSL
-       $(ECHO) HAVE_GSL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
-       $(ECHO) HAVE_GSL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
 !IFDEF HAVE_HGE
        $(ECHO) HAVE_HGE_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ELSE
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,3 +1,3 @@
 exports
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures
+HAVE_FITS&HAVE_GEOM&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures
 MERCURIAL?malcheck
diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -6014,9 +6014,6 @@ Ready.
 [ "batgeom",   "coordinateFromWKB",    "command 
batgeom.coordinateFromWKB(X_0:bat[:wkb], X_1:int):bat[:dbl] ", 
"wkbCoordinateFromWKB_bat;",    "returns xmin (=1), ymin (=2), xmax (=3) or 
ymax(=4) of the provided geometry"  ]
 [ "batgeom",   "mbr",  "command batgeom.mbr(X_0:bat[:wkb]):bat[:mbr] ",        
"wkbMBR_bat;",  "Creates the mbr for the given wkb."    ]
 [ "batgeom",   "setSRID",      "command batgeom.setSRID(w:bat[:wkb], 
srid:int):bat[:wkb] ",    "wkbSetSRID_bat;",      "Sets the Reference System ID 
for this Geometry."       ]
-[ "batgsl",    "chi2prob",     "command batgsl.chi2prob(d:bat[:dbl], 
i:bat[:dbl]):bat[:dbl] ", "GSLbat_chisqProb_bat;",        "Chi Squared 
probability"       ]
-[ "batgsl",    "chi2prob",     "command batgsl.chi2prob(d:bat[:dbl], 
i:dbl):bat[:dbl] ",       "GSLbat_chisqProb_cst;",        "Chi Squared 
probability"       ]
-[ "batgsl",    "chi2prob",     "command batgsl.chi2prob(d:dbl, 
i:bat[:dbl]):bat[:dbl] ",       "GSLcst_chisqProb_bat;",        "Chi Squared 
probability"       ]
 [ "batmal",    "multiplex",    "pattern batmal.multiplex(mod:str, fcn:str, 
a:any...):any... ", "MANIFOLDremapMultiplex;",      ""      ]
 [ "batmkey",   "hash", "command batmkey.hash(b:bat[:any_1]):bat[:lng] ",       
"MKEYbathash;", "calculate a hash value"        ]
 [ "batmmath",  "acos", "command batmmath.acos(x:bat[:dbl]):bat[:dbl] ",        
"CMDscience_bat_dbl_acos;",     ""      ]
@@ -7701,7 +7698,6 @@ Ready.
 [ "group",     "subgroupdone", "command group.subgroupdone(b:bat[:any_1], 
s:bat[:oid], g:bat[:oid]) (groups:bat[:oid], extents:bat[:oid], 
histo:bat[:lng]) ",  "GRPsubgroup3;",        ""      ]
 [ "group",     "subgroupdone", "command group.subgroupdone(b:bat[:any_1], 
g:bat[:oid], e:bat[:oid], h:bat[:lng]) (groups:bat[:oid], extents:bat[:oid], 
histo:bat[:lng]) ",     "GRPsubgroup4;",        ""      ]
 [ "group",     "subgroupdone", "command group.subgroupdone(b:bat[:any_1], 
s:bat[:oid], g:bat[:oid], e:bat[:oid], h:bat[:lng]) (groups:bat[:oid], 
extents:bat[:oid], histo:bat[:lng]) ",        "GRPsubgroup5;",        ""      ]
-[ "gsl",       "chi2prob",     "command gsl.chi2prob(d:dbl, i:dbl):dbl ",      
"GSLchisqProb;",        "Chi Squared probability"       ]
 [ "identifier",        "#fromstr",     "command identifier.#fromstr():void ",  
"IDfromString;",        "Convert a string to an identifier without any check"   
]
 [ "identifier",        "#tostr",       "command identifier.#tostr():void ",    
"IDtoString;",  "Convert identifier to string equivalent"       ]
 [ "identifier",        "identifier",   "command 
identifier.identifier(s:str):identifier ",     "IDentifier;",  "Cast a string 
to an identifer "        ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128 
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -7980,9 +7980,6 @@ Ready.
 [ "batgeom",   "coordinateFromWKB",    "command 
batgeom.coordinateFromWKB(X_0:bat[:wkb], X_1:int):bat[:dbl] ", 
"wkbCoordinateFromWKB_bat;",    "returns xmin (=1), ymin (=2), xmax (=3) or 
ymax(=4) of the provided geometry"  ]
 [ "batgeom",   "mbr",  "command batgeom.mbr(X_0:bat[:wkb]):bat[:mbr] ",        
"wkbMBR_bat;",  "Creates the mbr for the given wkb."    ]
 [ "batgeom",   "setSRID",      "command batgeom.setSRID(w:bat[:wkb], 
srid:int):bat[:wkb] ",    "wkbSetSRID_bat;",      "Sets the Reference System ID 
for this Geometry."       ]
-[ "batgsl",    "chi2prob",     "command batgsl.chi2prob(d:bat[:dbl], 
i:bat[:dbl]):bat[:dbl] ", "GSLbat_chisqProb_bat;",        "Chi Squared 
probability"       ]
-[ "batgsl",    "chi2prob",     "command batgsl.chi2prob(d:bat[:dbl], 
i:dbl):bat[:dbl] ",       "GSLbat_chisqProb_cst;",        "Chi Squared 
probability"       ]
-[ "batgsl",    "chi2prob",     "command batgsl.chi2prob(d:dbl, 
i:bat[:dbl]):bat[:dbl] ",       "GSLcst_chisqProb_bat;",        "Chi Squared 
probability"       ]
 [ "batmal",    "multiplex",    "pattern batmal.multiplex(mod:str, fcn:str, 
a:any...):any... ", "MANIFOLDremapMultiplex;",      ""      ]
 [ "batmkey",   "hash", "command batmkey.hash(b:bat[:any_1]):bat[:lng] ",       
"MKEYbathash;", "calculate a hash value"        ]
 [ "batmmath",  "acos", "command batmmath.acos(x:bat[:dbl]):bat[:dbl] ",        
"CMDscience_bat_dbl_acos;",     ""      ]
@@ -10057,7 +10054,6 @@ Ready.
 [ "group",     "subgroupdone", "command group.subgroupdone(b:bat[:any_1], 
s:bat[:oid], g:bat[:oid]) (groups:bat[:oid], extents:bat[:oid], 
histo:bat[:lng]) ",  "GRPsubgroup3;",        ""      ]
 [ "group",     "subgroupdone", "command group.subgroupdone(b:bat[:any_1], 
g:bat[:oid], e:bat[:oid], h:bat[:lng]) (groups:bat[:oid], extents:bat[:oid], 
histo:bat[:lng]) ",     "GRPsubgroup4;",        ""      ]
 [ "group",     "subgroupdone", "command group.subgroupdone(b:bat[:any_1], 
s:bat[:oid], g:bat[:oid], e:bat[:oid], h:bat[:lng]) (groups:bat[:oid], 
extents:bat[:oid], histo:bat[:lng]) ",        "GRPsubgroup5;",        ""      ]
-[ "gsl",       "chi2prob",     "command gsl.chi2prob(d:dbl, i:dbl):dbl ",      
"GSLchisqProb;",        "Chi Squared probability"       ]
 [ "identifier",        "#fromstr",     "command identifier.#fromstr():void ",  
"IDfromString;",        "Convert a string to an identifier without any check"   
]
 [ "identifier",        "#tostr",       "command identifier.#tostr():void ",    
"IDtoString;",  "Convert identifier to string equivalent"       ]
 [ "identifier",        "identifier",   "command 
identifier.identifier(s:str):identifier ",     "IDentifier;",  "Cast a string 
to an identifer "        ]
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -258,13 +258,6 @@ AS_CASE([$enable_geom-$have_shp],
        have_shp=no
        disable_shp="(ESRI Shapefile vault requires the geom module)"])
 
-dft_gsl=auto
-AC_ARG_ENABLE([gsl],
-       [AS_HELP_STRING([--enable-gsl],
-               [enable support for GSL (default=auto)])],
-       [enable_gsl=$enableval],
-       [enable_gsl=$dft_gsl])
-
 dft_embedded=no
 AC_ARG_ENABLE([embedded],
        [AS_HELP_STRING([--enable-embedded],
@@ -1686,38 +1679,59 @@ AS_CASE([$host],
                        AC_DEFINE([HAVE_OPENSSL], 1, [Define if you have the 
OpenSSL library])])])])
 
 
-# PCRE library
-# required on Windows, optional on POSIX systems with GNU regex
-req_pcre_ver='4.5'
-PKG_CHECK_MODULES([pcre], [libpcre >= $req_pcre_ver],
-       [have_pcre=yes], [have_pcre=no; why_have_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"
-       LIBS="$LIBS $pcre_LIBS"
-       save_CFLAGS="$CFLAGS"
-       CFLAGS="$CFLAGS $pcre_CFLAGS"
-       AC_RUN_IFELSE([AC_LANG_PROGRAM(
-               [[@%:@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])],
-               [AC_MSG_RESULT([assuming yes])])
-       LIBS="$save_LIBS"
-       CFLAGS="$save_CFLAGS"])
+org_have_regex=auto
+dft_regex=auto
+AC_ARG_WITH([regex],
+       [AS_HELP_STRING([--with-regex=TYPE],
+       [use either PRCE or POSIX regular expressions (default=PCRE if 
available)])],
+       [AS_CASE([$withval],
+               [pcre|PCRE], [have_regex=pcre],
+               [posix|POSIX], [have_regex=posix],
+               [auto|AUTO], [have_regex=auto],
+               [AC_MSG_ERROR([--with-regex argument must be either PCRE or 
POSIX])])],
+       [have_regex=$dft_regex])
+
+AS_VAR_IF([have_regex], [posix],
+       [have_pcre=no; why_have_pcre="(PCRE disabled)"],
+       [
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to