Remove support for Pickle configuration files

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index c1bcd56..c869687 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Configure script for Ganeti
 AC_PREREQ(2.59)
-AC_INIT(ganeti, 1.2b2, ganeti@googlegroups.com)
+AC_INIT(ganeti, 1.2.3, ganeti@googlegroups.com)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CONFIG_SRCDIR(configure)
 AM_INIT_AUTOMAKE([foreign tar-ustar])
@@ -53,6 +53,16 @@ AC_ARG_WITH([xen-initrd],
   [xen_initrd="/boot/initrd-2.6-xenU"])
 AC_SUBST(XEN_INITRD, $xen_initrd)
 
+# --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"],
+  [file_storage_dir="/srv/ganeti/file-storage"])
+AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir)
+
 # Check common programs
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -60,6 +70,13 @@ AC_PROG_LN_S
 # Check for Python
 AM_PATH_PYTHON(2.4)
 
+AC_PYTHON_MODULE(twisted.internet, t)
+AC_PYTHON_MODULE(twisted.cred, t)
+AC_PYTHON_MODULE(twisted.spread, t)
+AC_PYTHON_MODULE(OpenSSL, t)
+AC_PYTHON_MODULE(simplejson, t)
+AC_PYTHON_MODULE(pyparsing, t)
+
 # Check for docbook2man
 found_docbook2man=
 AC_CHECK_PROG(found_docbook2man, [docbook2man], [yes])
@@ -76,6 +93,7 @@ AC_CONFIG_FILES([
   lib/Makefile
   man/Makefile
   qa/Makefile
+  qa/hooks/Makefile
   scripts/Makefile
   test/Makefile
   tools/Makefile