[patch] Update cgen's configury.

[Doug Evans <dje@sebabeach.org>]

fyi,

I checked this in.
[some changes to doc/Makefile.am are for a subsequent patch to follow in a sec.]

2009-06-14  Doug Evans  <dje@sebabeach.org>

	* Makefile.am (AUTOMAKE_OPTIONS): Add 1.9
	(GUILE): Fix definition.
	* Makefile.in: Regenerate with automake 1.9.6.
	* aclocal.m4: Regenerate with aclocal 1.9.6.
	* configure.in (AC_PREREQ): Set to 2.59.
	(AM_INIT_AUTOMAKE): Change version to 1.1.
	(GENINSRC_NEVER): Define.
	* configure: Regenerate with autoconf 2.59.
	* doc/Makefile.am (info_TEXINFOS): Add cgenint.texi.
	(cgen.info,cgen.dvi): Delete.
	(cgen_TEXINFOS,cgenint_TEXINFOS): Define.
	(noinst_TEXINFOS): Add cgenint.texi.
	(DOCFILES): Add missing files.
	(MAINTAINERCLEANFILES,DISTCLEANFILES): Define.
	* doc/Makefile.in: Regenerate with automake 1.9.6.

Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/cgen/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- Makefile.am	15 Feb 2005 09:01:33 -0000	1.5
+++ Makefile.am	14 Jun 2009 18:14:28 -0000
@@ -1,10 +1,10 @@
 # Process this file with "automake --cygnus Makefile" to generate Makefile.in
 
-AUTOMAKE_OPTIONS = cygnus
+AUTOMAKE_OPTIONS = 1.9 cygnus
 
 SUBDIRS = doc
 
-GUILE = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l guile -s"
+GUILE = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`" -l $(srcdir)/guile.scm -s
 CGENFLAGS = -v
 ARCH = @arch@
 ARCHFILE = $(srcroot)/../cpu/$(ARCH).cpu
Index: configure.in
===================================================================
RCS file: /cvs/src/src/cgen/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- configure.in	5 May 2006 17:18:25 -0000	1.2
+++ configure.in	14 Jun 2009 18:14:31 -0000
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.13)
+AC_PREREQ(2.59)
 AC_INIT(read.scm)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(cgen, 1.0)
+AM_INIT_AUTOMAKE(cgen, 1.1)
 
 AC_PROG_INSTALL
 AC_EXEEXT
@@ -14,4 +14,7 @@ AC_SUBST(arch)
 
 AM_MAINTAINER_MODE
 
+# See doc/Makefile.am.
+AM_CONDITIONAL(GENINSRC_NEVER, false)
+
 AC_OUTPUT([Makefile doc/Makefile])
Index: doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/cgen/doc/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.am
--- doc/Makefile.am	28 Jul 2000 04:11:52 -0000	1.1.1.1
+++ doc/Makefile.am	14 Jun 2009 18:14:32 -0000
@@ -2,16 +2,31 @@
 
 AUTOMAKE_OPTIONS = cygnus
 
-info_TEXINFOS = cgen.texi
+# List of files that go into cgen.info.
+DOCFILES = app.texi cgen.texi credits.texi glossary.texi intro.texi \
+	notes.texi opcodes.texi pmacros.texi porting.texi \
+	rtl.texi running.texi sim.texi
 
-DOCFILES = app.texi cgen.texi intro.texi notes.texi opcodes.texi \
-	pmacros.texi porting.texi \
-	rtl.texi sim.texi
+info_TEXINFOS = cgen.texi cgenint.texi
 
 # version.texi is handled by autoconf/automake
-cgen.info: $(DOCFILES) version.texi
-cgen.dvi: $(DOCFILES) version.texi
+cgen_TEXINFOS = $(DOCFILES)
 
-# This one isn't ready for prime time yet.  Not even a little bit.
+# versionint.texi is handled by autoconf/automake
+cgenint_TEXINFOS = cgenint.texi glossary.texi
 
-noinst_TEXINFOS = cgen.texi
+# These aren't ready for prime time yet.  Not even a little bit.
+
+noinst_TEXINFOS = cgen.texi cgenint.texi
+
+# Maintenance
+
+MAINTAINERCLEANFILES = cgen.info cgenint.info
+
+# Automake 1.9 will only build info files in the objdir if they are
+# mentioned in DISTCLEANFILES.  It doesn't have to be unconditional,
+# though, so we use a bogus condition.
+# NOTE: This is copied from gas.
+if GENINSRC_NEVER
+DISTCLEANFILES = cgen.info cgenint.info
+endif