*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 3447df1..9063c9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 Sun Jun 22 15:43:07 1997  Jim Blandy  <jimb@floss.red-bean.com>
 
+       Try to detect when people are using one version of libguile and a
+       different version of ice-9.  People have been skewing things and
+       sending in bug reports.
+       * configure.in: Provide libguile its version information through a
+       separate header file generated by the Makefile, not through
+       scmconfig.h.  
+       (GUILE_MAJOR_VERSION, GUILE_MINOR_VERSION, GUILE_VERSION):
+       AC_SUBST these, instead of AC_DEFINE'ing them.
+       (GUILE_STAMP): New AC_SUBST: the time we configured the tree.
+       (AC_OUTPUT): Create ice-9/version.scm.
+       * acconfig.h (GUILE_MAJOR_VERSION, GUILE_MINOR_VERSION,
+       GUILE_VERSION): Deleted.
+       * Makefile.in: Regenerated.
+
        * aclocal.m4: Regenerated, using the libtool 0.9h m4 macros.
 
        * Makefile.am (EXTRA_DIST): Include acconfig.h in the

diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index cd35d15..6219080 100644 (file)
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,16 @@
+Sun Jun 22 18:33:17 1997  Jim Blandy  <jimb@floss.red-bean.com>
+
+       Try to detect when people are using one version of libguile and a
+       different version of ice-9.  People have been skewing things and
+       sending in bug reports.
+       * version.scm.in: New file, which the configure script munges to
+       produce version.scm, which contains the ice-9 config stamp.
+       * boot-9.scm: Compare the libguile and ice-9 config stamps;
+       display a warning if the two are different.
+       * Makefile.am: Install version.scm, but don't distribute it.
+       Distribute version.scm.in, but don't install it.
+       * Makefile.in: Regenerated.
+
 Thu Jun 19 21:01:16 1997  Jim Blandy  <jimb@floss.red-bean.com>
 
        * slib.scm (slib:warn): Alias for WARN function.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 9d7782e..b87afdb 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,22 @@
 Sun Jun 22 15:46:35 1997  Jim Blandy  <jimb@floss.red-bean.com>
 
+       Try to detect when people are using one version of libguile and a
+       different version of ice-9.  People have been skewing things and
+       sending in bug reports.
+       * Makefile.am (versiondat.h): New file to generate.
+       * version.c: #include "versiondat.h", to get version info.
+       (scm_libguile_config_stamp): New function.
+       * script.c: #include "version.h".
+       (scm_compile_switches): Call scm_version to get version number.
+       * scmconfig.h.in, Makefile.in: Regenerated.
+       * Makefile.in: Regenerated.
+
+       * Makefile.am (ETAGS_ARGS): Catch SCM_PROC, etc. so we can find
+       primitive definitions under their Scheme names.
+
+       * Makefile.am (libguile_la_LDFLAGS): Update library version to
+       1:2.  Helps avoid confusion between installed and uninstalled libs.
+
        * scmconfig.h.in: Regenerated.  (Needed after June 3 change to
        ../configure.in.)
 

diff --git a/qt/ChangeLog b/qt/ChangeLog
index 462b468..2f07007 100644 (file)
--- a/qt/ChangeLog
+++ b/qt/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 22 18:44:11 1997  Jim Blandy  <jimb@floss.red-bean.com>
+
+       * Makefile.in, md/Makefile.in, time/Makefile.in: Regenerated after
+       timestamp change; see ../ChangeLog.
+
 Wed Jun 11 00:33:10 1997  Jim Blandy  <jimb@floss.red-bean.com>
 
        * Makefile.in, md/Makefile.in, time/Makefile.in: Regenerated after