From 2ad3f1ca5d4522cac5c3a7ee0ad09077bad9bb26 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 28 Apr 2022 15:33:31 +0100
Subject: [PATCH] build: No longer check for ocamldep -one-line and -all
 options

These were added to ocamldep in Jan 2012, over 10 years ago.  They
were not present in RHEL 6, but we don't care about that now.

(cherry picked from virt-v2v commit f6108bbd661d3e922d07b47f00daa901ab846e59)

(cherry picked from commit 0a2d43988f7061d5b2b95591ee478d9bf9e7b64c)
---
 m4/guestfs-ocaml.m4 | 20 --------------------
 ocaml-dep.sh.in     |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
index 9823c40b0..1023baebc 100644
--- a/m4/guestfs-ocaml.m4
+++ b/m4/guestfs-ocaml.m4
@@ -77,26 +77,6 @@ if test "x$OCAMLC" != "xno"; then
 fi
 AC_SUBST([OCAML_RUNTIME_VARIANT_PIC_OPTION])
 
-dnl Check if ocamldep has options -all and -one-line (not present in RHEL 6).
-AC_MSG_CHECKING([if ocamldep has the ‘-all’ option])
-if ocamldep -all >&AS_MESSAGE_LOG_FD 2>&1; then
-    AC_MSG_RESULT([yes])
-    OCAMLDEP_ALL="-all"
-else
-    AC_MSG_RESULT([no])
-    OCAMLDEP_ALL=""
-fi
-AC_SUBST([OCAMLDEP_ALL])
-AC_MSG_CHECKING([if ocamldep has the ‘-one-line’ option])
-if ocamldep -one-line >&AS_MESSAGE_LOG_FD 2>&1; then
-    AC_MSG_RESULT([yes])
-    OCAMLDEP_ONE_LINE="-one-line"
-else
-    AC_MSG_RESULT([no])
-    OCAMLDEP_ONE_LINE=""
-fi
-AC_SUBST([OCAMLDEP_ONE_LINE])
-
 have_Hivex_OPEN_UNSAFE=no
 if test "x$enable_daemon" = "xyes"; then
     OCAML_PKG_hivex=no
diff --git a/ocaml-dep.sh.in b/ocaml-dep.sh.in
index f82816780..21bf3812a 100755
--- a/ocaml-dep.sh.in
+++ b/ocaml-dep.sh.in
@@ -65,7 +65,7 @@ echo >> $output-t
 # 3. Generated _config.ml in srcdir: Rewrite to builddir
 # 4. Other object files below abs_top_srcdir: rewrite to corresponding builddir
 # 5. Eliminate "./" prefix
-@OCAMLFIND@ ocamldep @OCAMLDEP_ALL@ @OCAMLDEP_ONE_LINE@ $includes "$@" \
+@OCAMLFIND@ ocamldep -all -one-line $includes "$@" \
     | sed \
           -e "s,@abs_top_srcdir@/${subdir},.,g" \
           -e "s,\B${srcdir_re}/\\([^ ]*[.]\\)\\(cm[^ ]*\\|o\\),\\1\\2,g" \