Bump up version for the 2.1.3 release

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 06a24a9..f7eb78b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # 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_revision], [3])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
@@ -39,6 +39,16 @@ AC_ARG_WITH([export-dir],
   [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],
@@ -94,9 +104,16 @@ AC_ARG_WITH([file-storage-dir],
     [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],
@@ -108,22 +125,7 @@ AC_ARG_WITH([kvm-path],
   [kvm_path="/usr/bin/kvm"])
 AC_SUBST(KVM_PATH, $kvm_path)
 
-# --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=...
+# --with-lvm-stripecount=...
 AC_ARG_WITH([lvm-stripecount],
   [AS_HELP_STRING([--with-lvm-stripecount=NUM],
     [the number of stripes to use for LVM volumes]
@@ -133,6 +135,46 @@ AC_ARG_WITH([lvm-stripecount],
   [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
@@ -168,32 +210,45 @@ then
   AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
 fi
 
-if test -z "$SOCAT" -a -n "$check_socat_escape"
+# Check for pylint
+AC_ARG_VAR(PYLINT, [pylint path])
+AC_PATH_PROG(PYLINT, [pylint], [])
+if test -z "$PYLINT"
 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])])])
+  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_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])])])
+  AC_MSG_ERROR([socat not found])
 fi
 
-AC_SUBST([SOCAT_PATH], [$SOCAT])
-if test "x$with_socat_escape" = xyes
+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
-  AC_SUBST([SOCAT_ESCAPE], [1])
+  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)