[Guile-commits] 01/01: Add --with-bdw-gc and update README

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 18cac76be8f4dabdd290518fd551a71652efe500
Author: Andy Wingo <address@hidden>
Date:   Wed Apr 19 16:15:09 2017 +0200

    Add --with-bdw-gc and update README
    
    * README: Update to 2.2.  Add instructions for FreeBSD based on notes
      from Matt Wette.
    * configure.ac: Add --with-bdw-gc argument.
---
 README       | 21 +++++++++++++++++----
 configure.ac |  6 +++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 92d786c..cffee22 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is version 2.0 of Guile, Project GNU's extension language library.
+This is version 2.2 of Guile, Project GNU's extension language library.
 Guile is an implementation of the Scheme programming language, packaged
 as a library that can be linked into applications to give them their own
 extension language.  Guile supports other languages as well, giving
@@ -78,7 +78,7 @@ Guile requires the following external packages:
     `utf*->string' procedures.  It is available from
     http://www.gnu.org/software/libunistring/ .
 
-  - libgc, at least version 7.0
+  - libgc, at least version 7.2
 
     libgc (aka. the Boehm-Demers-Weiser garbage collector) is the
     conservative garbage collector used by Guile.  It is available
@@ -124,7 +124,20 @@ instructions above, but it seems that a few systems still 
need special
 treatment.  If you can send us fixes for these problems, we'd be
 grateful.
 
-   <none yet listed>
+FreeBSD 11.0:
+  For a build supporting threads, please `pkg install' the following
+    - pkgconf : provides pkg-config
+    - gmake : /usr/bin/make does not work
+    - boehm-gc-threaded : needed for threaded support
+
+  Configure as:
+
+    ./configure --with-bdw-gc=bdw-gc-threaded
+
+  Alternately if you want a Guile without threads, then install boehm-gc
+  and configure as:
+
+    ./configure --without-threads
 
 Guile specific flags Accepted by Configure =================================
 
@@ -244,7 +257,7 @@ switches specific to Guile you may find useful in some 
circumstances.
 
 Cross building Guile  =====================================================
 
-As of Guile 2.0.x, the build process produces a library, libguile-2.0,
+As of Guile 2.2.x, the build process produces a library, libguile-2.2,
 along with Guile "object files" containing bytecode to be interpreted by
 Guile's virtual machine.  The bytecode format depends on the endianness
 and word size of the host CPU.
diff --git a/configure.ac b/configure.ac
index 0bde77e..1338540 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1332,7 +1332,11 @@ main (int argc, char **argv)
 # Boehm's GC library
 #
 #--------------------------------------------------------------------
-PKG_CHECK_MODULES([BDW_GC], [bdw-gc >= 7.2])
+AC_MSG_CHECKING(for which bdw-gc pkg-config file to use)
+AC_ARG_WITH(bdw_gc, [  --with-bdw-gc=PKG       name of BDW-GC pkg-config file],
+            [bdw_gc="$withval"], [bdw_gc=bdw-gc])
+AC_MSG_RESULT($bdw_gc)
+PKG_CHECK_MODULES([BDW_GC], [$bdw_gc >= 7.2])
 
 save_LIBS="$LIBS"
 LIBS="$BDW_GC_LIBS $LIBS"