Improve nauty discovery in meson

Author: tobiasdiez

pkgs/sage-conf/_sage_conf/_conf.py.in

@@ -32,6 +32,7 @@ NTL_LIBDIR = "@NTL_LIBDIR@"
 # Path to the ecl-config script
 ECL_CONFIG = "@SAGE_ECL_CONFIG@".replace('${prefix}', SAGE_LOCAL)
 
+# Path to the nauty binaries; of the form "/path/to/" or "/path/to/nauty-" 
 SAGE_NAUTY_BINS_PREFIX = "@SAGE_NAUTY_BINS_PREFIX@"
 
 SAGE_ECMBIN = "@SAGE_ECMBIN@"

src/sage/meson.build

@@ -70,6 +70,13 @@ if get_option('SAGE_LOCAL') != ''
 endif
 foreach prog : nauty_progs
   nauty_check = find_program(prog, dirs: extra_bin_paths, required: false)
+  if not nauty_check.found()
+    nauty_check = find_program(
+      'nauty-' + prog,
+      dirs: extra_bin_paths,
+      required: false,
+    )
+  endif
   if nauty_check.found()
     nauty_bins_prefix = nauty_check.full_path().replace(prog, '')
   endif