[Spice-devel] support automake >= 1.12

Submitted by Alon Levy on Aug. 27, 2012, 1:04 p.m.

Details

Message ID 1346072640-21617-1-git-send-email-alevy@redhat.com
State Accepted
Commit bd10d502f8ed078102c2c16e12d6cbd17e724b13
Headers show

Not browsing as part of any series.

Commit Message

Alon Levy Aug. 27, 2012, 1:04 p.m.
Requires a single line (sans comments) change to configure.ac in
spice-common too, to define the new AM_PROG_AR.
---

Pushing without ack per the trivial rule.

 configure.ac | 3 +++
 spice-common | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/configure.ac b/configure.ac
index 7bd4313..79eeb3b 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 c2f5849..2c55c9d 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@ 
-Subproject commit c2f58492ad2df22c4eb4e6c04750010113dce567
+Subproject commit 2c55c9d0c6a5752a16f5e22667196b461c85d4c8

Comments

2012/8/27 Alon Levy <alevy@redhat.com>:
> Requires a single line (sans comments) change to configure.ac in
> spice-common too, to define the new AM_PROG_AR.
> ---
>
> Pushing without ack per the trivial rule.
>
>  configure.ac | 3 +++
>  spice-common | 2 +-
>  2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 7bd4313..79eeb3b 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])
> +
Thanks Alon, it really works for me, and I think the configure.ac in
spice-gtk should
also be updated.
>  AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip subdir-objects])
>  AM_MAINTAINER_MODE
>
> diff --git a/spice-common b/spice-common
> index c2f5849..2c55c9d 160000
> --- a/spice-common
> +++ b/spice-common
> @@ -1 +1 @@
> -Subproject commit c2f58492ad2df22c4eb4e6c04750010113dce567
> +Subproject commit 2c55c9d0c6a5752a16f5e22667196b461c85d4c8
> --
> 1.7.12
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel