From 4b93693dffb2a4bd0d0da137b4d768ca3e68e8f1 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 20 Feb 2011 13:15:34 +0100 Subject: [PATCH] @value{EFFECTIVE-VERSION} instead of 2.0 in some places in the manual * doc/ref/history.texi (A Timeline of Selected Guile Releases): Update the 2.0 release blurb. * doc/ref/api-foreign.texi (Modules and Extensions): * doc/ref/libguile-extensions.texi (A Sample Guile Extension): * doc/ref/tour.texi (Linking Guile into Programs): Use @value{EFFECTIVE-VERSION} instead of 2.0. Also fix sample extension compilation line to include the Guile CFLAGS. --- doc/ref/api-foreign.texi | 6 +++--- doc/ref/history.texi | 12 ++++++------ doc/ref/libguile-extensions.texi | 3 ++- doc/ref/tour.texi | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doc/ref/api-foreign.texi b/doc/ref/api-foreign.texi index fa65d6821..e9d7df6eb 100644 --- a/doc/ref/api-foreign.texi +++ b/doc/ref/api-foreign.texi @@ -360,8 +360,8 @@ When loaded with @code{(use-modules (foo bar))}, the @code{load-extension} call looks for the @file{foobar-c-code.so} (etc) object file in Guile's @code{extensiondir}, which is usually a subdirectory of the @code{libdir}. For example, if your libdir is -@file{/usr/lib}, the @code{extensiondir} for the Guile 2.0.@var{x} -series will be @file{/usr/lib/guile/2.0/}. +@file{/usr/lib}, the @code{extensiondir} for the Guile @value{EFFECTIVE-VERSION}.@var{x} +series will be @file{/usr/lib/guile/@value{EFFECTIVE-VERSION}/}. The extension path includes the major and minor version of Guile (the ``effective version''), because Guile guarantees compatibility within a @@ -399,7 +399,7 @@ with the following in a @file{Makefile}, using @command{sed} @example foo.scm: foo.scm.in - sed 's|XXextensiondirXX|$(libdir)/guile/2.0|' foo.scm + sed 's|XXextensiondirXX|$(libdir)/guile/@value{EFFECTIVE-VERSION}|' foo.scm @end example The actual pattern @code{XXextensiondirXX} is arbitrary, it's only something diff --git a/doc/ref/history.texi b/doc/ref/history.texi index 62b637d81..970ec014b 100644 --- a/doc/ref/history.texi +++ b/doc/ref/history.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Guile Reference Manual. -@c Copyright (C) 2008, 2010 +@c Copyright (C) 2008, 2010, 2011 @c Free Software Foundation, Inc. @c See the file guile.texi for copying conditions. @@ -214,15 +214,15 @@ user-space threading was removed in favor of POSIX pre-emptive threads, providing true multiprocessing. Gettext support was added, and Guile's C API was cleaned up and orthogonalized in a massive way. -@item 2.0 --- April 2010 +@item 2.0 --- 16 February 2010 A virtual machine was added to Guile, along with the associated compiler and toolchain. Support for internationalization was finally reimplemented, in terms of unicode, locales, and libunistring. Running Guile instances became controllable and debuggable from within Emacs, -via GDS and Geiser. Guile caught up to features found in a number of -other Schemes: SRFI-18 threads, including thread cancellation, -module-hygienic macros, a profiler, tracer, and debugger, SSAX XML -integration, bytevectors, module versions, and partial support for R6RS. +via Geiser. Guile caught up to features found in a number of other +Schemes: SRFI-18 threads, module-hygienic macros, a profiler, tracer, +and debugger, SSAX XML integration, bytevectors, a dynamic FFI, +delimited continuations, module versions, and partial support for R6RS. @end table @node Status diff --git a/doc/ref/libguile-extensions.texi b/doc/ref/libguile-extensions.texi index a5de72dd4..95f92cac6 100644 --- a/doc/ref/libguile-extensions.texi +++ b/doc/ref/libguile-extensions.texi @@ -78,7 +78,8 @@ This C source file needs to be compiled into a shared library. Here is how to do it on GNU/Linux: @smallexample -gcc -shared -o libguile-bessel.so -fPIC bessel.c +gcc `pkg-config --cflags guile-@value{EFFECTIVE-VERSION}` \ + -shared -o libguile-bessel.so -fPIC bessel.c @end smallexample For creating shared libraries portably, we recommend the use of GNU diff --git a/doc/ref/tour.texi b/doc/ref/tour.texi index 2215cf034..312984683 100644 --- a/doc/ref/tour.texi +++ b/doc/ref/tour.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Guile Reference Manual. -@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2006, 2010 +@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2006, 2010, 2011 @c Free Software Foundation, Inc. @c See the file guile.texi for copying conditions. @@ -115,7 +115,7 @@ can be compiled and linked like this: @example $ gcc -o simple-guile simple-guile.c \ - `pkg-config --cflags --libs guile-2.0` + `pkg-config --cflags --libs guile-@value{EFFECTIVE-VERSION}` @end example When it is run, it behaves just like the @code{guile} program except -- 2.20.1