mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-17 09:10:22 +02:00
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: GUILE-VERSION test-suite/tests/srfi-4.test
This commit is contained in:
commit
ab4bc85398
73 changed files with 1292 additions and 335 deletions
|
@ -35,7 +35,8 @@ AC_CONFIG_AUX_DIR([build-aux])
|
|||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CONFIG_SRCDIR(GUILE-VERSION)
|
||||
|
||||
AM_INIT_AUTOMAKE([gnu no-define -Wall -Wno-override])
|
||||
dnl `AM_SUBST_NOTMAKE' was introduced in Automake 1.11.
|
||||
AM_INIT_AUTOMAKE([1.11 gnu no-define -Wall -Wno-override dist-xz])
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],1)])
|
||||
|
||||
AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
|
||||
|
@ -1635,6 +1636,10 @@ pkgdatadir="$datadir/$PACKAGE_TARNAME"
|
|||
sitedir="$pkgdatadir/site/$GUILE_EFFECTIVE_VERSION"
|
||||
AC_SUBST([sitedir])
|
||||
|
||||
dnl Name of the `guile' program.
|
||||
guile_program_name="`echo guile | "$SED" "$program_transform_name"`"
|
||||
AC_SUBST([guile_program_name])
|
||||
|
||||
# Additional SCM_I_GSC definitions are above.
|
||||
AC_SUBST([SCM_I_GSC_GUILE_DEBUG])
|
||||
AC_SUBST([SCM_I_GSC_ENABLE_DEPRECATED])
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue