move automake options from Makefile.am to configure.in

diff --git a/Makefile.am b/Makefile.am
index 34c144c53fe7e221c6ae19cea5a5d5895eef6987..0fbf9ee54d2253bced6fa9cf399b81fdf1ffff0c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,12 +38,6 @@ ACLOCAL_AMFLAGS = -I m4
 m4 = @M4@
 indent = @INDENT@
 
-AUTOMAKE_OPTIONS = \
-       gnits \
-       check-news \
-       dist-bzip2 \
-       1.7
-
 bin_PROGRAMS = flex
 lib_LIBRARIES = libfl.a
 
@@ -151,12 +145,13 @@ yylex.o: yylex.c flexdef.h flexint.h parse.h
 filter.o: filter.c flexdef.h flexint.h
 
 # Create a tags file.
+
 tags:
        ctags --c-types='defgmstuv' $(srcdir)/*.[ch]
 
 # Create the ChangeLog, but only if we're inside a cvs working directory
 
-ChangeLog:
+ChangeLog: $(srcdir)/tools/cvsauthors $(srcdir)/tools/cvs2cl.pl
        if [ -d CVS ] ; then \
                sh $(srcdir)/tools/cvs2cl.pl -F trunk -U $(srcdir)/tools/cvsauthors \
        ; fi

diff --git a/configure.in b/configure.in
index e8d1ec63311cc4e820e2189622bcd05aec513db0..35547df4783ad04c1fd3f4b5e3a6acb6430a0f3d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ dnl autoconf requirements and initialization
 AC_PREREQ(2.54)
 AC_INIT(flex,2.5.33,flex-help@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(scan.l)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(gnits check-news dist-bzip2)
 AC_CONFIG_HEADER(config.h:conf.in)
 
 dnl checks for programs