# 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], [~beta2])
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],
AC_ARG_WITH([socat-path],
[AS_HELP_STRING([--with-socat-path=PATH],
[absolute path to the socat binary]
- [ (default is /usr/bin/socat)]
+ [ (default is to let configure search for it)]
)],
- [socat_path="$withval"],
- [socat_path="/usr/bin/socat"])
-AC_SUBST(SOCAT_PATH, $socat_path)
+ [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],
AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
fi
+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 ])