From bd10d502f8ed078102c2c16e12d6cbd17e724b13 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy@redhat.com>
Date: Mon, 27 Aug 2012 16:02:24 +0300
Subject: support automake >= 1.12

Requires a single line (sans comments) change to configure.ac in
spice-common too, to define the new AM_PROG_AR.
---
 configure.ac | 3 +++
 spice-common | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7bd43139..79eeb3b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,9 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
+# For automake >= 1.12
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip subdir-objects])
 AM_MAINTAINER_MODE
 
diff --git a/spice-common b/spice-common
index c2f58492..2c55c9d0 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit c2f58492ad2df22c4eb4e6c04750010113dce567
+Subproject commit 2c55c9d0c6a5752a16f5e22667196b461c85d4c8
-- 
cgit