Merge remote-tracking branch 'weblate/master' into master

[virt-top.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ad65465..b3f7add 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([virt-top],[1.0.8])
+AC_INIT([virt-top],[1.0.9])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_INSTALL
@@ -57,12 +57,7 @@ dnl Check for optional OCaml packages.
 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])
-fi
 
 AC_SUBST(OCAML_PKG_unix)
 AC_SUBST(OCAML_PKG_extlib)
@@ -71,7 +66,6 @@ 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)
 
 dnl Check for optional perldoc (for building manual pages).
 AC_CHECK_PROG(HAVE_PERLDOC,perldoc,perldoc)
@@ -82,6 +76,10 @@ AC_CHECK_PROG(OCAML_GETTEXT,ocaml-gettext,ocaml-gettext)
 dnl Check for msgfmt tool.
 AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
 
+dnl Substitute CFLAGS and LDFLAGS if set.
+AC_SUBST([CFLAGS])
+AC_SUBST([LDFLAGS])
+
 dnl Write gettext modules for the programs.
 dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html
 AC_MSG_NOTICE([creating src/opt_gettext.ml])