X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=configure.ac;h=f0ec22a7f80ae06df074f2ef364c05bfb89fdcc6;hp=c90a2b0f3a104b6ffd4f10bf5c8b6f61d6789a68;hb=f2bb550da8353a7ab11d487b947ed702aa9a838f;hpb=3126bfee333b5c635dc60a54265936af06117f6a;ds=sidebyside

diff --git a/configure.ac b/configure.ac
index c90a2b0..f0ec22a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -122,20 +122,17 @@ else
     fi
 
     dnl Check for optional OCaml modules.
-    AC_CHECK_OCAML_MODULE(extlib,pkg_extlib,ExtString,[extlib])
-    AC_CHECK_OCAML_MODULE(lablgtk2,pkg_lablgtk2,GMain,[lablgtk2])
-    AC_CHECK_OCAML_MODULE(curses,pkg_curses,Curses,[curses])
-    AC_CHECK_OCAML_MODULE(gettext,pkg_gettext,Gettext,[gettext]) dnl XXX
-    AC_CHECK_OCAML_MODULE(xml-light,pkg_xml_light,Xml,[xml-light])
-    AC_CHECK_OCAML_MODULE(csv,pkg_csv,Csv,[csv])
-    AC_CHECK_OCAML_MODULE(calendar,pkg_calendar,Calendar,[calendar])
+    AC_CHECK_OCAML_MODULE(extlib,pkg_extlib,ExtString,[+extlib])
+    AC_CHECK_OCAML_MODULE(lablgtk2,pkg_lablgtk2,GMain,[+lablgtk2])
+    AC_CHECK_OCAML_MODULE(curses,pkg_curses,Curses,[+curses])
+    AC_CHECK_OCAML_MODULE(gettext,pkg_gettext,Gettext,[+gettext]) dnl XXX
+    AC_CHECK_OCAML_MODULE(xml-light,pkg_xml_light,Xml,[+xml-light])
+    AC_CHECK_OCAML_MODULE(csv,pkg_csv,Csv,[+csv])
+    AC_CHECK_OCAML_MODULE(calendar,pkg_calendar,Calendar,[+calendar])
 fi
 
 dnl Which subpackages (== subdirs) will we build?
-subdirs="libvirt examples"
-if test "x$pkg_extlib" != "xno"; then
-    subdirs="$subdirs mlvirsh"
-fi
+subdirs="libvirt examples mlvirsh"
 if test "x$pkg_lablgtk2" != "xno"; then
     subdirs="$subdirs mlvirtmanager"
 fi
@@ -150,6 +147,21 @@ AC_SUBST(subdirs)
 dnl Check for optional perldoc (for building manual pages).
 AC_CHECK_PROG(HAVE_PERLDOC,perldoc,perldoc)
 
+dnl Check for optional NSIS.
+AC_ARG_WITH([nsis],
+	[AS_HELP_STRING([--with-nsis],
+	    [use NSIS to build a Windows installer])],
+	[],
+	[with_nsis=no])
+MAKENSIS=
+if test "x$with_nsis" != "xno"; then
+    AC_PATH_PROG(MAKENSIS,makensis,[],[$with_nsis:$PATH])
+    if test "x$MAKENSIS" = "x"; then
+	AC_MSG_FAILURE([--with-nsis was given, but could not find MAKENSIS.EXE])
+    fi
+fi
+AC_SUBST(MAKENSIS)
+
 dnl Summary.
 echo "------------------------------------------------------------"
 echo "Thanks for downloading" $PACKAGE_STRING