[SCM] emacs-jabber branch, master, updated. 2ac3550da736bdcced248887a0c90a74423d98a6

[Magnus H. <leg...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".

The branch, master has been updated
       via  2ac3550da736bdcced248887a0c90a74423d98a6 (commit)
      from  60ef84029b80210d03ededafa0b038ab7aeda147 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2ac3550da736bdcced248887a0c90a74423d98a6
Author: Magnus Henoch <mag...@gm...>
Date:   Tue Feb 26 23:58:49 2013 +0000

    Bump Automake required version to 1.11 for dist-xz option

diff --git a/Makefile.am b/Makefile.am
index 63243f4..47f03f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 # The following line needs to be here since automake 1.4 doesn't look
 # for options in configure.ac.
-AUTOMAKE_OPTIONS = 1.9
+AUTOMAKE_OPTIONS = 1.11
 
 my_lisp_sources=fsm.el jabber-activity.el jabber-ahc-presence.el	\
 jabber-ahc.el jabber-alert.el jabber-autoaway.el jabber-avatar.el	\
diff --git a/configure.ac b/configure.ac
index aba4c5e..d6475eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_INIT([jabber.el], [0.8.91], [ema...@li...], [emacs-jabber])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 dist-xz dist-zip 1.9])
+dnl Need automake 1.11 for dist-xz option
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign dist-bzip2 dist-xz dist-zip])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_PATH_LISPDIR

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am  |    2 +-
 configure.ac |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
emacs-jabber