Bump versions to release 2.9~beta1

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6e0e7a1..1511390 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [9])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~alpha1])
+m4_define([gnt_version_suffix], [~beta1])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -134,17 +134,8 @@ AC_ARG_WITH([shared-file-storage-dir],
     [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],
@@ -377,6 +368,7 @@ else
     AC_MSG_ERROR([Sphinx 1.0 or higher is required])
   fi
 fi
+AM_CONDITIONAL([HAS_SPHINX], [test -n "$SPHINX"])
 
 AC_ARG_ENABLE([manpages-in-doc],
   [AS_HELP_STRING([--enable-manpages-in-doc],