diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-14 21:55:05 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-14 21:55:05 +0200 |
commit | e3fcfbbc3b488928f8cb53c7ab76af8de7fec4ce (patch) | |
tree | 55c167233c0c8a831652fb8cb89061c6ea31a6d0 | |
parent | c6229965bc51a2bcb1460a9dcc28bed4a0092678 (diff) | |
download | gamma-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.
-rw-r--r-- | README-hacking | 5 | ||||
-rw-r--r-- | am/guile.m4 | 4 | ||||
-rw-r--r-- | src/Makefile.am | 2 |
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 @@ -9,19 +9,16 @@ packages to build Gamma. I don't make any extra effort to accommodate older versions of these packages, so please make sure that you have the 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 Gamma from the repository. The next step is to bootstrap the package. You do this as follows: diff --git a/am/guile.m4 b/am/guile.m4 index 8c7f5cf..2aa25c9 100644 --- a/am/guile.m4 +++ b/am/guile.m4 @@ -39,13 +39,15 @@ AC_DEFUN([MU_CHECK_GUILE], if test $GUILE_CONFIG = no; then mu_cv_lib_guile=no else 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'` case "x$GUILE_VERSION" in x[[0-9]]*) if test $GUILE_VERSION -lt 18; then diff --git a/src/Makefile.am b/src/Makefile.am index bfb82de..65954b1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,13 +44,13 @@ ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_L GUILE_DOC_SNARF=$(top_srcdir)/scripts/guile-doc-snarf 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: $(AM_V_GEN)AWK=$(AWK) \ $(GUILE_DOC_SNARF) -d -o $@ \ $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) |