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" \