utils: don't require archivemount at configure-time

Just try to use it at runtime or error out.

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

config/hwloc_internal.m4

@@ -1,6 +1,6 @@
 dnl -*- Autoconf -*-
 dnl
-dnl Copyright © 2010-2022 Inria.  All rights reserved.
+dnl Copyright © 2010-2023 Inria.  All rights reserved.
 dnl Copyright © 2009, 2011 Université Bordeaux
 dnl Copyright © 2004-2005 The Trustees of Indiana University and Indiana
 dnl                         University Research and Technology
@@ -409,12 +409,6 @@ EOF
       AC_CHECK_FUNCS([clock_gettime])
     ])
 
-    AC_ARG_VAR([ARCHIVEMOUNT], [Location of the archivemount program (for loading archive topology in tools)])
-    AC_PATH_TOOL([ARCHIVEMOUNT], [archivemount])
-    if test "x$ARCHIVEMOUNT" != x; then
-      AC_DEFINE_UNQUOTED([HWLOC_ARCHIVEMOUNT_PATH], ["$ARCHIVEMOUNT"], [Define to the location of the archivemount program])
-    fi
-
     # Only generate this if we're building the utilities
     # Even the netloc library Makefile is here because
     # we don't embed libnetloc yet, it's useless without tools

utils/hwloc/misc.h

@@ -277,7 +277,6 @@ hwloc_utils_enable_input_format(struct hwloc_topology *topology, unsigned long f
   }
 
   case HWLOC_UTILS_INPUT_ARCHIVE: {
-#ifdef HWLOC_ARCHIVEMOUNT_PATH
     char mntpath[] = "/tmp/tmpdir.hwloc.archivemount.XXXXXX";
     char mntcmd[512];
     char umntcmd[512];
@@ -291,7 +290,7 @@ hwloc_utils_enable_input_format(struct hwloc_topology *topology, unsigned long f
       perror("Creating archivemount directory");
       return EXIT_FAILURE;
     }
-    snprintf(mntcmd, sizeof(mntcmd), "%s -o ro %s %s", HWLOC_ARCHIVEMOUNT_PATH, input, mntpath);
+    snprintf(mntcmd, sizeof(mntcmd), "archivemount -o ro %s %s", input, mntpath);
     err = system(mntcmd);
     if (err) {
       perror("Archivemount'ing the archive");
@@ -326,10 +325,6 @@ hwloc_utils_enable_input_format(struct hwloc_topology *topology, unsigned long f
     if (!err)
       *input_format = sub_input_format;
     break;
-#else
-    fprintf(stderr, "This installation of hwloc does not support loading from an archive, sorry.\n");
-    exit(EXIT_FAILURE);
-#endif
   }
 
   case HWLOC_UTILS_INPUT_SYNTHETIC:

utils/lstopo/test-lstopo.sh.in

@@ -129,7 +129,7 @@ echo "**** Import from synthetic so that we can check some exact outputs in $fil
 ) > "$file"
 @DIFF@ @HWLOC_DIFF_U@ @HWLOC_DIFF_W@ $srcdir/test-lstopo.output "$file"
 
-if test x@ARCHIVEMOUNT@ != x; then
+if which archivemount >/dev/null 2>/dev/null; then
   if test x@HWLOC_HAVE_LINUX@ = x1; then
     echo "**** Archivemount'ing a Linux fsroot archive ..."
     file="$tmp/test-lstopo.archivemount.fsroot.output"