[Libguestfs] [PATCH 7/7] build: improve GUESTFS_FIND_DB_TOOL macro

- find the unversioned name just once - add 5.3 and 5.2 as versions - add db_$TOOL-X and db_$TOOL-X.Y as patterns (found on FreeBSD) --- m4/guestfs-find-db-tool.m4 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/m4/guestfs-find-db-tool.m4 b/m4/guestfs-find-db-tool.m4 index 0cbbd13..ee20301 100644 --- a/m4/guestfs-find-db-tool.m4 +++ b/m4/guestfs-find-db-tool.m4 @@ -20,13 +20,14 @@ AC_DEFUN([GUESTFS_FIND_DB_TOOL],[ TOOL=$2 db_tool_name="db_$TOOL" - db_versions="5.1 4.8 4.7 4.6" - db_tool_patterns="db_$TOOL dbX_$TOOL dbX.Y_$TOOL" + db_versions="5.3 5.2 5.1 4.8 4.7 4.6" + db_tool_patterns="dbX_$TOOL dbX.Y_$TOOL" + db_tool_patterns="dbX_$TOOL db_$TOOL-X dbX.Y_$TOOL db_$TOOL-X.Y" AC_ARG_VAR(VARIABLE, [Absolute path to $db_tool_name executable]) AS_IF(test -z "$VARIABLE", [ - exe_list="" + exe_list="db_$TOOL" for ver in $db_versions ; do ver_maj=`echo $ver | cut -d. -f1` ver_min=`echo $ver | cut -d. -f2` -- 2.5.0