Add missing sort order options in --help output (RHBZ#807176).

[virt-top.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e68dcf3..66e4159 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.4)
+AC_INIT([virt-top],[1.0.7])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_INSTALL
@@ -26,7 +26,7 @@ dnl Check for basic OCaml environment & findlib.
 AC_PROG_OCAML
 AC_PROG_FINDLIB
 
-if test "x$OCAMLFIND" = "x"; then
+if test "x$OCAMLFIND" = "xno"; then
     AC_MSG_ERROR([OCaml findlib is required])
 fi
 
@@ -82,96 +82,6 @@ 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],
-       [AS_HELP_STRING([--with-nsis],
-           [use NSIS to build a Windows installer])],
-       [],
-       [with_nsis=no])
-
-MAKENSIS=
-LIBVIRT_DLL_PATH=
-LIBXDR_DLL_PATH=
-LIBXML2_DLL_PATH=
-GNUTLS_DLL_PATH=
-GTK_PATH=
-GTK_DLL_PATH=
-
-[
-msys_to_win_dir () {
-    eval pushd "\$$1" > /dev/null
-    eval $1=`pwd -W`
-    popd > /dev/null
-}
-]
-
-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
-
-    # MAKENSIS is set so we will build a rule for making a Windows
-    # installer.  To support this, generate wininstaller.nsis.
-    saved_IFS=$IFS
-    IFS=$PATH_SEPARATOR
-    for d in $PATH; do
-       IFS=$saved_IFS
-       echo Checking $d for DLLs ... >&5
-       if test -f "$d/libvirt-0.dll"; then
-           LIBVIRT_DLL_PATH="$d"
-       fi
-       if test -f "$d/libxdr.dll"; then
-           LIBXDR_DLL_PATH="$d"
-       fi
-       if test -f "$d/libxml2-2.dll"; then
-           LIBXML2_DLL_PATH="$d"
-       fi
-       if test -f "$d/libgpg-error-0.dll"; then
-           GNUTLS_DLL_PATH="$d"
-       fi
-       if test -f "$d/libgtk-win32-2.0-0.dll"; then
-           GTK_DLL_PATH="$d"
-           GTK_PATH="$d/.."
-       fi
-    done
-    IFS=$saved_IFS
-
-    if test "x$LIBVIRT_DLL_PATH" = "x"; then
-       AC_MSG_FAILURE([cannot find libvirt-0.dll in PATH])
-    fi
-    if test "x$LIBXDR_DLL_PATH" = "x"; then
-       AC_MSG_FAILURE([cannot find libxdr.dll in PATH])
-    fi
-    if test "x$LIBXML2_DLL_PATH" = "x"; then
-       AC_MSG_FAILURE([cannot find libxml2-2.dll in PATH])
-    fi
-    if test "x$GNUTLS_DLL_PATH" = "x"; then
-       AC_MSG_FAILURE([cannot find GnuTLS DLLs in PATH])
-    fi
-    if test "x$GTK_DLL_PATH" = "x"; then
-        AC_MSG_WARN([cannot find GTK DLLs in PATH])
-    fi
-
-    # Change the paths to Windows paths.
-    msys_to_win_dir LIBVIRT_DLL_PATH
-    msys_to_win_dir LIBXDR_DLL_PATH
-    msys_to_win_dir LIBXML2_DLL_PATH
-    msys_to_win_dir GNUTLS_DLL_PATH
-    if test "x$GTK_DLL_PATH" != "x"; then
-       msys_to_win_dir GTK_DLL_PATH
-       msys_to_win_dir GTK_PATH
-    fi
-fi
-AC_SUBST(MAKENSIS)
-AC_SUBST(LIBVIRT_DLL_PATH)
-AC_SUBST(LIBXDR_DLL_PATH)
-AC_SUBST(LIBXML2_DLL_PATH)
-AC_SUBST(GNUTLS_DLL_PATH)
-AC_SUBST(GTK_DLL_PATH)
-AC_SUBST(GTK_PATH)
-
 dnl Write gettext modules for the programs.
 dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html
 for d in virt-top; do
@@ -221,7 +131,4 @@ AC_CONFIG_FILES([Makefile
        virt-top/Makefile
        virt-top/virt_top_version.ml
        ])
-if test "x$MAKENSIS" != "x"; then
-       AC_CONFIG_FILES([wininstaller.nsis])
-fi
 AC_OUTPUT