mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-29 14:30:34 +02:00
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.
This commit is contained in:
parent
0fcab5ed09
commit
7c86ae051a
4 changed files with 274 additions and 208 deletions
|
@ -58,6 +58,11 @@ AUTOMAKE = @AUTOMAKE@
|
|||
AWK = @AWK@
|
||||
CC = @CC@
|
||||
CPP = @CPP@
|
||||
GUILE_MAJOR_VERSION = @GUILE_MAJOR_VERSION@
|
||||
GUILE_MINOR_VERSION = @GUILE_MINOR_VERSION@
|
||||
GUILE_STAMP = @GUILE_STAMP@
|
||||
GUILE_VERSION = @GUILE_VERSION@
|
||||
LD = @LD@
|
||||
LIBLOBJS = @LIBLOBJS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
MAINT = @MAINT@
|
||||
|
|
|
@ -47,12 +47,6 @@
|
|||
aclocal.m4. */
|
||||
#undef LIBC_H_WITH_UNISTD_H
|
||||
|
||||
/* Define these to indicate the current version of Guile. These
|
||||
values are supposed to be supplied by the configuration system. */
|
||||
#undef GUILE_MAJOR_VERSION
|
||||
#undef GUILE_MINOR_VERSION
|
||||
#undef GUILE_VERSION
|
||||
|
||||
/* Define this to include various undocumented functions used to debug
|
||||
the Guile library itself. */
|
||||
#undef GUILE_DEBUG
|
||||
|
|
19
configure.in
19
configure.in
|
@ -272,9 +272,20 @@ AC_PROG_AWK
|
|||
## given in LIBOBJS. We'll call it LIBLOBJS.
|
||||
LIBLOBJS="`echo ${LIBOBJS} | sed 's/\.o/.lo/g'`"
|
||||
|
||||
AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, "$GUILE_MAJOR_VERSION")
|
||||
AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, "$GUILE_MINOR_VERSION")
|
||||
AC_DEFINE_UNQUOTED(GUILE_VERSION, "$GUILE_VERSION")
|
||||
AC_SUBST(GUILE_MAJOR_VERSION)
|
||||
AC_SUBST(GUILE_MINOR_VERSION)
|
||||
AC_SUBST(GUILE_VERSION)
|
||||
|
||||
dnl timestamping the interpreter and scheme libraries:
|
||||
dnl
|
||||
dnl Help us notice when we're running one version of the Guile
|
||||
dnl interpreter against a different version of the ice-9 Scheme code.
|
||||
dnl This will definitely detect version skew due to differing
|
||||
dnl snapshots and releases, but may not catch skew for the developers.
|
||||
dnl Hopefully it will not detect skew when there is none; if that
|
||||
dnl happens, the warnings will be useless, and we should remove this.
|
||||
GUILE_STAMP="`date`"
|
||||
AC_SUBST(GUILE_STAMP)
|
||||
|
||||
AC_SUBST(AWK)
|
||||
AC_SUBST(LIBLOBJS)
|
||||
|
@ -356,7 +367,7 @@ AC_SUBST(qtmds_s)
|
|||
AC_SUBST(qtmds_o)
|
||||
AC_SUBST(qtmdb_s)
|
||||
|
||||
AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile], [chmod +x libguile/guile-snarf])
|
||||
AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile], [chmod +x libguile/guile-snarf])
|
||||
|
||||
dnl Local Variables:
|
||||
dnl comment-start: "dnl "
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue