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
2003-10-13 13:14:48 +00:00
parent 2ba1b2759a
commit 3d11618b33
3 changed files with 2 additions and 4 deletions
--- 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)
--- 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)
--- 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