From 3d11618b333286cbc3daeb41f7457b1fbe040972 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Mon, 13 Oct 2003 13:14:48 +0000
Subject: [PATCH] move automake options to configure.in, and depend on automake
 1.7

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12997 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 cf/Makefile.am.common | 2 --
 configure.in          | 2 +-
 doc/Makefile.am       | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cf/Makefile.am.common b/cf/Makefile.am.common
index 1669aacea..7318ced8c 100644
--- a/cf/Makefile.am.common
+++ b/cf/Makefile.am.common
@@ -1,7 +1,5 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies 1.6
-
 SUFFIXES = .et .h
 
 INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
diff --git a/configure.in b/configure.in
index 8062b545f..e3ad5a3ea 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CC_STDC
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign no-dependencies 1.7])
 AM_MAINTAINER_MODE
 
 AC_PREFIX_DEFAULT(/usr/heimdal)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c26f27e28..b605448e1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AUTOMAKE_OPTIONS += no-texinfo.tex
+AUTOMAKE_OPTIONS = no-texinfo.tex
 
 info_TEXINFOS = heimdal.texi
 heimdal_TEXINFOS = intro.texi install.texi setup.texi kerberos4.texi apps.texi