X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=configure.ac;h=b3f7addf24bcf71903bcda09cbb9d4bbfe8cfd59;hp=ad65465ad05f88ee69f1ff1bb918d8a074a63dc2;hb=HEAD;hpb=b7c3ef13cbd9c9cd49005a32ffb70faf6f5bbe8c

diff --git a/configure.ac b/configure.ac
index ad65465..840eba2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # virt-top
-# Copyright (C) 2007-2008 Red Hat Inc., Richard W.M. Jones
+# Copyright (C) 2007-2021 Red Hat Inc., Richard W.M. Jones
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,15 +17,37 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([virt-top],[1.0.8])
+AC_INIT([virt-top],[1.1.1])
+AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_INSTALL
 
+dnl Enable GNU stuff.
+AC_USE_SYSTEM_EXTENSIONS
+
+dnl Check for basic C environment.
+AC_PROG_CC_STDC
+AC_PROG_CPP
+AC_C_PROTOTYPES
+test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
+AM_PROG_CC_C_O
+
+dnl Check support for 64 bit file offsets.
+AC_SYS_LARGEFILE
+
+dnl Check for libxml2 (required).
+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
+
 dnl Check for basic OCaml environment & findlib.
 AC_PROG_OCAML
-AC_PROG_FINDLIB
+if test "$OCAMLC" = "no"; then
+    AC_MSG_ERROR([You must install the OCaml compiler])
+fi
 
+AM_CONDITIONAL([HAVE_OCAMLOPT],[test "$OCAMLBEST" = "opt"])
+
+AC_PROG_FINDLIB
 if test "x$OCAMLFIND" = "xno"; then
     AC_MSG_ERROR([OCaml findlib is required])
 fi
@@ -38,11 +60,6 @@ if test "x$OCAML_PKG_unix" = "xno"; then
     AC_MSG_ERROR([Cannot find required OCaml package 'unix'])
 fi
 
-AC_CHECK_OCAML_PKG(extlib)
-if test "x$OCAML_PKG_extlib" = "xno"; then
-    AC_MSG_ERROR([Cannot find required OCaml package 'extlib'])
-fi
-
 AC_CHECK_OCAML_PKG(libvirt)
 if test "x$OCAML_PKG_libvirt" = "xno"; then
     AC_MSG_ERROR([Cannot find required OCaml package 'libvirt'])
@@ -54,33 +71,58 @@ if test "x$OCAML_PKG_curses" = "xno"; then
 fi
 
 dnl Check for optional OCaml packages.
+AC_CHECK_OCAML_PKG(calendar)
 AC_CHECK_OCAML_PKG(gettext)
-AC_CHECK_OCAML_PKG(xml-light)
-AC_CHECK_OCAML_PKG(csv)
 
-dnl Need to check which version of calendar is installed.
-AC_CHECK_OCAML_PKG(calendar)
-if test "x$OCAML_PKG_calendar" != "xno"; then
-    AC_CHECK_OCAML_MODULE(is_calendar2,calendar,[CalendarLib.Date],[+$OCAML_PKG_calendar])
+AM_CONDITIONAL([HAVE_PKG_CALENDAR], [test "x$OCAML_PKG_calendar" != "xno"])
+AM_CONDITIONAL([HAVE_PKG_GETTEXT],  [test "x$OCAML_PKG_gettext" != "xno"])
+
+dnl Check if ocamlc/ocamlopt -runtime-variant _pic works.  It was
+dnl added in OCaml >= 4.03, but in theory might be disabled by
+dnl downstream distros.
+OCAML_RUNTIME_VARIANT_PIC_OPTION=""
+if test "x$OCAMLC" != "xno"; then
+    AC_MSG_CHECKING([if OCaml ‘-runtime-variant _pic’ works])
+    rm -f conftest.ml contest
+    echo 'print_endline "hello world"' > conftest.ml
+    if $OCAMLOPT conftest.ml -runtime-variant _pic -o conftest >&5 2>&5 ; then
+        AC_MSG_RESULT([yes])
+        OCAML_RUNTIME_VARIANT_PIC_OPTION="-runtime-variant _pic"
+    else
+        AC_MSG_RESULT([no])
+    fi
+    rm -f conftest.ml contest
 fi
-
-AC_SUBST(OCAML_PKG_unix)
-AC_SUBST(OCAML_PKG_extlib)
-AC_SUBST(OCAML_PKG_curses)
-AC_SUBST(OCAML_PKG_gettext)
-AC_SUBST(OCAML_PKG_xml_light)
-AC_SUBST(OCAML_PKG_csv)
-AC_SUBST(OCAML_PKG_calendar)
-AC_SUBST(is_calendar2)
+AC_SUBST([OCAML_RUNTIME_VARIANT_PIC_OPTION])
 
 dnl Check for optional perldoc (for building manual pages).
-AC_CHECK_PROG(HAVE_PERLDOC,perldoc,perldoc)
+AC_CHECK_PROG([HAVE_PERLDOC], perldoc, perldoc)
+AM_CONDITIONAL([HAVE_PERLDOC], [test "x$HAVE_PERLDOC" = "xperldoc"])
 
 dnl Check for recommended ocaml-gettext tool.
-AC_CHECK_PROG(OCAML_GETTEXT,ocaml-gettext,ocaml-gettext)
+AC_CHECK_PROG([OCAML_GETTEXT], ocaml-gettext, ocaml-gettext)
+AM_CONDITIONAL([HAVE_OCAML_GETTEXT],[test "x$OCAML_GETTEXT" = "xocaml-gettext"])
+
+dnl Check for GNU gettext tools (optional).
+AC_CHECK_PROG([XGETTEXT],[xgettext],[xgettext],[no])
+AC_CHECK_PROG([MSGCAT],[msgcat],[msgcat],[no])
+AC_CHECK_PROG([MSGFMT],[msgfmt],[msgfmt],[no])
+AC_CHECK_PROG([MSGMERGE],[msgmerge],[msgmerge],[no])
+
+dnl Check they are the GNU gettext tools.
+AC_MSG_CHECKING([msgfmt is GNU tool])
+if $MSGFMT --version >/dev/null 2>&1 && $MSGFMT --version | grep -q 'GNU gettext
+'; then
+    msgfmt_is_gnu=yes
+else
+    msgfmt_is_gnu=no
+fi
+AC_MSG_RESULT([$msgfmt_is_gnu])
+AM_CONDITIONAL([HAVE_GNU_GETTEXT],
+    [test "x$XGETTEXT" != "xno" && test "x$MSGCAT" != "xno" && test "x$MSGFMT" != "xno" && test "x$MSGMERGE" != "xno" && test "x$msgfmt_is_gnu" != "xno"])
 
-dnl Check for msgfmt tool.
-AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
+dnl Check for gettext.
+AM_GNU_GETTEXT([external])
 
 dnl Write gettext modules for the programs.
 dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html
@@ -122,8 +164,9 @@ echo "------------------------------------------------------------"
 
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([ocaml-dep.sh],  [chmod +x,-w ocaml-dep.sh])
+AC_CONFIG_FILES([ocaml-link.sh], [chmod +x,-w ocaml-link.sh])
 AC_CONFIG_FILES([Makefile
-	Make.rules
 	po/Makefile
 	src/Makefile
 	src/version.ml