mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-21 22:53:37 +00:00
m4: Fix ./configure --disable-ocaml
OCaml is required to compile libguestfs, however we should still be
able to disable the OCaml bindings. This didn't work because using
--disable-ocaml caused various configure tests to be skipped which are
required to compile the daemon. In particular the check for
caml_alloc_initialized_string, resulting in this error:
pcre-c.c:47:1: error: static declaration of ‘caml_alloc_initialized_string’ follows non-static declaration
caml_alloc_initialized_string (mlsize_t len, const char *p)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Also OCaml gettext is not required by libguestfs. There are no *.ml
files used by libguestfs which require translation.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2108425
Fixes: https://bugs.gentoo.org/820053
Fixes: commit 733d2182b6
This commit is contained in:
Richard W.M. Jones
@@ -1,64 +0,0 @@
|
||||
# libguestfs
|
||||
# Copyright (C) 2009-2020 Red Hat Inc.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
dnl Write a common gettext module used by each OCaml tool.
|
||||
dnl If OCaml gettext is not available then we write dummy functions.
|
||||
|
||||
AC_DEFUN([GUESTFS_CREATE_COMMON_GETTEXT_ML],[
|
||||
dnl Check for ocaml-gettext package to translate OCaml tools.
|
||||
AC_CHECK_OCAML_PKG(gettext)
|
||||
|
||||
AC_MSG_NOTICE([creating $1])
|
||||
rm -f $1
|
||||
|
||||
cat <<EOF > $1
|
||||
(* This file is generated automatically by ./configure. *)
|
||||
|
||||
EOF
|
||||
|
||||
if test "x$OCAML_PKG_gettext" != "xno"; then
|
||||
# ocaml-gettext available: real module.
|
||||
cat <<EOF >>$1
|
||||
module Gettext = Gettext.Program (
|
||||
struct
|
||||
let textdomain = "$PACKAGE_NAME"
|
||||
let codeset = None
|
||||
let dir = None
|
||||
let dependencies = [[]]
|
||||
end
|
||||
) (GettextStub.Native)
|
||||
EOF
|
||||
else
|
||||
# No gettext: module containing dummy gettext functions.
|
||||
cat <<EOF >>$1
|
||||
module Gettext = struct
|
||||
external s_ : string -> string = "%identity"
|
||||
external f_ : ('a, 'b, 'c, 'd, 'e, 'f) format6
|
||||
-> ('a, 'b, 'c, 'd, 'e, 'f) format6
|
||||
= "%identity"
|
||||
let sn_ : string -> string -> int -> string
|
||||
= fun s p n -> if n = 1 then s else p
|
||||
let fn_ : ('a, 'b, 'c, 'd, 'e, 'f) format6
|
||||
-> ('a, 'b, 'c, 'd, 'e, 'f) format6
|
||||
-> int -> ('a, 'b, 'c, 'd, 'e, 'f) format6
|
||||
= fun s p n -> if n = 1 then s else p
|
||||
end
|
||||
EOF
|
||||
fi
|
||||
|
||||
chmod -w $1
|
||||
])
|
||||
@@ -15,7 +15,7 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
dnl Check for OCaml (required, for OCaml bindings and OCaml tools).
|
||||
dnl Check for OCaml (required)
|
||||
|
||||
dnl OCAMLC and OCAMLFIND have to be unset first, otherwise
|
||||
dnl AC_CHECK_TOOL (inside AC_PROG_OCAML) will not look.
|
||||
@@ -32,9 +32,9 @@ AS_IF([test "x$OCAMLFIND" = "xno"],[
|
||||
AC_MSG_ERROR([OCaml findlib is required])
|
||||
])
|
||||
|
||||
dnl --disable-ocaml only disables OCaml bindings and OCaml virt tools.
|
||||
dnl --disable-ocaml only disables OCaml bindings.
|
||||
AC_ARG_ENABLE([ocaml],
|
||||
AS_HELP_STRING([--disable-ocaml], [disable OCaml language bindings and tools]),
|
||||
AS_HELP_STRING([--disable-ocaml], [disable OCaml language bindings]),
|
||||
[],
|
||||
[enable_ocaml=yes])
|
||||
|
||||
@@ -132,51 +132,29 @@ AS_IF([test "x$have_Hivex_OPEN_UNSAFE" = "xno"],[
|
||||
])
|
||||
AC_SUBST([HIVEX_OPEN_UNSAFE_FLAG])
|
||||
|
||||
OCAML_PKG_gettext=no
|
||||
OCAML_PKG_ounit2=no
|
||||
ounit_is_v2=no
|
||||
AS_IF([test "x$OCAMLC" != "xno"],[
|
||||
# Create common/mlgettext/common_gettext.ml gettext functions or stubs.
|
||||
|
||||
# If we're building in a different directory, then common/mlgettext
|
||||
# might not exist yet, so create it:
|
||||
mkdir -p common/mlgettext
|
||||
|
||||
GUESTFS_CREATE_COMMON_GETTEXT_ML([common/mlgettext/common_gettext.ml])
|
||||
|
||||
AC_CHECK_OCAML_PKG(ounit2)
|
||||
|
||||
# oUnit >= 2 is required, so check that it has OUnit2.
|
||||
if test "x$OCAML_PKG_ounit2" != "xno"; then
|
||||
AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+ounit2])
|
||||
fi
|
||||
])
|
||||
AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT],
|
||||
[test "x$OCAML_PKG_gettext" != "xno"])
|
||||
# oUnit is optional, used by some tests in common/mlstdutils (that we
|
||||
# should replace with regular tests one day). If used, oUnit >= 2 is
|
||||
# required.
|
||||
if test "x$OCAML_PKG_ounit2" != "xno"; then
|
||||
AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+ounit2])
|
||||
fi
|
||||
AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT],
|
||||
[test "x$OCAML_PKG_ounit2" != "xno" && test "x$ounit_is_v2" != "xno"])
|
||||
|
||||
AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no])
|
||||
AM_CONDITIONAL([HAVE_OCAML_GETTEXT],
|
||||
[test "x$OCAML_PKG_gettext" != "xno" && test "x$OCAML_GETTEXT" != "xno"])
|
||||
|
||||
dnl Check if OCaml has caml_alloc_initialized_string (added 2017).
|
||||
AS_IF([test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && \
|
||||
test "x$enable_ocaml" = "xyes"],[
|
||||
AC_MSG_CHECKING([for caml_alloc_initialized_string])
|
||||
cat >conftest.c <<'EOF'
|
||||
AC_MSG_CHECKING([for caml_alloc_initialized_string])
|
||||
cat >conftest.c <<'EOF'
|
||||
#include <caml/alloc.h>
|
||||
int main () { char *p = (void *) caml_alloc_initialized_string; return 0; }
|
||||
EOF
|
||||
AS_IF([$OCAMLC conftest.c >&AS_MESSAGE_LOG_FD 2>&1],[
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE([HAVE_CAML_ALLOC_INITIALIZED_STRING],[1],
|
||||
[caml_alloc_initialized_string found at compile time.])
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
rm -f conftest.c conftest.o
|
||||
AS_IF([$OCAMLC conftest.c >&AS_MESSAGE_LOG_FD 2>&1],[
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE([HAVE_CAML_ALLOC_INITIALIZED_STRING],[1],
|
||||
[caml_alloc_initialized_string found at compile time.])
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
rm -f conftest.c conftest.o
|
||||
|
||||
dnl Flags we want to pass to every OCaml compiler call.
|
||||
OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6 -w -6"
|
||||
|
||||
Reference in New Issue
Block a user