|
 |
a55b49 |
From 083856d9f9c8fccc629bf0f3a5237d26434c8940 Mon Sep 17 00:00:00 2001
|
|
|
a55b49 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
a55b49 |
Date: Mon, 29 Mar 2021 18:35:48 +0100
|
|
|
a55b49 |
Subject: [PATCH] m4/guestfs-find-db-tool.m4: Remove unused file.
|
|
|
a55b49 |
|
|
|
a55b49 |
Fixes: commit 42e5e7cfdbca01b2e9bd50c63a9fc65b6da9192f
|
|
|
a55b49 |
(cherry picked from commit 8317279c3539562ebad9de13c7ac515dded74e4d)
|
|
|
a55b49 |
---
|
|
|
a55b49 |
m4/guestfs-find-db-tool.m4 | 43 --------------------------------------
|
|
|
a55b49 |
1 file changed, 43 deletions(-)
|
|
|
a55b49 |
delete mode 100644 m4/guestfs-find-db-tool.m4
|
|
|
a55b49 |
|
|
|
a55b49 |
diff --git a/m4/guestfs-find-db-tool.m4 b/m4/guestfs-find-db-tool.m4
|
|
|
a55b49 |
deleted file mode 100644
|
|
|
a55b49 |
index b404148c6..000000000
|
|
|
a55b49 |
--- a/m4/guestfs-find-db-tool.m4
|
|
|
a55b49 |
+++ /dev/null
|
|
|
a55b49 |
@@ -1,43 +0,0 @@
|
|
|
a55b49 |
-# libguestfs
|
|
|
a55b49 |
-# Copyright (C) 2014 Red Hat Inc.
|
|
|
a55b49 |
-#
|
|
|
a55b49 |
-# This program is free software; you can redistribute it and/or modify
|
|
|
a55b49 |
-# it under the terms of the GNU General Public License as published by
|
|
|
a55b49 |
-# the Free Software Foundation; either version 2 of the License, or
|
|
|
a55b49 |
-# (at your option) any later version.
|
|
|
a55b49 |
-#
|
|
|
a55b49 |
-# This program is distributed in the hope that it will be useful,
|
|
|
a55b49 |
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
a55b49 |
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
a55b49 |
-# GNU General Public License for more details.
|
|
|
a55b49 |
-#
|
|
|
a55b49 |
-# You should have received a copy of the GNU General Public License
|
|
|
a55b49 |
-# along with this program; if not, write to the Free Software
|
|
|
a55b49 |
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
a55b49 |
-
|
|
|
a55b49 |
-AC_DEFUN([GUESTFS_FIND_DB_TOOL],[
|
|
|
a55b49 |
- pushdef([VARIABLE],$1)
|
|
|
a55b49 |
- TOOL=$2
|
|
|
a55b49 |
-
|
|
|
a55b49 |
- db_tool_name="db_$TOOL"
|
|
|
a55b49 |
- db_versions="53 5.3 5.2 5.1 4.8 4.7 4.6"
|
|
|
a55b49 |
- db_tool_patterns="dbX_$TOOL dbX.Y_$TOOL"
|
|
|
a55b49 |
- db_tool_patterns="dbX_$TOOL db_$TOOL-X dbX.Y_$TOOL db_$TOOL-X.Y"
|
|
|
a55b49 |
-
|
|
|
a55b49 |
- AC_ARG_VAR(VARIABLE, [Absolute path to $db_tool_name executable])
|
|
|
a55b49 |
-
|
|
|
a55b49 |
- AS_IF(test -z "$VARIABLE", [
|
|
|
a55b49 |
- exe_list="db_$TOOL"
|
|
|
a55b49 |
- for ver in $db_versions ; do
|
|
|
a55b49 |
- ver_maj=`echo $ver | cut -d. -f1`
|
|
|
a55b49 |
- ver_min=`echo $ver | cut -d. -f2`
|
|
|
a55b49 |
- for pattern in $db_tool_patterns ; do
|
|
|
a55b49 |
- exe=`echo "$pattern" | sed -e "s/X/$ver_maj/g;s/Y/$ver_min/g"`
|
|
|
a55b49 |
- exe_list="$exe_list $exe"
|
|
|
a55b49 |
- done
|
|
|
a55b49 |
- done
|
|
|
a55b49 |
- AC_PATH_PROGS([]VARIABLE[], [$exe_list], [no])
|
|
|
a55b49 |
- ])
|
|
|
a55b49 |
-
|
|
|
a55b49 |
- popdef([VARIABLE])
|
|
|
a55b49 |
-])
|
|
|
a55b49 |
--
|
|
|
a55b49 |
2.31.1
|
|
|
a55b49 |
|