Make version granularity a configure option

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8133691..440784f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # Configure script for Ganeti
 m4_define([gnt_version_major], [2])
-m4_define([gnt_version_minor], [8])
+m4_define([gnt_version_minor], [10])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~rc1])
+m4_define([gnt_version_suffix], [~alpha1])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -20,6 +20,38 @@ AC_SUBST([VERSION_REVISION], gnt_version_revision)
 AC_SUBST([VERSION_SUFFIX], gnt_version_suffix)
 AC_SUBST([VERSION_FULL], gnt_version_full)
 
+# --enable-versionfull
+AC_ARG_ENABLE([versionfull],
+  [AS_HELP_STRING([--enable-versionfull],
+                  m4_normalize([use the full version string rather
+                  than major.minor for version directories]))],
+  [[if test "$enableval" != yes; then
+      USE_VERSION_FULL=yes
+    else
+      USER_VERSION_FULL=no
+    fi
+  ]],
+  [USE_VERSION_FULL=no
+  ])
+AC_SUBST(USE_VERSION_FULL, $USE_VERSION_FULL)
+AM_CONDITIONAL([USE_VERSION_FULL], [test "$USE_VERSION_FULL" = yes])
+
+# --enable-symlinks
+AC_ARG_ENABLE([symlinks],
+  [AS_HELP_STRING([--enable-symlinks],
+                  m4_normalize([also install symlinks under $PREFIX pointing
+                  into the Ganeti package directory (default: enabled)]))],
+  [[if test "$enableval" != no; then
+      INSTALL_SYMLINKS=yes
+    else
+      INSTALL_SYMLINKS=no
+    fi
+  ]],
+  [INSTALL_SYMLINKS=yes
+  ])
+AC_SUBST(INSTALL_SYMLINKS, $INSTALL_SYMLINKS)
+AM_CONDITIONAL([INSTALL_SYMLINKS], [test "$INSTALL_SYMLINKS" = yes])
+
 # --with-ssh-initscript=...
 AC_ARG_WITH([ssh-initscript],
   [AS_HELP_STRING([--with-ssh-initscript=SCRIPT],
@@ -119,19 +151,6 @@ AC_ARG_WITH([xen-initrd],
   [xen_initrd="/boot/initrd-3-xenU"])
 AC_SUBST(XEN_INITRD, $xen_initrd)
 
-# --with-xen-cmd=...
-AC_ARG_WITH([xen-cmd],
-  [AS_HELP_STRING([--with-xen-cmd=CMD],
-    [Sets the xen cli interface command (default is xm)]
-  )],
-  [xen_cmd="$withval"],
-  [xen_cmd=xm])
-AC_SUBST(XEN_CMD, $xen_cmd)
-
-if ! test "$XEN_CMD" = xl -o "$XEN_CMD" = xm; then
-  AC_MSG_ERROR([Unsupported xen command specified])
-fi
-
 # --with-kvm-kernel=...
 AC_ARG_WITH([kvm-kernel],
   [AS_HELP_STRING([--with-kvm-kernel=PATH],
@@ -141,41 +160,14 @@ AC_ARG_WITH([kvm-kernel],
   [kvm_kernel="/boot/vmlinuz-3-kvmU"])
 AC_SUBST(KVM_KERNEL, $kvm_kernel)
 
-# --with-file-storage-dir=...
-AC_ARG_WITH([file-storage-dir],
-  [AS_HELP_STRING([--with-file-storage-dir=PATH],
-    [directory to store files for file-based backend]
-    [ (default is /srv/ganeti/file-storage)]
-  )],
-  [[file_storage_dir="$withval";
-    if test "$withval" != no; then
-      enable_file_storage=True
-    else
-      enable_file_storage=False
-    fi
-  ]],
-  [[file_storage_dir="/srv/ganeti/file-storage";
-    enable_file_storage=True]])
-AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir)
-AC_SUBST(ENABLE_FILE_STORAGE, $enable_file_storage)
-
 # --with-shared-file-storage-dir=...
 AC_ARG_WITH([shared-file-storage-dir],
   [AS_HELP_STRING([--with-shared-file-storage-dir=PATH],
     [directory to store files for shared file-based backend]
     [ (default is /srv/ganeti/shared-file-storage)]
   )],
-  [[shared_file_storage_dir="$withval";
-    if test "$withval" != no; then
-      enable_shared_file_storage=True
-    else
-      enable_shared_file_storage=False
-    fi
-  ]],
-  [[shared_file_storage_dir="/srv/ganeti/shared-file-storage";
-    enable_shared_file_storage=True]])
+  [[shared_file_storage_dir="/srv/ganeti/shared-file-storage"]])
 AC_SUBST(SHARED_FILE_STORAGE_DIR, $shared_file_storage_dir)
-AC_SUBST(ENABLE_SHARED_FILE_STORAGE, $enable_shared_file_storage)
 
 # --with-kvm-path=...
 AC_ARG_WITH([kvm-path],
@@ -245,7 +237,7 @@ AC_ARG_WITH([user-prefix],
    user_confd="${withval}confd";
    user_luxid="${withval}luxid";
    user_noded="$user_default";
-   user_mond="${withval}mond"],
+   user_mond="$user_default"],
   [user_masterd="$user_default";
    user_rapi="$user_default";
    user_confd="$user_default";
@@ -273,7 +265,7 @@ AC_ARG_WITH([group-prefix],
    group_masterd="${withval}masterd";
    group_noded="$group_default";
    group_daemons="${withval}daemons";
-   group_mond="${withval}mond"],
+   group_mond="$group_default"],
   [group_rapi="$group_default";
    group_admin="$group_default";
    group_confd="$group_default";
@@ -574,6 +566,8 @@ if test "$enable_monitoring" != no; then
                    [MONITORING_PKG="$MONITORING_PKG attoparsec"])
   AC_GHC_PKG_CHECK([snap-server], [],
                    [MONITORING_PKG="$MONITORING_PKG snap-server"])
+  AC_GHC_PKG_CHECK([process], [],
+                   [MONITORING_PKG="$MONITORING_PKG process"])
   MONITORING_DEP=
   if test "$has_confd" = False; then
     MONITORING_DEP="$MONITORING_DEP confd"
@@ -623,6 +617,8 @@ AC_GHC_PKG_CHECK([temporary], [], [HS_NODEV=1])
 #        of the checks.
 AC_GHC_PKG_CHECK([attoparsec], [], [HS_NODEV=1])
 AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1])
+AC_GHC_PKG_CHECK([process], [],
+                 [MONITORING_PKG="$MONITORING_PKG process"])
 if test -n "$HS_NODEV"; then
    AC_MSG_WARN(m4_normalize([Required development modules were not found,
                              you won't be able to run Haskell unittests]))
@@ -784,6 +780,7 @@ AC_PYTHON_MODULE(pyinotify, t)
 AC_PYTHON_MODULE(pycurl, t)
 AC_PYTHON_MODULE(bitarray, t)
 AC_PYTHON_MODULE(ipaddr, t)
+AC_PYTHON_MODULE(mock)
 AC_PYTHON_MODULE(affinity)
 AC_PYTHON_MODULE(paramiko)