Changeset: dd67a6372eb6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd67a6372eb6
Removed Files:
sql/test/Tests/fsum1.stable.out
Modified Files:
configure.ag
sql/backends/monet5/vaults/lidar/Makefile.ag
Branch: default
Log Message:
Merge with Jun2020 branch.
diffs (224 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1911,7 +1911,7 @@ AM_CONDITIONAL([HAVE_NETCDF], [test x"$h
# liblas, only used in lidar module
org_have_liblas=auto
have_liblas=$org_have_liblas
-LIBLAS_INCS=''
+LIBLAS_CFLAGS=''
LIBLAS_LIBS=''
AC_ARG_WITH([liblas],
[AS_HELP_STRING([--with-liblas=DIR],
@@ -1921,49 +1921,57 @@ AS_CASE([$have_lidar],
[yes|auto], [
# liblas >= 1.8.0 required
LIBLAS_VERSION_REQUIRED_MIN=1.8.0
- LIBLAS_CONFIG=''
- # locate liblas-config
- AS_VAR_IF([have_liblas], [no], [], [
- AS_CASE([$have_liblas],
- [yes|auto], [XPATH="$PATH"],
+ PKG_CHECK_MODULES([LIBLAS],
+ [liblas >= $LIBLAS_VERSION_REQUIRED_MIN],
+ [have_liblas=yes
+ # work around bug in Fedora 32's liblas-devel-1.8.1-7
+ LIBLAS_CFLAGS=`AS_ECHO(["$LIBLAS_CFLAGS"]) | sed
's|-Iinclude|-I/usr/include|'`
+ LIBLAS_LIBS=`AS_ECHO(["$LIBLAS_LIBS"]) | sed
's|-Llib|-L/usr/lib|'`
+ ],
[
- XPATH="$have_liblas/bin"
- have_liblas=yes])
- AC_PATH_PROG([LIBLAS_CONFIG], [liblas-config], [], [$XPATH])
- AS_VAR_IF([LIBLAS_CONFIG], [],
- [AS_VAR_IF([have_liblas], [yes],
- [AC_MSG_ERROR([liblas-config not found in
$XPATH])],
+ LIBLAS_CONFIG=''
+ # locate liblas-config
+ AS_VAR_IF([have_liblas], [no], [], [
+ AS_CASE([$have_liblas],
+ [yes|auto], [XPATH="$PATH"],
+ [
+ XPATH="$have_liblas/bin"
+ have_liblas=yes])
+ AC_PATH_PROG([LIBLAS_CONFIG], [liblas-config], [],
[$XPATH])
+ AS_VAR_IF([LIBLAS_CONFIG], [],
+ [AS_VAR_IF([have_liblas], [yes],
+ [AC_MSG_ERROR([liblas-config not found
in $XPATH])],
+ [have_liblas=no
+ why_not_liblas="(liblas-config not
found)"])])])
+ # check the version of liblas
+ AS_VAR_IF([have_liblas], [no], [], [
+ AC_MSG_CHECKING([for liblas >=
$LIBLAS_VERSION_REQUIRED_MIN])
+ LIBLAS_VERSION=`$LIBLAS_CONFIG --version`
+ AC_MSG_RESULT([found $LIBLAS_VERSION])
+ AS_VERSION_COMPARE([$LIBLAS_VERSION],
[$LIBLAS_VERSION_REQUIRED_MIN],
+ [AS_VAR_IF([have_liblas], [yes],
+ [AC_MSG_ERROR([liblas version
$LIBLAS_VERSION is too old])],
+ [have_liblas=no
+ why_not_liblas="(liblas version
$LIBLAS_VERSION is older than required version
$LIBLAS_VERSION_REQUIRED_MIN)"])])])
+ # read include dirs, libs and cflags
+ AS_VAR_IF([have_liblas], [no], [], [
+ LIBLAS_CFLAGS=`$LIBLAS_CONFIG --includes`
+ LIBLAS_LIBS=`$LIBLAS_CONFIG --libs`])
+ # liblas-config and liblas/capi/liblas.h could be in different
+ # packages (think Ubuntu) so we need to test for them both
+ AS_VAR_IF([have_liblas], [no], [], [
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $LIBLAS_CFLAGS"
+ LDFLAGS="$LDFLAGS $LIBLAS_LIBS"
+ LIBS=""
+ AC_CHECK_HEADER([liblas/capi/liblas.h], [],
[have_liblas=no
- why_not_liblas="(liblas-config not
found)"])])])
- # check the version if liblas
- AS_VAR_IF([have_liblas], [no], [], [
- AC_MSG_CHECKING([for liblas >= $LIBLAS_VERSION_REQUIRED_MIN])
- LIBLAS_VERSION=`$LIBLAS_CONFIG --version`
- AC_MSG_RESULT([found $LIBLAS_VERSION])
- AS_VERSION_COMPARE([$LIBLAS_VERSION],
[$LIBLAS_VERSION_REQUIRED_MIN],
- [AS_VAR_IF([have_liblas], [yes],
- [AC_MSG_ERROR([liblas version $LIBLAS_VERSION
is too old])],
- [have_liblas=no
- why_not_liblas="(liblas version
$LIBLAS_VERSION is older than required version
$LIBLAS_VERSION_REQUIRED_MIN)"])])])
- # read include dirs, libs and cflags
- AS_VAR_IF([have_liblas], [no], [], [
- LIBLAS_INCS=`$LIBLAS_CONFIG --includes`
- LIBLAS_LIBS=`$LIBLAS_CONFIG --libs`])
- # liblas-config and liblas/capi/liblas.h could be in different
- # packages (think Ubuntu) so we need to test for them both
- AS_VAR_IF([have_liblas], [no], [], [
- save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $LIBLAS_INCS"
- LDFLAGS="$LDFLAGS $LIBLAS_LIBS"
- LIBS=""
- AC_CHECK_HEADER([liblas/capi/liblas.h], [],
- [have_liblas=no
- why_not_liblas="(liblas/capi/liblas.h header file not
found)"])
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"])
+ why_not_liblas="(liblas/capi/liblas.h header
file not found)"])
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"])])
# if lidar is enabled and liblas was not found abort
AS_VAR_IF([have_liblas], [no], [
AS_VAR_IF([have_lidar], [yes],
@@ -1982,7 +1990,7 @@ AS_VAR_IF([have_lidar], [no],
# this is only used in rpm.mk.in to maybe avoid building MonetDB-lidar
AC_SUBST([LIBLAS_RPM])
-AC_SUBST([LIBLAS_INCS])
+AC_SUBST([LIBLAS_CFLAGS])
AC_SUBST([LIBLAS_LIBS])
AM_CONDITIONAL([HAVE_LIDAR], [test "x$have_lidar" = xyes -o "x$have_lidar" =
xauto])
diff --git a/sql/backends/monet5/vaults/lidar/Makefile.ag
b/sql/backends/monet5/vaults/lidar/Makefile.ag
--- a/sql/backends/monet5/vaults/lidar/Makefile.ag
+++ b/sql/backends/monet5/vaults/lidar/Makefile.ag
@@ -20,7 +20,7 @@ INCLUDES = .. \
../../../../../common/utils \
../../../../../clients/mapilib \
../../../../../gdk \
- $(LIBLAS_INCS)
+ $(LIBLAS_CFLAGS)
lib__lidar = {
MODULE
diff --git a/sql/test/Tests/fsum1.stable.out b/sql/test/Tests/fsum1.stable.out
deleted file mode 100644
--- a/sql/test/Tests/fsum1.stable.out
+++ /dev/null
@@ -1,87 +0,0 @@
-stdout of test 'fsum1` in directory 'sql/test` itself:
-
-
-# 13:04:28 >
-# 13:04:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=1" "--set"
"mapi_open=true" "--set" "mapi_port=37938" "--set"
"mapi_usock=/var/tmp/mtest-953/.s.monetdb.37938" "--forcemito"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test"
"--set" "embedded_c=true"
-# 13:04:28 >
-
-# MonetDB 5 server v11.36.0 (hg id: 8f43ee7f9545+)
-# This is an unreleased version
-# Serving database 'mTests_sql_test', using 1 thread
-# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
-# Found 15.384 GiB available main-memory.
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://localhost.localdomain:37938/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-953/.s.monetdb.37938
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-# 13:04:29 >
-# 13:04:29 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-953" "--port=37938"
-# 13:04:29 >
-
-#create table t (val double, gid int);
-#copy 3131 records into t from stdin using delimiters ' ',E'\n' null as 'nan';
-#-1.7976931348623157E+308 23
-#9007199254740992.0 9
-#-5e-324 38
-#-8.98846567431158e+307 35
-#8.988465674311579e+307 12
-#8.98846567431158e+307 26
-#8.98846567431158e+307 40
-#8.98846567431158e+307 7
-#9.076030935533344e+279 39
-#-8.98846567431158e+307 37
-#1.7976931348623157E+308 22
-#8.98846567431158e+307 28
-#-8.98846567431158e+307 36
-#0.7 17
-#8.98846567431158e+307 26
-#1e+308 5
-#-1e+308 5
-#0.0 1
-#9007199254741002.0 10
-#8.98846567431158e+307 29
-#1.0 15
-#8.988465674311579e+307 25
-[ 3131 ]
-#select gid, sum(val) from t where gid in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 15, 16, 17, 18, 19, 22, 23, 31, 33, 35, 37, 39, 40, 41) group by
gid order by gid;
-% sys.t, sys.%1 # table_name
-% gid, %1 # name
-% int, double # type
-% 2, 24 # length
-[ 1, 0 ]
-[ 2, 1e-100 ]
-[ 3, 1e+308 ]
-[ 4, 1e+308 ]
-[ 5, 1e+308 ]
-[ 6, 1.797693028e+308 ]
-[ 7, 8.988465674e+307 ]
-[ 8, 9.007199255e+15 ]
-[ 9, 9.007199255e+15 ]
-[ 10, 9.007199255e+15 ]
-[ 11, 9.007199255e+15 ]
-[ 12, 1.797693135e+308 ]
-[ 13, 1.797693135e+308 ]
-[ 15, 7.485470861 ]
-[ 16, -0.6926474306 ]
-[ 17, -1 ]
-[ 18, 0 ]
-[ 19, 0 ]
-[ 22, 0 ]
-[ 23, -1.59538627e+308 ]
-[ 31, 1.797693135e+308 ]
-[ 33, 1.797693135e+308 ]
-[ 35, -1.797693135e+308 ]
-[ 37, -1.797693135e+308 ]
-[ 39, 1.797693135e+308 ]
-[ 40, 1.697693135e+308 ]
-[ 41, 1e+16 ]
-#drop table t;
-
-# 13:04:29 >
-# 13:04:29 > "Done."
-# 13:04:29 >
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
