X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/f491c3a8d1ee8ec64625f694a76492e5c3cafbea..37fc2cf5ba8919cef407199ee540aad4b1a9a2b6:/configure.ac

diff --git a/configure.ac b/configure.ac
index e31e63d..c681e03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,44 +1,217 @@
 # Configure script for Ganeti
+m4_define([gnt_version_major], [2])
+m4_define([gnt_version_minor], [1])
+m4_define([gnt_version_revision], [0])
+m4_define([gnt_version_suffix], [~beta2])
+m4_define([gnt_version_full],
+          m4_format([%d.%d.%d%s],
+                    gnt_version_major, gnt_version_minor,
+                    gnt_version_revision, gnt_version_suffix))
 
 AC_PREREQ(2.59)
-AC_INIT(ganeti, 1.2b2, ganeti@googlegroups.com)
+AC_INIT(ganeti, gnt_version_full, ganeti@googlegroups.com)
 AC_CONFIG_AUX_DIR(autotools)
-AM_INIT_AUTOMAKE([foreign tar-ustar])
+AC_CONFIG_SRCDIR(configure)
+AM_INIT_AUTOMAKE([1.9 foreign tar-ustar -Wall -Wno-portability])
+
+AC_SUBST([VERSION_MAJOR], gnt_version_major)
+AC_SUBST([VERSION_MINOR], gnt_version_minor)
+AC_SUBST([VERSION_REVISION], gnt_version_revision)
+AC_SUBST([VERSION_SUFFIX], gnt_version_suffix)
+AC_SUBST([VERSION_FULL], gnt_version_full)
 
 # --with-ssh-initscript=...
 AC_ARG_WITH([ssh-initscript],
-  [AS_HELP_STRING([--with-ssh-initscript],
+  [AS_HELP_STRING([--with-ssh-initscript=SCRIPT],
     [SSH init script to use (default is /etc/init.d/ssh)]
   )],
   [ssh_initd_script="$withval"],
   [ssh_initd_script="/etc/init.d/ssh"])
 AC_SUBST(SSH_INITD_SCRIPT, $ssh_initd_script)
 
+# --with-export-dir=...
+AC_ARG_WITH([export-dir],
+  [AS_HELP_STRING([--with-export-dir=DIR],
+    [directory to use by default for instance image]
+    [ exports (default is /srv/ganeti/export)]
+  )],
+  [export_dir="$withval"],
+  [export_dir="/srv/ganeti/export"])
+AC_SUBST(EXPORT_DIR, $export_dir)
+
+# --with-os-search-path=...
+# do a bit of black sed magic to for quoting of the strings in the list
+AC_ARG_WITH([os-search-path],
+  [AS_HELP_STRING([--with-os-search-path=LIST],
+    [comma separated list of directories to]
+    [ search for OS images (default is /srv/ganeti/os)]
+  )],
+  [os_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`],
+  [os_search_path="'/srv/ganeti/os'"])
+AC_SUBST(OS_SEARCH_PATH, $os_search_path)
+
+# --with-iallocator-search-path=...
+# do a bit of black sed magic to for quoting of the strings in the list
+AC_ARG_WITH([iallocator-search-path],
+  [AS_HELP_STRING([--with-iallocator-search-path=LIST],
+    [comma separated list of directories to]
+    [ search for instance allocators (default is $libdir/ganeti/iallocators)]
+  )],
+  [iallocator_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`],
+  [iallocator_search_path="'$libdir/$PACKAGE_NAME/iallocators'"])
+AC_SUBST(IALLOCATOR_SEARCH_PATH, $iallocator_search_path)
+
+# --with-xen-bootloader=...
+AC_ARG_WITH([xen-bootloader],
+  [AS_HELP_STRING([--with-xen-bootloader=PATH],
+    [bootloader for Xen hypervisor (default is empty)]
+  )],
+  [xen_bootloader="$withval"],
+  [xen_bootloader=])
+AC_SUBST(XEN_BOOTLOADER, $xen_bootloader)
+
+# --with-xen-kernel=...
+AC_ARG_WITH([xen-kernel],
+  [AS_HELP_STRING([--with-xen-kernel=PATH],
+    [DomU kernel image for Xen hypervisor (default is /boot/vmlinuz-2.6-xenU)]
+  )],
+  [xen_kernel="$withval"],
+  [xen_kernel="/boot/vmlinuz-2.6-xenU"])
+AC_SUBST(XEN_KERNEL, $xen_kernel)
+
+# --with-xen-initrd=...
+AC_ARG_WITH([xen-initrd],
+  [AS_HELP_STRING([--with-xen-initrd=PATH],
+    [DomU initrd image for Xen hypervisor (default is /boot/initrd-2.6-xenU)]
+  )],
+  [xen_initrd="$withval"],
+  [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)
+
+# --with-kvm-path=...
+AC_ARG_WITH([kvm-path],
+  [AS_HELP_STRING([--with-kvm-path=PATH],
+    [absolute path to the kvm binary]
+    [ (default is /usr/bin/kvm)]
+  )],
+  [kvm_path="$withval"],
+  [kvm_path="/usr/bin/kvm"])
+AC_SUBST(KVM_PATH, $kvm_path)
+
+# --with-kvm-migration-port=...
+AC_ARG_WITH([kvm-migration-port],
+  [AS_HELP_STRING([--with-kvm-migration-port=PORT],
+    [tcp port used for kvm instance live migration]
+    [ (default is 8102)]
+  )],
+  [kvm_migration_port="$withval"],
+  [kvm_migration_port="8102"])
+AC_SUBST(KVM_MIGRATION_PORT, $kvm_migration_port)
+
+# --with-socat-path=...
+AC_ARG_WITH([socat-path],
+  [AS_HELP_STRING([--with-socat-path=PATH],
+    [absolute path to the socat binary]
+    [ (default is to let configure search for it)]
+  )],
+  [SOCAT="$withval"],
+  [])
+
+AC_ARG_WITH([socat-escape],
+  [AS_HELP_STRING([--with-socat-escape],
+    [enable escape functionality found in newer socat])],
+  [],
+  [check_socat_escape=yes])
+
+# ---with-lvm-stripecount=...
+AC_ARG_WITH([lvm-stripecount],
+  [AS_HELP_STRING([--with-lvm-stripecount=NUM],
+    [the number of stripes to use for LVM volumes]
+    [ (default is 1)]
+  )],
+  [lvm_stripecount="$withval"],
+  [lvm_stripecount="1"])
+AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount)
+
 # Check common programs
 AC_PROG_INSTALL
+AC_PROG_LN_S
 
-# Check for Python
-AM_PATH_PYTHON(2.4)
+# Check for docbook programs
+AC_ARG_VAR(DOCBOOK2MAN, [docbook2man path])
+AC_PATH_PROG(DOCBOOK2MAN, [docbook2man], [])
+if test -z "$DOCBOOK2MAN"
+then
+  AC_MSG_WARN([docbook2man not found, man pages rebuild will not be possible])
+fi
+
+AC_ARG_VAR(DOCBOOK2HTML, [docbook2html path])
+AC_PATH_PROG(DOCBOOK2HTML, [docbook2html], [])
+if test -z "$DOCBOOK2HTML"
+then
+  AC_MSG_WARN([docbook2html not found, man pages rebuild will not be possible])
+fi
+
+# Check for python-sphinx
+AC_ARG_VAR(SPHINX, [sphinx-build path])
+AC_PATH_PROG(SPHINX, [sphinx-build], [])
+if test -z "$SPHINX"
+then
+  AC_MSG_WARN([sphinx-build not found, documentation rebuild will not be possible])
+fi
 
-# Check for docbook2man
-found_docbook2man=
-AC_CHECK_PROG(found_docbook2man, [docbook2man], [yes])
-if test "$found_docbook2man" != "yes"
+# Check for graphviz (dot)
+AC_ARG_VAR(DOT, [dot path])
+AC_PATH_PROG(DOT, [dot], [])
+if test -z "$DOT"
 then
-  AC_MSG_WARN([docbook2man not found.])
+  AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
 fi
 
-AC_CONFIG_FILES([
-  Makefile
-  daemons/Makefile
-  doc/Makefile
-  doc/examples/Makefile
-  lib/Makefile
-  man/Makefile
-  qa/Makefile
-  scripts/Makefile
-  test/Makefile
-  tools/Makefile
-])
+if test -z "$SOCAT" -a -n "$check_socat_escape"
+then
+AC_CACHE_CHECK([for socat with the escape feature], [ac_cv_path_SOCAT],
+  [AC_PATH_PROGS_FEATURE_CHECK(SOCAT, [socat],
+            [[$ac_path_SOCAT -hh | grep -q escape \
+              && ac_cv_path_SOCAT=$ac_path_SOCAT \
+                 SOCAT=$ac_cv_path_SOCAT \
+                 with_socat_escape=yes ac_path_SOCAT_found=:]],
+            [AC_MSG_WARN([no escape feature found])])])
+fi
+
+if test -z "$SOCAT"
+then
+AC_CACHE_CHECK([for socat], [ac_cv_path_SOCAT],
+  [AC_PATH_PROGS_FEATURE_CHECK(SOCAT, [socat],
+            [[ac_cv_path_SOCAT=$ac_path_SOCAT \
+              SOCAT=$ac_cv_path_SOCAT ac_path_SOCAT_found=:]],
+            [AC_MSG_ERROR([socat not found])])])
+fi
+
+AC_SUBST([SOCAT_PATH], [$SOCAT])
+if test "x$with_socat_escape" = xyes
+then
+  AC_SUBST([SOCAT_ESCAPE], [1])
+fi
+
+# Check for Python
+AM_PATH_PYTHON(2.4)
+
+AC_PYTHON_MODULE(OpenSSL, t)
+AC_PYTHON_MODULE(simplejson, t)
+AC_PYTHON_MODULE(pyparsing, t)
+AC_PYTHON_MODULE(pyinotify, t)
+
+AC_CONFIG_FILES([ Makefile ])
 
 AC_OUTPUT