Update configure and Makevars.in (#680)

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: tiledb
 Type: Package
-Version: 0.25.0.1
+Version: 0.25.0.2
 Title: Modern Database Engine for Multi-Modal Data via Sparse and Dense Multidimensional Arrays
 Authors@R: c(person("TileDB, Inc.", role = c("aut", "cph")),
  person("Dirk", "Eddelbuettel", email = "dirk@tiledb.com", role = "cre"))

NEWS.md

@@ -2,6 +2,10 @@
 
 * This release of the R package builds against [TileDB 2.21.1](https://github.com/TileDB-Inc/TileDB/releases/tag/2.21.1), and has also been tested against earlier releases as well as the development version (#679)
 
+## Build and Test Systems
+
+* The `configure` and `Makevars.in` received a minor update correcting small issues (#680)
+
 
 # tiledb 0.25.0
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for TileDB-R 0.24.0.
+# Generated by GNU Autoconf 2.71 for TileDB-R 0.25.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -607,8 +607,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TileDB-R'
 PACKAGE_TARNAME='tiledb-r'
-PACKAGE_VERSION='0.24.0'
-PACKAGE_STRING='TileDB-R 0.24.0'
+PACKAGE_VERSION='0.25.0'
+PACKAGE_STRING='TileDB-R 0.25.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1270,7 +1270,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TileDB-R 0.24.0 to adapt to many kinds of systems.
+\`configure' configures TileDB-R 0.25.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1332,7 +1332,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TileDB-R 0.24.0:";;
+     short | recursive ) echo "Configuration of TileDB-R 0.25.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1425,7 +1425,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TileDB-R configure 0.24.0
+TileDB-R configure 0.25.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1572,7 +1572,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TileDB-R $as_me 0.24.0, which was
+It was created by TileDB-R $as_me 0.25.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -5949,7 +5949,7 @@ fi
 if test x"${have_pkg_config}" != x"no"; then
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pkg-config checking TileDB version" >&5
 printf %s "checking for pkg-config checking TileDB version... " >&6; }
-    if pkg-config --atleast-version=2.0.0 tiledb; then
+    if pkg-config --atleast-version=2.7.0 tiledb; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: >= 2.7.0" >&5
 printf "%s\n" ">= 2.7.0" >&6; }
     else
@@ -5987,7 +5987,8 @@ machine=`uname -m`
 ## -- Part 2: User preferences --------------------------------------------------
 ##
 ## Allow forced build override, value of 'yes' or 'no' set in enable_building variable
-## (and sets by autoconf standards the 'enable_building' variable to 'yes' or 'no')
+## (and sets by autoconf standards the 'enable_building' variable to 'yes' if selected
+## otherwise the default is "" ie empty string and not 'no')
 # Check whether --enable-building was given.
 if test ${enable_building+y}
 then :
@@ -6047,10 +6048,10 @@ origLDFLAGS="${LDFLAGS}"
 CPPFLAGS="${origCPPFLAGS} ${TILEDB_INCLUDE}"
 LDFLAGS="${origLDFLAGS} ${TILEDB_LIBS} ${TILEDB_RPATH}"
 
-## Take care of 11 (aka 'Big Sur') requirement for Intel macOS, automatic on arm
-if test x"${uname}" = x"Darwin" -a x"${machine}" = x"x86_64"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Darwin x86_64 use minimum version override" >&5
-printf %s "checking for Darwin x86_64 use minimum version override... " >&6; }
+## Take care of 11 (aka 'Big Sur') requirement for macOS
+if test x"${uname}" = x"Darwin"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Darwin use minimum version override" >&5
+printf %s "checking for Darwin use minimum version override... " >&6; }
     CXX17_MACOS="-mmacosx-version-min=11"
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${CXX17_MACOS}" >&5
 printf "%s\n" "${CXX17_MACOS}" >&6; }
@@ -6162,6 +6163,8 @@ fi
 ## to test one can force some selections here
 #have_tiledb="no"
 #enable_building="no"
+#echo "have_tiledb=${have_tiledb}"
+#echo "enable_building=${enable_building}"
 if test x"${have_tiledb}" = x"no"; then
 
     ## case one: build is selected (or forced) so try building TileDB
@@ -6909,7 +6912,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TileDB-R $as_me 0.24.0, which was
+This file was extended by TileDB-R $as_me 0.25.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6964,7 +6967,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-TileDB-R config.status 0.24.0
+TileDB-R config.status 0.25.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -2,7 +2,7 @@
 
 ##  MIT License
 ##
-##  Copyright (c) 2017-2023 TileDB Inc.
+##  Copyright (c) 2017-2024 TileDB Inc.
 ##
 ##  Permission is hereby granted, free of charge, to any person obtaining a copy
 ##  of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@
 
 ## require at least autoconf 2.69
 AC_PREREQ([2.69])
-AC_INIT([TileDB-R],[0.24.0])
+AC_INIT([TileDB-R],[0.25.0])
 
 ## -- Part 1: Setup -------------------------------------------------------------
 ##
@@ -80,7 +80,7 @@ fi
 ## If we have pkg-config, use it to test minimal version
 if test x"${have_pkg_config}" != x"no"; then
     AC_MSG_CHECKING([for pkg-config checking TileDB version])
-    if pkg-config --atleast-version=2.0.0 tiledb; then
+    if pkg-config --atleast-version=2.7.0 tiledb; then
         AC_MSG_RESULT([>= 2.7.0])
     else
         AC_MSG_RESULT([insufficient])
@@ -111,7 +111,8 @@ machine=`uname -m`
 ## -- Part 2: User preferences --------------------------------------------------
 ##
 ## Allow forced build override, value of 'yes' or 'no' set in enable_building variable
-## (and sets by autoconf standards the 'enable_building' variable to 'yes' or 'no')
+## (and sets by autoconf standards the 'enable_building' variable to 'yes' if selected
+## otherwise the default is "" ie empty string and not 'no')
 AC_ARG_ENABLE([building],
           AS_HELP_STRING([--enable-building],[build TileDB library instead of downloading prebuilt]))
           #[building="${enable_building}"
@@ -160,9 +161,9 @@ origLDFLAGS="${LDFLAGS}"
 CPPFLAGS="${origCPPFLAGS} ${TILEDB_INCLUDE}"
 LDFLAGS="${origLDFLAGS} ${TILEDB_LIBS} ${TILEDB_RPATH}"
 
-## Take care of 11 (aka 'Big Sur') requirement for Intel macOS, automatic on arm
-if test x"${uname}" = x"Darwin" -a x"${machine}" = x"x86_64"; then
-    AC_MSG_CHECKING([for Darwin x86_64 use minimum version override])
+## Take care of 11 (aka 'Big Sur') requirement for macOS
+if test x"${uname}" = x"Darwin"; then
+    AC_MSG_CHECKING([for Darwin use minimum version override])
     CXX17_MACOS="-mmacosx-version-min=11"
     AC_MSG_RESULT([${CXX17_MACOS}])
 fi
@@ -208,6 +209,8 @@ fi
 ## to test one can force some selections here
 #have_tiledb="no"
 #enable_building="no"
+#echo "have_tiledb=${have_tiledb}"
+#echo "enable_building=${enable_building}"
 if test x"${have_tiledb}" = x"no"; then
 
     ## case one: build is selected (or forced) so try building TileDB

tools/fetchTileDB.sh

@@ -20,7 +20,7 @@ if [ ! -d tinytest ]; then
     exit 1
 fi
 
-## CRAN wants us permit different R binaries via different PATHs
+## CRAN wants us to permit different R binaries via different PATHs
 : ${R_HOME=`R RHOME`}
 
 tarball="tiledb.tar.gz"