summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2010-03-14 19:55:05 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2010-03-14 19:55:05 (GMT)
commite3fcfbbc3b488928f8cb53c7ab76af8de7fec4ce (patch) (side-by-side diff)
tree55c167233c0c8a831652fb8cb89061c6ea31a6d0
parentc6229965bc51a2bcb1460a9dcc28bed4a0092678 (diff)
downloadgamma-e3fcfbbc3b488928f8cb53c7ab76af8de7fec4ce.tar.gz
gamma-e3fcfbbc3b488928f8cb53c7ab76af8de7fec4ce.tar.bz2
Use installed guile-snarf.
* README-hacking: Update. * am/guile.m4: Define GUILE_SNARF * src/Makefile.am (.c.x): Use GUILE_SNARF.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--README-hacking5
-rw-r--r--am/guile.m44
-rw-r--r--src/Makefile.am2
3 files changed, 5 insertions, 6 deletions
diff --git a/README-hacking b/README-hacking
index c8a633f..a668241 100644
--- a/README-hacking
+++ b/README-hacking
@@ -12,13 +12,10 @@ latest stable version.
- Automake <http://www.gnu.org/software/automake/>
- Autoconf <http://www.gnu.org/software/autoconf/>
-Of course, you will also need Guile version 1.8.x:
+Of course, you will also need Guile version 1.8 or later:
- Guile <http://www.gnu.org/software/guile>
-So far I haven't tried to compile Gamma with Guile 1.9. If you do,
-I'd appreciate any information about your experience.
-
* Bootstrapping
Obviously, if you are reading these notes, you did manage to check out
diff --git a/am/guile.m4 b/am/guile.m4
index 8c7f5cf..2aa25c9 100644
--- a/am/guile.m4
+++ b/am/guile.m4
@@ -42,7 +42,9 @@ AC_DEFUN([MU_CHECK_GUILE],
GUILE_INCLUDES=`guile-config compile`
GUILE_LIBS=`guile-config link`
fi
-
+ gpath=`bindir $GUILE_CONFIG`:$PATH
+ AC_PATH_PROG(GUILE_SNARF, guile-snarf, no, $gpath)
+
if test $GUILE_CONFIG != no; then
AC_MSG_CHECKING(for guile version 1.8 or higher)
GUILE_VERSION=`($GUILE_CONFIG --version 2>&1; echo '')|sed -n 's/guile-config - Guile version \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*/\1\2/p'`
diff --git a/src/Makefile.am b/src/Makefile.am
index bfb82de..65954b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,7 +47,7 @@ SUFFIXES=.x .doc .inc .sci .scm
.c.x:
$(AM_V_GEN)AWK=$(AWK) \
- $(GUILE_DOC_SNARF) -o $@ \
+ $(GUILE_SNARF) -o $@ \
$< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
.c.doc:

Return to:

Send suggestions and report system problems to the System administrator.