git.annexia.org
/
virt-top.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change over to using ocaml.m4 macros.
[virt-top.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
0e2cee3
..
e68dcf3
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-17,7
+17,8
@@
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(virt-top,1.0.1)
+AC_INIT(virt-top,1.0.4)
+AC_CONFIG_MACRO_DIR([m4])
AC_PROG_INSTALL
AC_PROG_INSTALL
@@
-33,22
+34,22
@@
dnl Use ocamlfind to find the required packages ...
dnl Check for required OCaml packages.
AC_CHECK_OCAML_PKG(unix)
dnl Check for required OCaml packages.
AC_CHECK_OCAML_PKG(unix)
-if test "x$
pkg_unix" != "xyes
"; then
+if test "x$
OCAML_PKG_unix" = "xno
"; then
AC_MSG_ERROR([Cannot find required OCaml package 'unix'])
fi
AC_CHECK_OCAML_PKG(extlib)
AC_MSG_ERROR([Cannot find required OCaml package 'unix'])
fi
AC_CHECK_OCAML_PKG(extlib)
-if test "x$
pkg_extlib" != "xyes
"; then
+if test "x$
OCAML_PKG_extlib" = "xno
"; then
AC_MSG_ERROR([Cannot find required OCaml package 'extlib'])
fi
AC_CHECK_OCAML_PKG(libvirt)
AC_MSG_ERROR([Cannot find required OCaml package 'extlib'])
fi
AC_CHECK_OCAML_PKG(libvirt)
-if test "x$
pkg_libvirt" != "xyes
"; then
+if test "x$
OCAML_PKG_libvirt" = "xno
"; then
AC_MSG_ERROR([Cannot find required OCaml package 'libvirt'])
fi
AC_CHECK_OCAML_PKG(curses)
AC_MSG_ERROR([Cannot find required OCaml package 'libvirt'])
fi
AC_CHECK_OCAML_PKG(curses)
-if test "x$
pkg_curses" != "xyes
"; then
+if test "x$
OCAML_PKG_curses" = "xno
"; then
AC_MSG_ERROR([Cannot find required OCaml package 'curses'])
fi
AC_MSG_ERROR([Cannot find required OCaml package 'curses'])
fi
@@
-58,19
+59,19
@@
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(csv)
dnl Need to check which version of calendar is installed.
-AC_CHECK_OCAML_
MODULE(calendar,pkg_calendar2,CalendarLib.Date,[+calendar]
)
-if test "x$
pkg_calendar2"
= "xno"; then
- AC_CHECK_OCAML_
PKG(calendar
)
+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
fi
-AC_SUBST(
pkg
_unix)
-AC_SUBST(
pkg
_extlib)
-AC_SUBST(
pkg
_curses)
-AC_SUBST(
pkg
_gettext)
-AC_SUBST(
pkg
_xml_light)
-AC_SUBST(
pkg
_csv)
-AC_SUBST(
pkg
_calendar)
-AC_SUBST(
pkg
_calendar2)
+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)
dnl Check for optional perldoc (for building manual pages).
AC_CHECK_PROG(HAVE_PERLDOC,perldoc,perldoc)
dnl Check for optional perldoc (for building manual pages).
AC_CHECK_PROG(HAVE_PERLDOC,perldoc,perldoc)
@@
-78,6
+79,9
@@
AC_CHECK_PROG(HAVE_PERLDOC,perldoc,perldoc)
dnl Check for recommended ocaml-gettext tool.
AC_CHECK_PROG(OCAML_GETTEXT,ocaml-gettext,ocaml-gettext)
dnl Check for recommended ocaml-gettext tool.
AC_CHECK_PROG(OCAML_GETTEXT,ocaml-gettext,ocaml-gettext)
+dnl Check for msgfmt tool.
+AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
+
dnl Check for optional NSIS (for building a Windows installer).
dnl XXX NSIS support is probably broken at the moment XXX
AC_ARG_WITH([nsis],
dnl Check for optional NSIS (for building a Windows installer).
dnl XXX NSIS support is probably broken at the moment XXX
AC_ARG_WITH([nsis],
@@
-175,7
+179,7
@@
for d in virt-top; do
AC_MSG_NOTICE([creating $d/$f])
rm -f $d/$f
echo "(* This file is generated automatically by ./configure. *)" > $d/$f
AC_MSG_NOTICE([creating $d/$f])
rm -f $d/$f
echo "(* This file is generated automatically by ./configure. *)" > $d/$f
- if test "x$
pkg
_gettext" != "xno"; then
+ if test "x$
OCAML_PKG
_gettext" != "xno"; then
# Gettext module is available, so use it.
cat <<EOT >>$d/$f
module Gettext = Gettext.Program (
# Gettext module is available, so use it.
cat <<EOT >>$d/$f
module Gettext = Gettext.Program (
@@
-215,6
+219,7
@@
AC_CONFIG_FILES([Makefile
Make.rules
po/Makefile
virt-top/Makefile
Make.rules
po/Makefile
virt-top/Makefile
+ virt-top/virt_top_version.ml
])
if test "x$MAKENSIS" != "x"; then
AC_CONFIG_FILES([wininstaller.nsis])
])
if test "x$MAKENSIS" != "x"; then
AC_CONFIG_FILES([wininstaller.nsis])