# Configure script for Ganeti
-m4_define([gnt_version_major], [1])
-m4_define([gnt_version_minor], [3])
-m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~alpha1])
+m4_define([gnt_version_major], [2])
+m4_define([gnt_version_minor], [1])
+m4_define([gnt_version_revision], [3])
+m4_define([gnt_version_suffix], [])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
gnt_version_major, gnt_version_minor,
AC_INIT(ganeti, gnt_version_full, ganeti@googlegroups.com)
AC_CONFIG_AUX_DIR(autotools)
AC_CONFIG_SRCDIR(configure)
-AM_INIT_AUTOMAKE([foreign tar-ustar])
+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)
[export_dir="/srv/ganeti/export"])
AC_SUBST(EXPORT_DIR, $export_dir)
+# --with-ssh-config-dir=...
+AC_ARG_WITH([ssh-config-dir],
+ [AS_HELP_STRING([--with-ssh-config-dir=DIR],
+ [ directory with ssh host keys ]
+ [ (default is /etc/ssh)]
+ )],
+ [ssh_config_dir="$withval"],
+ [ssh_config_dir="/etc/ssh"])
+AC_SUBST(SSH_CONFIG_DIR, $ssh_config_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],
[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],
[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"])
+ [[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-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-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)
+
+# --enable-drbd-barriers
+AC_ARG_ENABLE([drbd-barriers],
+ [AS_HELP_STRING([--enable-drbd-barriers],
+ [enable the DRBD barrier functionality (>= 8.0.12) (default: enabled)])],
+ [[if test "$enableval" != no; then
+ DRBD_BARRIERS=True
+ else
+ DRBD_BARRIERS=False
+ fi
+ ]],
+ [DRBD_BARRIERS=True])
+AC_SUBST(DRBD_BARRIERS, $DRBD_BARRIERS)
+
+# --enable-syslog[=no/yes/only]
+AC_ARG_ENABLE([syslog],
+ [AS_HELP_STRING([--enable-syslog],
+ [enable use of syslog (default: disabled), one of no/yes/only])],
+ [[case "$enableval" in
+ no)
+ SYSLOG=no
+ ;;
+ yes)
+ SYSLOG=yes
+ ;;
+ only)
+ SYSLOG=only
+ ;;
+ *)
+ SYSLOG=
+ ;;
+ esac
+ ]],
+ [SYSLOG=no])
+
+if test -z "$SYSLOG"
+then
+ AC_MSG_ERROR([invalid value for syslog, choose one of no/yes/only])
+fi
+AC_SUBST(SYSLOG_USAGE, $SYSLOG)
# Check common programs
AC_PROG_INSTALL
AC_PROG_LN_S
+# 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 graphviz (dot)
+AC_ARG_VAR(DOT, [dot path])
+AC_PATH_PROG(DOT, [dot], [])
+if test -z "$DOT"
+then
+ AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
+fi
+
+# Check for pylint
+AC_ARG_VAR(PYLINT, [pylint path])
+AC_PATH_PROG(PYLINT, [pylint], [])
+if test -z "$PYLINT"
+then
+ AC_MSG_WARN([pylint not found, checking code will not be possible])
+fi
+
+# Check for socat
+AC_ARG_VAR(SOCAT, [socat path])
+AC_PATH_PROG(SOCAT, [socat], [])
+if test -z "$SOCAT"
+then
+ AC_MSG_ERROR([socat not found])
+fi
+
+SOCAT_USE_ESCAPE=
+AC_ARG_ENABLE([socat-escape],
+ [AS_HELP_STRING([--enable-socat-escape],
+ [use escape functionality available in socat >= 1.7 (default: detect
+ automatically)])],
+ [[if test "$enableval" = yes; then
+ SOCAT_USE_ESCAPE=True
+ else
+ SOCAT_USE_ESCAPE=False
+ fi
+ ]])
+
+if test -z "$SOCAT_USE_ESCAPE"
+then
+ if $SOCAT -hh | grep -w -q escape; then
+ SOCAT_USE_ESCAPE=True
+ else
+ SOCAT_USE_ESCAPE=False
+ fi
+fi
+
+AC_SUBST(SOCAT_USE_ESCAPE)
+
# 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)
+AC_PYTHON_MODULE(pyinotify, t)
-# Check for docbook2man
-found_docbook2man=
-AC_CHECK_PROG(found_docbook2man, [docbook2man], [yes])
-if test "$found_docbook2man" != "yes"
-then
- AC_MSG_WARN([docbook2man not found.])
-fi
-
-AC_CONFIG_FILES([
- Makefile
- daemons/Makefile
- doc/Makefile
- doc/examples/Makefile
- lib/Makefile
- lib/hypervisor/Makefile
- man/Makefile
- qa/Makefile
- qa/hooks/Makefile
- scripts/Makefile
- test/Makefile
- tools/Makefile
-])
+AC_CONFIG_FILES([ Makefile ])
AC_OUTPUT
projects / ganeti-local / blobdiff