Update ChangeLog and configure.ac for ver. 0.7.4

[snf-image] / snf-image-host / configure.ac

diff --git a/snf-image-host/configure.ac b/snf-image-host/configure.ac
index 0f880ca..3dd72d1 100644 (file)
--- a/snf-image-host/configure.ac
+++ b/snf-image-host/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(snf-image, 0.4, synnefo@lists.grnet.gr)
+AC_INIT(snf-image, 0.7.4, synnefo@lists.grnet.gr)
 
 AC_CONFIG_AUX_DIR(autotools)
 AC_CONFIG_SRCDIR(configure)
@@ -12,9 +12,16 @@ AC_ARG_ENABLE([network_backend],
     [enable support for network-hosted images
     (this depends on cURL)])
 )
-AS_IF([test "x$enable_network_backend" = "xyes"],,
-    [AC_MSG_NOTICE(network backend support not enabled)])
-AM_CONDITIONAL(NETWORKIMGSUPPORT, [test "x$enable_network_backend" = "xyes"])
+
+
+AC_ARG_ENABLE([version_consistency_check],
+   AS_HELP_STRING([--enable-version-consistency-check],
+    [Check if the host and the helper packages have the same version]),
+    version_check="$enableval", version_check="no"
+)
+if test ${version_check} = yes; then
+    AC_SUBST(VERSION_CHECK, yes)
+fi
 
 # --with-progress-monitor
 AC_ARG_WITH([progress-monitor],
@@ -42,6 +49,37 @@ AC_ARG_WITH([unattend-file],
     fi]
 )
 
+# --with-multistrap-config
+AC_ARG_WITH([multistrap-config],
+  [AS_HELP_STRING([--with-multistrap-config=MULTISTRAP_CONFIG_PATH],
+      [path to a multistrap configuration file
+      [SYSCONFDIR/snf-image/multistrap.conf]]
+    )],
+    [if test "$withval" != "yes" -a "$withval" != "no"; then
+       multistrap_config="$withval"
+        AC_MSG_NOTICE(using multistrap configuration file: $withval)
+     elif test "$withval" != "no"; then
+         AC_MSG_ERROR([you must specify an configuration file if --with-multistrap-config is specified])
+    fi],
+    [multistrap_config="$sysconfdir/snf-image/multistrap.conf"]
+)
+AC_SUBST(MULTISTRAP_CONFIG, $multistrap_config)
+
+# --with-multistrap-aptprefdir
+AC_ARG_WITH([multistrap-aptprefdir],
+  [AS_HELP_STRING([--with-multistrap-aptprefdir=MULTISTRAP_APTPREFDIR],
+      [path to a directory where preferences files for apt are hosted. Those files will be used during multistrap
+      [SYSCONFDIR/snf-image/apt.pref.d]]
+    )],
+    [if test "$withval" != "yes" -a "$withval" != "no"; then
+       multistrap_aptprefdir="$withval"
+        AC_MSG_NOTICE(using apt preferences directory for multistrap: $withval)
+     elif test "$withval" != "no"; then
+         AC_MSG_ERROR([you must specify a directory if --with-multistrap-aptprefdir is specified])
+    fi],
+    [multistrap_aptprefdir="$sysconfdir/snf-image/apt.pref.d"]
+)
+AC_SUBST(MULTISTRAP_APTPREFDIR, $multistrap_aptprefdir)
 
 # --with-helper-dir
 AC_ARG_WITH([helper-dir],
@@ -130,18 +168,14 @@ if test -z "$INSTALL_MBR" ; then
   AC_MSG_ERROR([install-mbr not found in $PATH:/usr/sbin:/sbin])
 fi
 
-AC_PATH_PROG(TIMELIMIT, [timelimit], [], [$PATH:/usr/sbin:/sbin])
-if test -z "$TIMELIMIT" ; then
-  AC_MSG_ERROR([timelimit not found in $PATH:/usr/sbin:/sbin])
+AC_PATH_PROG(TIMEOUT, [timeout], [], [$PATH:/usr/sbin:/sbin])
+if test -z "$TIMEOUT" ; then
+  AC_MSG_ERROR([timeout not found in $PATH:/usr/sbin:/sbin])
 fi
 
-if test "x$enable_network_backend" = "xyes" ; then
-  AC_PATH_PROG(CURL, [curl], [], [$PATH:/usr/sbin:/sbin])
-    if test -z "$CURL" ; then
-      AC_MSG_ERROR([curl is needed for network backend support but was not \
-      found in $PATH:/usr/sbin:/sbin]
-      [To disable network backend support ommit --enable-network-backend])
-    fi
+AC_PATH_PROG(CURL, [curl], [], [$PATH:/usr/sbin:/sbin])
+if test -z "$CURL" ; then
+  AC_MSG_ERROR([curl not found in $PATH:/usr/sbin:/sbin])
 fi
 
 AC_CONFIG_FILES([