From 0cbedb5b2b83f2188d2469506fcca982ff3ba006 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Tue, 5 Oct 1999 22:36:14 +0000 Subject: [PATCH] *** empty log message *** --- .cvsignore | 6 +++++- ChangeLog | 31 ++++++++++++++++++++++++++++++- doc/.cvsignore | 1 + guile-config/.cvsignore | 1 + guile-config/ChangeLog | 5 +++++ guile-readline/.cvsignore | 1 + guile-readline/ChangeLog | 4 ++-- ice-9/.cvsignore | 1 + libguile/.cvsignore | 2 ++ qt/.cvsignore | 1 + qt/md/.cvsignore | 1 + qt/time/.cvsignore | 1 + 12 files changed, 51 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6e4d6341b..2491c28a2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,7 +1,11 @@ Makefile +Makefile.in +aclocal.m4 +config.build-subdirs config.cache +config.h.in config.log config.status +configure guile-*.tar.gz -config.build-subdirs libtool diff --git a/ChangeLog b/ChangeLog index 8aafcf03d..257ccbafe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,37 @@ 1999-10-05 Jim Blandy + * autogen.sh: Call autoheader explicitly. autoreconf runs + autoconf before autoheader, and autoconf complains if + libguile/scmconfig.h.in doesn't exist. + + Straighten up the situation regarding guile.m4 and qthreads.m4. + + We can't have .m4 files which are installed where aclocal can + see them, but also used by guile's own configure.in, because + aclocal will read both copies, complain about duplicate macro + definitions, and refuse to generate aclocal.m4 at all. This + happens if you invoke it as `aclocal -I .', as autoreconf does. + This is probably a flaw in the autotools, but Guile doesn't need + that flaw fixed immediately. + + guile.m4 is intended for use by people linking against guile, so + it needs to be installed. But Guile itself doesn't use it. So + move guile.m4 into guile-config. That makes sense, since + guile.m4's GUILE_FLAGS macro is just an easy way to call + guile-config. + + qthreads.m4 is indented to help configure a qthreads tree. It's + only useful to a package which actually includes a qthreads tree, + and it's intimately related to that tree, so it's not useful to + install this. So don't install it. + + * guile.m4: Moved to guile-config. + * Makefile.am (aclocaldir, aclocal_DATA): Delete. + (EXTRA_DIST): Move qthreads.m4 here. + Don't store generated files in the repository any more. Instead, require people to run autogen.sh on trees from snapshots and CVS. - * Makefile.in, acconfig.h, aclocal.m4, configure: Deleted. + * Makefile.in, aclocal.m4, configure: Deleted. * autogen.sh: New file. * ANON-CVS, SNAPSHOTS: Updated instructions. diff --git a/doc/.cvsignore b/doc/.cvsignore index 68565bd6d..535633bde 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -1,2 +1,3 @@ Makefile +Makefile.in data-rep.info diff --git a/guile-config/.cvsignore b/guile-config/.cvsignore index d634abbfc..0c604f859 100644 --- a/guile-config/.cvsignore +++ b/guile-config/.cvsignore @@ -1,2 +1,3 @@ Makefile +Makefile.in guile-config diff --git a/guile-config/ChangeLog b/guile-config/ChangeLog index 56e909f17..f3a6ac9cf 100644 --- a/guile-config/ChangeLog +++ b/guile-config/ChangeLog @@ -1,5 +1,10 @@ 1999-10-05 Jim Blandy + * guile.m4: Moved here from top-level directory; see the ChangeLog + entry there. + * Makefile.am (aclocaldir, aclocal_DATA): New variables, ensuring + that guile.m4 gets installed. + * Makefile.in: Deleted from CVS repository. Run the autogen.sh script to create generated files like this one. diff --git a/guile-readline/.cvsignore b/guile-readline/.cvsignore index 3b5acbd96..b0a3f9862 100644 --- a/guile-readline/.cvsignore +++ b/guile-readline/.cvsignore @@ -4,6 +4,7 @@ .deps .libs Makefile +Makefile.in config.log config.status libtool diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog index f9ddfce27..0164f8baa 100644 --- a/guile-readline/ChangeLog +++ b/guile-readline/ChangeLog @@ -1,7 +1,7 @@ 1999-10-05 Jim Blandy - * Makefile.in: Deleted from CVS repository. Run the autogen.sh - script to create generated files like this one. + * Makefile.in, configure, aclocal.m4: Deleted from CVS repository. + Run the autogen.sh script to create generated files like these. 1999-09-22 Jim Blandy diff --git a/ice-9/.cvsignore b/ice-9/.cvsignore index c957c8fa3..f477a6190 100644 --- a/ice-9/.cvsignore +++ b/ice-9/.cvsignore @@ -1,4 +1,5 @@ Makefile +Makefile.in config.log config.status version.scm diff --git a/libguile/.cvsignore b/libguile/.cvsignore index b92d711f9..5329a867a 100644 --- a/libguile/.cvsignore +++ b/libguile/.cvsignore @@ -4,6 +4,7 @@ .deps .libs Makefile +Makefile.in config.cache config.log config.status @@ -18,5 +19,6 @@ guile-snarf libpath.h libtool scmconfig.h +scmconfig.h.in stamp-h versiondat.h diff --git a/qt/.cvsignore b/qt/.cvsignore index d78f06b21..c13e24c74 100644 --- a/qt/.cvsignore +++ b/qt/.cvsignore @@ -3,6 +3,7 @@ .deps .libs Makefile +Makefile.in config.log config.status qt.h diff --git a/qt/md/.cvsignore b/qt/md/.cvsignore index f3c7a7c5d..282522db0 100644 --- a/qt/md/.cvsignore +++ b/qt/md/.cvsignore @@ -1 +1,2 @@ Makefile +Makefile.in diff --git a/qt/time/.cvsignore b/qt/time/.cvsignore index f3c7a7c5d..282522db0 100644 --- a/qt/time/.cvsignore +++ b/qt/time/.cvsignore @@ -1 +1,2 @@ Makefile +Makefile.in