Changeset 4277

Timestamp:

Jan 26, 2023, 12:53:10 AM (2 months ago)

Author:

Peter

Message:

Check if wanted_version is empty at configure time (not autoconf time)
to allow it being a an empty shell variable. Replace use of sed, grep,
expr, and echo with variables and macros SED, GREP, AS_VAR_ARITH, and
AS_ECHO. Validate the version input before getting ugly error message
from expr.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• m4/yat_check_htslib.m4 (modified) (2 diffs)

trunk/configure.ac

@@ -354 +354 @@
 
 # check for hts and samtools available from http://www.htslib.org
-YAT_CHECK_HTSLIB([1.10.0])
+YAT_CHECK_HTSLIB([1.10])
 
 #support for large files

trunk/m4/yat_check_htslib.m4

@@ -1 +1 @@
 ## $Id$
 #
-# serial 9 (yat 0.21)
+# serial 10 (yat 0.21)
 #
 #   Copyright (C) 2016, 2018, 2020, 2023 Peter Johansson
@@ -116 +116 @@
 AC_DEFUN([YAT_CHECK_HTS_VERSION],
 [
-  m4_if([$1], [], [
-   dnl if min-version is empty, just do action-if-success
+  AC_REQUIRE([AC_PROG_GREP])
+  AC_REQUIRE([AC_PROG_SED])
+  # trim off leading and trailing whitespaces
+  yat_wanted_hts_version=`AS_ECHO(["$1"]) \
+    | $SED 's/^[[ \t]]*//' | $SED 's/[[ \t]]*$//'`
+  AS_VAR_IF([yat_wanted_hts_version], [], [
+   # if wanted_hts_version is empty, just do action-if-success
    $2
-  ], [
-    yat_hts_version=`echo $1 | sed 's/^[[ \t]]*//'`
-    yat_hts_version_major=`echo $1 | sed 's/\([[0-9]][[0-9]]*\)\..*/\1/'`
-    yat_hts_version_minor=`echo $1 | sed 's/[[0-9]][[0-9]]*.\([[0-9]][[0-9]]*\).*/\1/'`
-    yat_hts_version_micro=`echo $1 | sed 's/[[0-9]][[0-9]]*.[[0-9]][[0-9]]*.\(.*\)/\1/'`
+  ], [ # otherwise run compilation test
+    yat_hts_version_major=`AS_ECHO([$yat_wanted_hts_version]) \
+      | $SED 's/\([[^.]][[^.]]*\)\..*/\1/'`
+    yat_hts_version_minor=`AS_ECHO([$yat_wanted_hts_version]) \
+      | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
+    yat_hts_version_micro=`AS_ECHO([$yat_wanted_hts_version]) \
+      | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'`
     AS_VAR_IF([yat_hts_version_micro], [], [yat_hts_version_micro=0])
-    yat_hts_pp_version=`expr 100000 \* $yat_hts_version_major + 100 \* $yat_hts_version_minor + $yat_hts_version_micro`
+
+    # Check that version number are integers before applying arithmetics
+    m4_foreach([YAT_x_version],
+            [[$yat_hts_version_major],
+            [$yat_hts_version_minor],
+            [$yat_hts_version_micro]],
+           [AS_IF([AS_ECHO([YAT_x_version]) \
+              | $GREP "^[[0-9]][[0-9]]*$" > /dev/null], [],
+            [AC_MSG_ERROR([invalid hts min-version: $yat_wanted_hts_version])])
+    ])
+
+    AS_VAR_ARITH([yat_hts_pp_version],
+      [100000 \* $yat_hts_version_major + 100 \* $yat_hts_version_minor + $yat_hts_version_micro])
+
     AC_CACHE_CHECK([if HTS verson >= $yat_hts_version ($yat_hts_pp_version)],
       [yat_cv_hts_version],