Author: yamakenz
Date: Mon Aug 6 17:01:54 2007
New Revision: 4806
Modified:
sigscheme-trunk/configure.in
sigscheme-trunk/lib/Makefile.am
Log:
* configure.in
- Add --enable-srfi69 and --enable-srfi95 and required dependencies
* lib/Makefile.am
- Make srfi-*.scm installation optional
Modified: sigscheme-trunk/configure.in
==============================================================================
--- sigscheme-trunk/configure.in (original)
+++ sigscheme-trunk/configure.in Mon Aug 6 17:01:54 2007
@@ -500,6 +500,8 @@
use_srfi48=yes
use_srfi55=yes
use_srfi60=yes
+ use_srfi69=yes
+ use_srfi95=yes
;;
small|siod)
use_srfi1=no
@@ -515,6 +517,8 @@
use_srfi48=no
use_srfi55=no
use_srfi60=no
+ use_srfi69=no
+ use_srfi95=no
;;
esac
@@ -654,6 +658,8 @@
AX_FEATURE_ARG_Y(srfi48, [SRFI-48 'format' (superset of SRFI-28)])
AX_FEATURE_ARG_Y(srfi55, [SRFI-55 'require-extension'])
AX_FEATURE_ARG_Y(srfi60, [SRFI-60 integers as bits (partial)])
+AX_FEATURE_ARG_Y(srfi69, [SRFI-69 basic hash tables])
+AX_FEATURE_ARG_Y(srfi95, [SRFI-95 sorting and merging])
# R6RS features (preliminary)
AX_FEATURE_ARG_Y(r6rs-named-chars, [named characters of R6RS (preliminary)])
@@ -719,6 +725,8 @@
srfi38: writer
srfi55: load sscm_extensions
srfi60: int
+srfi69: load int string vector srfi9 srfi23
+srfi95: load int
r6rs_named_chars: char
r6rs_chars: char utf8 reader r6rs_named_chars
@@ -763,6 +771,7 @@
storage_fatty: valuecons const_list_literal const_vector_literal
debug: accessor_assert strict_argcheck strict_encoding_check
backtrace: srfi38
+srfi69: srfi38
])
# Resolve weak dependencies required if and only if available
@@ -873,6 +882,8 @@
AX_FEATURE_DEFINE(srfi48)
AX_FEATURE_DEFINE(srfi55)
AX_FEATURE_DEFINE(srfi60)
+AX_FEATURE_DEFINE(srfi69)
+AX_FEATURE_DEFINE(srfi95)
# R6RS features (preliminary)
AX_FEATURE_DEFINE(r6rs_named_chars)
@@ -950,6 +961,8 @@
AC_SUBST(use_srfi48)
AC_SUBST(use_srfi55)
AC_SUBST(use_srfi60)
+AC_SUBST(use_srfi69)
+AC_SUBST(use_srfi95)
AC_SUBST(use_r6rs_chars)
AC_SUBST(use_r6rs_named_chars)
AC_SUBST(use_sscm_extensions)
@@ -1105,6 +1118,8 @@
SRFI-48: $use_srfi48
SRFI-55: $use_srfi55
SRFI-60: $use_srfi60
+SRFI-69: $use_srfi69
+SRFI-95: $use_srfi95
[R6RS features (preliminary)]
R6RS characters: $use_r6rs_chars
Modified: sigscheme-trunk/lib/Makefile.am
==============================================================================
--- sigscheme-trunk/lib/Makefile.am (original)
+++ sigscheme-trunk/lib/Makefile.am Mon Aug 6 17:01:54 2007
@@ -1,5 +1,19 @@
-dist_scmlib_DATA = sigscheme-init.scm \
- srfi-1.scm srfi-9.scm srfi-55.scm srfi-69.scm srfi-95.scm
+dist_scmlib_DATA = sigscheme-init.scm
+if USE_SRFI1
+dist_scmlib_DATA += srfi-1.scm
+endif
+if USE_SRFI9
+dist_scmlib_DATA += srfi-9.scm
+endif
+if USE_SRFI55
+dist_scmlib_DATA += srfi-55.scm
+endif
+if USE_SRFI69
+dist_scmlib_DATA += srfi-69.scm
+endif
+if USE_SRFI95
+dist_scmlib_DATA += srfi-95.scm
+endif
# Install into master package's pkgdatadir if --with-master-pkg is specified
# e.g.)
