mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
autotooling, version bump to 0.7
* acconfig.h: Removed. * acinclude.m4: Use the extended AC_DEFINE for HAVE_LABELS_AS_VALUES, so as to remove the need for acconfig.h. * autogen.sh: Use autoreconf. * configure.in: Update info, don't warn about non-gnu make, bump version to 0.7. * doc/texinfo.tex: Automagically updated. (Should this be in VCS?)
This commit is contained in:
parent
b571a648d5
commit
1f246cb782
5 changed files with 2434 additions and 565 deletions
|
@ -1,4 +0,0 @@
|
||||||
/* Define if compiler supports gcc's "labels as values" (aka computed goto)
|
|
||||||
* feature (which is used to speed up instruction dispatch in the interpreter).
|
|
||||||
*/
|
|
||||||
#undef HAVE_LABELS_AS_VALUES
|
|
|
@ -15,6 +15,8 @@ l2: return 2;
|
||||||
ac_cv_labels_as_values=yes,
|
ac_cv_labels_as_values=yes,
|
||||||
ac_cv_labels_as_values=no)])
|
ac_cv_labels_as_values=no)])
|
||||||
if test "$ac_cv_labels_as_values" = yes; then
|
if test "$ac_cv_labels_as_values" = yes; then
|
||||||
AC_DEFINE(HAVE_LABELS_AS_VALUES)
|
AC_DEFINE(HAVE_LABELS_AS_VALUES, [],
|
||||||
|
[Define if compiler supports gcc's "labels as values" (aka computed goto)
|
||||||
|
feature, used to speed up instruction dispatch in the interpreter.])
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
15
autogen.sh
15
autogen.sh
|
@ -1,17 +1,12 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if test -f "`aclocal --print-ac-dir`/guile.m4"; then
|
export ACLOCAL_AMFLAGS=
|
||||||
aclocal
|
if test ! -f "`aclocal --print-ac-dir`/guile.m4"; then
|
||||||
else
|
|
||||||
if test -f "`guile-config info datadir`/aclocal/guile.m4"; then
|
if test -f "`guile-config info datadir`/aclocal/guile.m4"; then
|
||||||
aclocal -I "`guile-config info datadir`/aclocal"
|
ACLOCAL_AMFLAGS="-I `guile-config info datadir`/aclocal"
|
||||||
else
|
else
|
||||||
echo "Cannot find guile.m4";
|
echo "warning: cannot find guile.m4";
|
||||||
exit;
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
libtoolize && \
|
autoreconf -vif
|
||||||
autoheader && \
|
|
||||||
automake -a && \
|
|
||||||
autoconf
|
|
||||||
|
|
12
configure.in
12
configure.in
|
@ -1,16 +1,16 @@
|
||||||
# Guile-VM.
|
# Guile-VM.
|
||||||
|
|
||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.59)
|
||||||
AC_INIT(guile-vm, 0.6, ludovic.courtes@laas.fr)
|
AC_INIT(guile-vm, 0.7, bug-guile@gnu.org)
|
||||||
AM_INIT_AUTOMAKE(guile-vm, 0.6)
|
AM_INIT_AUTOMAKE([-Wno-portability])
|
||||||
|
|
||||||
AC_CONFIG_SRCDIR(src/guile-vm.c)
|
AC_CONFIG_SRCDIR(src/guile-vm.c)
|
||||||
AC_CONFIG_HEADER(src/config.h)
|
AC_CONFIG_HEADER(src/config.h)
|
||||||
|
|
||||||
# Guile.
|
# Guile.
|
||||||
GUILE_FLAGS
|
GUILE_FLAGS
|
||||||
if test "`guile -c '(display (string>=? (version) "1.7"))'`" != "#t"; then
|
if test "`guile -c '(display (string>=? (version) "1.8"))'`" != "#t"; then
|
||||||
AC_MSG_ERROR([Your Guile is too old. You need Guile 1.7.2 or later.])
|
AC_MSG_ERROR([Your Guile is too old. You need Guile 1.8.0 or later.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# C Compiler.
|
# C Compiler.
|
||||||
|
@ -23,8 +23,8 @@ guiledir="\$(datadir)/guile"
|
||||||
AC_SUBST(guiledir)
|
AC_SUBST(guiledir)
|
||||||
|
|
||||||
GUILEC="GUILE_LOAD_PATH=\$(top_srcdir)/module \
|
GUILEC="GUILE_LOAD_PATH=\$(top_srcdir)/module \
|
||||||
LD_LIBRARY_PATH=\$(top_srcdir)/src/.libs \
|
LD_LIBRARY_PATH=\$(top_builddir)/src/.libs \
|
||||||
guile -s \$(top_srcdir)/src/guilec"
|
guile -s \$(top_builddir)/src/guilec"
|
||||||
AC_SUBST(GUILEC)
|
AC_SUBST(GUILEC)
|
||||||
|
|
||||||
AC_OUTPUT(Makefile src/Makefile doc/Makefile module/Makefile
|
AC_OUTPUT(Makefile src/Makefile doc/Makefile module/Makefile
|
||||||
|
|
2928
doc/texinfo.tex
2928
doc/texinfo.tex
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue