# Configure script for Ganeti
m4_define([gnt_version_major], [2])
-m4_define([gnt_version_minor], [0])
-m4_define([gnt_version_revision], [2])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_version_minor], [1])
+m4_define([gnt_version_revision], [0])
+m4_define([gnt_version_suffix], [~rc1])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
gnt_version_major, gnt_version_minor,
[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],
[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 /usr/bin/socat)]
- )],
- [socat_path="$withval"],
- [socat_path="/usr/bin/socat"])
-AC_SUBST(SOCAT_PATH, $socat_path)
-
# ---with-lvm-stripecount=...
AC_ARG_WITH([lvm-stripecount],
[AS_HELP_STRING([--with-lvm-stripecount=NUM],
AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not 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)