summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2012-08-27 16:02:24 +0300
committerAlon Levy <alevy@redhat.com>2012-08-27 16:17:17 +0300
commitbd10d502f8ed078102c2c16e12d6cbd17e724b13 (patch)
tree05a6488c0a829c0ef571a794c6c2663dd9dacf8d
parente7aee13e571662f9af87ef90533aa77c754d7747 (diff)
downloadspice-bd10d502f8ed078102c2c16e12d6cbd17e724b13.tar.gz
spice-bd10d502f8ed078102c2c16e12d6cbd17e724b13.tar.xz
spice-bd10d502f8ed078102c2c16e12d6cbd17e724b13.zip
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.
-rw-r--r--configure.ac3
m---------spice-common0
2 files changed, 3 insertions, 0 deletions
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
-Subproject c2f58492ad2df22c4eb4e6c04750010113dce56
+Subproject 2c55c9d0c6a5752a16f5e22667196b461c85d4c