emacs-jabber configure.ac,1.5,1.6 Makefile.am,1.5,1.6

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6213

Modified Files:
	configure.ac Makefile.am 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-520
Creator:  Magnus Henoch <ma...@fr...>

Explicitly require automake 1.9


Index: configure.ac
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.ac	30 May 2008 21:56:56 -0000	1.5
+++ configure.ac	1 Jun 2008 22:54:45 -0000	1.6
@@ -1,5 +1,5 @@
 AC_INIT([jabber.el], [0.8.0], [ema...@li...], [emacs-jabber])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-zip])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-zip 1.9])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_PATH_LISPDIR

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	30 May 2008 21:56:57 -0000	1.5
+++ Makefile.am	1 Jun 2008 22:54:45 -0000	1.6
@@ -1,4 +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
 
 my_lisp_sources=fsm.el jabber-activity.el jabber-ahc-presence.el	\
 jabber-ahc.el jabber-alert.el jabber-autoaway.el jabber-avatar.el	\