Author: yamakenz
Date: Fri Jun 15 03:08:28 2007
New Revision: 4601
Modified:
sigscheme-trunk/configure.in
sigscheme-trunk/doc/Makefile.am
sigscheme-trunk/lib/Makefile.am
sigscheme-trunk/src/Makefile.am
Log:
* configure.in
- Add new option --with-master-pkg
* lib/Makefile.am
- Add pkgdatadir rewriting for --with-master-pkg
* doc/Makefile.am
* src/Makefile.am
- Suppress installing headers on combined-source configuration
Modified: sigscheme-trunk/configure.in
==============================================================================
--- sigscheme-trunk/configure.in (original)
+++ sigscheme-trunk/configure.in Fri Jun 15 03:08:28 2007
@@ -255,6 +255,23 @@
# Optional packages #
#####################
+AC_ARG_WITH(master-pkg,
+ AS_HELP_STRING([--with-master-pkg@<:@=NAME@:>@],
+ [specify alternative package name for pkgdatadir.
+ @<:@default=sigscheme@:>@]))
+
+case "${with_master_pkg:=no}" in
+ no|yes)
+ SSCM_MASTER_PKG="sigscheme"
+ ;;
+ *)
+ SSCM_MASTER_PKG="${with_master_pkg}"
+ ;;
+esac
+
+AC_SUBST(SSCM_MASTER_PKG)
+AM_CONDITIONAL(WITH_MASTER_PKG, [test "x$with_master_pkg" != xno])
+
AC_ARG_WITH(libgcroots,
AS_HELP_STRING([--with-libgcroots@<:@=WHICH@:>@],
[use alternative libgcroots instead of
@@ -982,7 +999,7 @@
#
# System directories
#
-scmlibdir='$(pkgdatadir)/lib'
+scmlibdir='${pkgdatadir}/lib'
AC_SUBST(scmlibdir)
SSCM_DEFS='-DPKGDATADIR="\"$(pkgdatadir)\"" -DSCMLIBDIR="\"$(scmlibdir)\""'
AC_SUBST(SSCM_DEFS)
Modified: sigscheme-trunk/doc/Makefile.am
==============================================================================
--- sigscheme-trunk/doc/Makefile.am (original)
+++ sigscheme-trunk/doc/Makefile.am Fri Jun 15 03:08:28 2007
@@ -6,8 +6,11 @@
EXTRA_DIST =
+# Suppress installing documents on combined-source configuration
+if USE_LIBSSCM
dist_doc_DATA = $(TXTS)
dist_html_DATA = $(ASCIIDOC_HTMLS)
+endif
MAINTAINERCLEANFILES = $(ASCIIDOC_HTMLS)
Modified: sigscheme-trunk/lib/Makefile.am
==============================================================================
--- sigscheme-trunk/lib/Makefile.am (original)
+++ sigscheme-trunk/lib/Makefile.am Fri Jun 15 03:08:28 2007
@@ -1,3 +1,11 @@
EXTRA_DIST = slib.scm
dist_scmlib_DATA = srfi-1.scm
+
+# Install into master package's pkgdatadir if --with-master-pkg is specified
+# e.g.)
+# --without-master-pkg -> /usr/share/sigscheme/lib/srfi-1.scm
+# --with-master-pkg=uim -> /usr/share/uim/lib/srfi-1.scm
+if WITH_MASTER_PKG
+pkgdatadir = ${datadir}/${SSCM_MASTER_PKG}
+endif
Modified: sigscheme-trunk/src/Makefile.am
==============================================================================
--- sigscheme-trunk/src/Makefile.am (original)
+++ sigscheme-trunk/src/Makefile.am Fri Jun 15 03:08:28 2007
@@ -210,19 +210,24 @@
# See "Built sources" section of automake info.
BUILT_SOURCES = $(BUILT_DIST)
+# Suppress installing headers on combined-source configuration
+if USE_LIBSSCM
nodist_pkginclude_HEADERS = config.h
pkginclude_HEADERS = config-old.h scmint.h global.h sigscheme.h
+endif
libsscm_sources = \
alloc.c storage.c storage-gc.c \
error.c symbol.c env.c eval.c \
syntax.c procedure.c list.c \
sigschemeinternal.h module.c sigscheme.c
+if USE_LIBSSCM
if USE_STORAGE_COMPACT
pkginclude_HEADERS += storage-common.h storage-compact.h
else
pkginclude_HEADERS += storage-common.h storage-fatty.h
endif
+endif
if USE_CONTINUATION
libsscm_sources += continuation.c
endif
@@ -232,11 +237,15 @@
scmport-file.h scmport-file.c \
scmport-basechar.c
if USE_MULTIBYTE_CHAR
+if USE_LIBSSCM
pkginclude_HEADERS += encoding.h
+endif
libsscm_sources += encoding-config.h encoding.c \
scmport-mbchar.h scmport-mbchar.c
else
+if USE_LIBSSCM
pkginclude_HEADERS += encoding-dummy.h
+endif
libsscm_sources += scmport-sbchar.h scmport-sbchar.c
endif
endif
