Commit: 2526cac4d1e59343a9ecfcc04d5a4c0fc63e8e7d - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: 2526cac4d1e59343a9ecfcc04d5a4c0fc63e8e7d (tree)
• Time: 2006-12-22 08:13:54
• Author: yamaken <yamaken@ff9a...>
• Commiter: yamaken

Log Message

* sigscheme/configure.in

- Disable -std=gnu89 if glibc is not detected
- Add --disable-shell
- Add definitions for sigscheme.pc
- Remove result printing for backtrace behavior options

* sigscheme/configure.in

- New file

* sigscheme/Makefile.am

- (EXTRA_DIST): Add sigscheme.pc.in
- (DISTCLEANFILES): Add sigscheme.pc
- Add sigscheme.pc generation

* sigscheme/src/Makefile.am

- Support --disable-shell

* NEWS

- Update

Change Summary

• modified: sigscheme/Makefile.am
• modified: sigscheme/NEWS
• modified: sigscheme/configure.in
• add: sigscheme/sigscheme.pc.in
• modified: sigscheme/src/Makefile.am

Incremental Difference

--- a/sigscheme/Makefile.am
+++ b/sigscheme/Makefile.am
@@ -6,10 +6,15 @@ TAGS_REPOSITORY = $(UIM_REPOSITORY)/tags
 DIST_SUM_LIST = $(PACKAGE)-$(VERSION).sum
 
 EXTRA_DIST = \
-        TODO QALog autogen.sh \
+        sigscheme.pc.in TODO QALog autogen.sh \
         compare-scm.sh runbench.sh runtest.sh runtest-tail-rec.sh
 
-DISTCLEANFILES = tools/gnuify-changelog.pl $(DIST_SUM_LIST)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = sigscheme.pc
+
+$(pkgconfig_DATA): config.status
+
+DISTCLEANFILES = sigscheme.pc tools/gnuify-changelog.pl $(DIST_SUM_LIST)
 
 .PHONY: FORCE sum
 FORCE:

--- a/sigscheme/NEWS
+++ b/sigscheme/NEWS
@@ -22,6 +22,8 @@ Overview of changes from 0.6.1 to 0.7.0
 
   - SSCM_VERSION_REQUIRE() macro
 
+  - Add pkg-config support
+
 * Specification changes
 
   - [R5RS] Remove 'delay' and 'force' (temporarily) since they completely

--- a/sigscheme/configure.in
+++ b/sigscheme/configure.in
@@ -174,9 +174,13 @@ else
   ax_prog_cc_version="unknown"
 fi
 
-# gnu89 is required only for glibc. -std=c89 is sufficient for other
-# environments.
-AX_CFLAGS_GCC_OPTION([-std=gnu89])
+# -std=gnu89 is required only for (old?) glibc. -std=c89 is sufficient for
+# other environments.
+if test "x$ax_cv_lib_glibc" = xyes; then
+  AX_CFLAGS_GCC_OPTION([-std=gnu89])
+else
+  AX_CFLAGS_GCC_OPTION([-std=c89])
+fi
 
 AX_CFLAGS_GCC_OPTION([-pedantic])
 AX_CFLAGS_GCC_OPTION([-Wall])
@@ -584,6 +588,7 @@ AX_FEATURE_ARG_N(compat-siod,         [some SIOD compatible features])
 AX_FEATURE_ARG_N(compat-siod-bugs,    [emulating the buggy behaviors of SIOD])
 AX_FEATURE_ARG_Y(eval-c-string,       [eval_c_string() of libsscm])
 AX_FEATURE_ARG_N(backtrace,           [showing backtrace on error])
+AX_FEATURE_ARG_Y(shell,               [the 'sscm' interactive shell])
 
 # Developer-only debugging features
 AX_FEATURE_ARG_N(debug,               [debug mode])
@@ -792,6 +797,7 @@ AX_FEATURE_DEFINE(compat_siod,        SCM_COMPAT_SIOD,      COMPAT_SIOD)
 AX_FEATURE_DEFINE(compat_siod_bugs,   SCM_COMPAT_SIOD_BUGS, COMPAT_SIOD_BUGS)
 AX_FEATURE_DEFINE(eval_c_string)
 AX_FEATURE_DEFINE(backtrace)
+AX_FEATURE_DEFINE(shell)
 
 # Developer-only debugging features
 AX_FEATURE_DEFINE(debug,               SCM_DEBUG,           DEBUG)
@@ -805,6 +811,59 @@ AX_FEATURE_DEFINE(soft_assert,         SCM_SOFT_ASSERT,     SOFT_ASSERT)
 AX_FEATURE_DEFINE(accessor_assert,     SCM_ACCESSOR_ASSERT, ACCESSOR_ASSERT)
 AX_FEATURE_DEFINE(warning_suppressor)
 
+AC_SUBST(use_storage)
+AC_SUBST(use_fixnum)
+AC_SUBST(use_multibyte_char)
+AC_SUBST(use_default_encoding)
+AC_SUBST(use_utf8)
+AC_SUBST(use_euccn)
+AC_SUBST(use_eucjp)
+AC_SUBST(use_euckr)
+AC_SUBST(use_sjis)
+AC_SUBST(use_strict_r5rs)
+AC_SUBST(use_const_list_literal)
+AC_SUBST(use_const_vector_literal)
+AC_SUBST(use_strict_null_form)
+AC_SUBST(use_strict_vector_form)
+AC_SUBST(use_strict_argcheck)
+AC_SUBST(use_strict_toplevel_definitions)
+AC_SUBST(use_internal_definitions)
+AC_SUBST(use_continuation)
+AC_SUBST(use_quasiquote)
+AC_SUBST(use_hygienic_macro)
+AC_SUBST(use_promise)
+AC_SUBST(use_int)
+AC_SUBST(use_number_io)
+AC_SUBST(use_char)
+AC_SUBST(use_string)
+AC_SUBST(use_string_procedure)
+AC_SUBST(use_deep_cadrs)
+AC_SUBST(use_vector)
+AC_SUBST(use_port)
+AC_SUBST(use_reader)
+AC_SUBST(use_writer)
+AC_SUBST(use_load)
+AC_SUBST(use_srfi1)
+AC_SUBST(use_srfi2)
+AC_SUBST(use_srfi6)
+AC_SUBST(use_srfi8)
+AC_SUBST(use_srfi22)
+AC_SUBST(use_srfi23)
+AC_SUBST(use_srfi28)
+AC_SUBST(use_srfi34)
+AC_SUBST(use_srfi38)
+AC_SUBST(use_srfi48)
+AC_SUBST(use_srfi60)
+AC_SUBST(use_srfi75)
+AC_SUBST(use_srfi75_named_chars)
+AC_SUBST(use_sscm_extensions)
+AC_SUBST(use_sscm_format_extensions)
+AC_SUBST(use_compat_siod)
+AC_SUBST(use_compat_siod_bugs)
+AC_SUBST(use_eval_c_string)
+AC_SUBST(use_backtrace)
+AC_SUBST(use_debug)
+
 #########
 # Fixup #
 #########
@@ -848,7 +907,8 @@ AH_BOTTOM([
 
 #endif /* __SIGSCHEME_CONFIG_H */])
 
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([sigscheme.pc
+                 Makefile
                  doc/Makefile
                  m4/Makefile
                  tools/Makefile
@@ -930,6 +990,7 @@ SIOD compatibilities: $use_compat_siod
 SIOD bugs emulation:  $use_compat_siod_bugs
 eval_c_string():      $use_eval_c_string
 Backtrace:            $use_backtrace
+Interactive shell:    $use_shell
 
 [Developer-only debugging features]
 Debug:              $use_debug]])
@@ -942,9 +1003,7 @@ Debug macro:        $use_debug
 Debug encoding:     $use_debug
 Soft assert:        $use_soft_assert
 Accessor assert:    $use_accessor_assert
-Warning suppressor: $use_warning_suppressor
-Frame separators on backtrace: $use_debug_backtrace_sep
-Value printings  on backtrace: $use_debug_backtrace_val]])
+Warning suppressor: $use_warning_suppressor]])
 fi
 
 AC_MSG_RESULT([[

--- /dev/null
+++ b/sigscheme/sigscheme.pc.in
@@ -0,0 +1,63 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+sscm_storage=@use_storage@
+sscm_fixnum=@use_fixnum@
+sscm_multibyte_char=@use_multibyte_char@
+sscm_default_encoding=@use_default_encoding@
+sscm_utf8=@use_utf8@
+sscm_euccn=@use_euccn@
+sscm_eucjp=@use_eucjp@
+sscm_euckr=@use_euckr@
+sscm_sjis=@use_sjis@
+sscm_strict_r5rs=@use_strict_r5rs@
+sscm_const_list_literal=@use_const_list_literal@
+sscm_const_vector_literal=@use_const_vector_literal@
+sscm_strict_null_form=@use_strict_null_form@
+sscm_strict_vector_form=@use_strict_vector_form@
+sscm_strict_argcheck=@use_strict_argcheck@
+sscm_strict_toplevel_definitions=@use_strict_toplevel_definitions@
+sscm_internal_definitions=@use_internal_definitions@
+sscm_continuation=@use_continuation@
+sscm_quasiquote=@use_quasiquote@
+sscm_hygienic_macro=@use_hygienic_macro@
+sscm_promise=@use_promise@
+sscm_int=@use_int@
+sscm_numeric_io=@use_number_io@
+sscm_char=@use_char@
+sscm_string=@use_string@
+sscm_string_procedure=@use_string_procedure@
+sscm_deep_cadrs=@use_deep_cadrs@
+sscm_vector=@use_vector@
+sscm_port=@use_port@
+sscm_reader=@use_reader@
+sscm_writer=@use_writer@
+sscm_load=@use_load@
+sscm_srfi1=@use_srfi1@
+sscm_srfi2=@use_srfi2@
+sscm_srfi6=@use_srfi6@
+sscm_srfi8=@use_srfi8@
+sscm_srfi22=@use_srfi22@
+sscm_srfi23=@use_srfi23@
+sscm_srfi28=@use_srfi28@
+sscm_srfi34=@use_srfi34@
+sscm_srfi38=@use_srfi38@
+sscm_srfi48=@use_srfi48@
+sscm_srfi60=@use_srfi60@
+sscm_srfi75=@use_srfi75@
+sscm_srfi75_named_chars=@use_srfi75_named_chars@
+sscm_extensions=@use_sscm_extensions@
+sscm_format_extensions=@use_sscm_format_extensions@
+sscm_compat_siod=@use_compat_siod@
+sscm_compat_siod_bugs=@use_compat_siod_bugs@
+sscm_eval_c_string=@use_eval_c_string@
+sscm_backtrace=@use_backtrace@
+sscm_debug=@use_debug@
+
+Name: @PACKAGE_NAME@
+Description: Scheme interpreter for embedded use
+Version: @VERSION@
+Libs: -L${libdir} -lsscm
+Cflags: -I${includedir}/sigscheme

--- a/sigscheme/src/Makefile.am
+++ b/sigscheme/src/Makefile.am
@@ -326,11 +326,13 @@ libsscm_la_LDFLAGS  = -version-info $(libsscm_version)
 libsscm_la_CPPFLAGS = -I$(top_builddir)/include -DSCM_COMPILING_LIBSSCM=1
 libsscm_la_CFLAGS   = -Wall
 
+if USE_SHELL
 bin_PROGRAMS  = sscm
 sscm_SOURCES  = main.c
 sscm_LDADD    = libsscm.la
 sscm_CPPFLAGS = -I$(top_builddir)/include
-sscm_CFLAGS   = -Wall
+sscm_CFLAGS   =
+endif
 
 # To enable ruby-and-perl-less build on tarball distribution, we should not
 # delete $(FUNC_TABLES) and sigscheme-combined-trim.h here.