From ffd1e895813e045f2ee8ae666b6c953cbae5dad0 Mon Sep 17 00:00:00 2001 From: bje Date: Sat, 4 Aug 2001 11:32:17 +0000 Subject: [PATCH] 2001-07-11 Frank Ch. Eigler * bridge-tcl.xml: Add prefix. 2001-07-04 graydon hoare * configure.in: Add maintainer-mode doc building configury. * configure: Regenerate. * Makefile.am: Add maintainer-mode doc building. * Makefile.in: Regenerate. 2001-07-04 Ben Elliston * bridge-tcl.txt: Generate. 2001-06-28 Ben Elliston * bridge-tcl.xml: Merge in changes since 2001-06-01. 2001-06-27 graydon hoare * bridge-tcl.xml: Add. --- sid/component/tcl/ChangeLog | 23 +++++++ sid/component/tcl/Makefile.am | 3 + sid/component/tcl/Makefile.in | 35 ++++++++++- sid/component/tcl/aclocal.m4 | 27 +++++++++ sid/component/tcl/configure | 135 ++++++++++++++++++++++++++++++++++++++++- sid/component/tcl/configure.in | 3 + 6 files changed, 223 insertions(+), 3 deletions(-) diff --git a/sid/component/tcl/ChangeLog b/sid/component/tcl/ChangeLog index 8eda0979d9..ffa2c09538 100644 --- a/sid/component/tcl/ChangeLog +++ b/sid/component/tcl/ChangeLog @@ -3,6 +3,29 @@ * compTcl.cxx (tcl_component): Add missing throw() specifiers to this dtor. +2001-07-11 Frank Ch. Eigler + + * bridge-tcl.xml: Add prefix. + +2001-07-04 graydon hoare + + * configure.in: Add maintainer-mode doc building configury. + * configure: Regenerate. + * Makefile.am: Add maintainer-mode doc building. + * Makefile.in: Regenerate. + +2001-07-04 Ben Elliston + + * bridge-tcl.txt: Generate. + +2001-06-28 Ben Elliston + + * bridge-tcl.xml: Merge in changes since 2001-06-01. + +2001-06-27 graydon hoare + + * bridge-tcl.xml: Add. + 2001-06-26 Frank Ch. Eigler * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir. diff --git a/sid/component/tcl/Makefile.am b/sid/component/tcl/Makefile.am index 741542f6c6..45d11e107b 100644 --- a/sid/component/tcl/Makefile.am +++ b/sid/component/tcl/Makefile.am @@ -12,3 +12,6 @@ noinst_DATA = tester.tcl libtclapi_la_SOURCES = compTcl.cxx libtclapi_la_LDFLAGS = -module -no-undefined + +html_stylesheet=$(srcdir)/../component_html.xsl +include $(srcdir)/../../config/Makefile.docs diff --git a/sid/component/tcl/Makefile.in b/sid/component/tcl/Makefile.in index 4459496593..647447db6e 100644 --- a/sid/component/tcl/Makefile.in +++ b/sid/component/tcl/Makefile.in @@ -11,6 +11,15 @@ # PARTICULAR PURPOSE. +# Makefile.docs -*- Makefile -*- +# Copyright (C) 2001 Red Hat. +# This file is part of SID and is licensed under the GPL. +# See the file COPYING.SID for conditions for redistribution. +# +# ... to be included in document-building Makefile.am's +# + + SHELL = @SHELL@ srcdir = @srcdir@ @@ -68,6 +77,7 @@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ LD = @LD@ LIBTOOL = @LIBTOOL@ +LINKS = @LINKS@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -75,7 +85,9 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SABLOTRON = @SABLOTRON@ VERSION = @VERSION@ +XSLTPROC = @XSLTPROC@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I $(srcdir)/../../config @@ -89,6 +101,10 @@ noinst_DATA = tester.tcl libtclapi_la_SOURCES = compTcl.cxx libtclapi_la_LDFLAGS = -module -no-undefined + +html_stylesheet = $(srcdir)/../component_html.xsl + +SUFFIXES = .xml .txt .html ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../../config/mkinstalldirs CONFIG_HEADER = config.h @@ -111,6 +127,11 @@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DATA = $(noinst_DATA) $(pkgdata_DATA) DIST_COMMON = ./stamp-h.in ChangeLog Makefile.am Makefile.in acconfig.h \ @@ -127,8 +148,8 @@ OBJECTS = $(libtclapi_la_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .cxx .lo .o .s -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +.SUFFIXES: .S .c .cxx .html .lo .o .s .txt .xml +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../config/Makefile.docs cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) @@ -473,6 +494,16 @@ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +@MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_TRUE@.xml.html: +@MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_TRUE@ xsltproc --output $@ $(html_stylesheet) $< + +@MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_FALSE@@HAVE_SABLOTRON_TRUE@.xml.html: +@MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_FALSE@@HAVE_SABLOTRON_TRUE@ sabcmd $(html_stylesheet) $< $@ + +@MAINTAINER_MODE_TRUE@@HAVE_LINKS_TRUE@.html.txt: +@MAINTAINER_MODE_TRUE@@HAVE_LINKS_TRUE@ links -dump $< > $@ +@MAINTAINER_MODE_TRUE@@HAVE_LINKS_TRUE@ cp $@ $(srcdir)/$@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/sid/component/tcl/aclocal.m4 b/sid/component/tcl/aclocal.m4 index a9056f96f1..c6fe47fa19 100644 --- a/sid/component/tcl/aclocal.m4 +++ b/sid/component/tcl/aclocal.m4 @@ -600,3 +600,30 @@ AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl dnl This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL])dnl +dnl docbuild.m4 -*- m4 -*- + +dnl Copyright (C) 2001 Red Hat. +dnl This file is part of SID and is licensed under the GPL. +dnl See the file COPYING.SID for conditions for redistribution. + +dnl Use RH_DOCBUILD_CHECK in configure.in to configure support for +dnl building docs from xml/sgml source, when in maintainer mode. + +dnl + +AC_DEFUN(RH_DOCBUILD_CHECK, [ + +dnl check for presence of "links" text web browser +AC_CHECK_PROG(LINKS,links,true,false) +AM_CONDITIONAL(HAVE_LINKS, test x$LINKS = xtrue) + +dnl check for presence of "xsltproc" XSLT processor +AC_CHECK_PROG(XSLTPROC,xsltproc,true,false) +AM_CONDITIONAL(HAVE_XSLTPROC, test x$XSLTPROC = xtrue) + +dnl check for presence of "sablotron" XSLT processor +AC_CHECK_PROG(SABLOTRON,sabcmd,true,false) +AM_CONDITIONAL(HAVE_SABLOTRON, test x$SABLOTRON = xtrue) + +]) + diff --git a/sid/component/tcl/configure b/sid/component/tcl/configure index 6446f034d9..85cf40e15e 100755 --- a/sid/component/tcl/configure +++ b/sid/component/tcl/configure @@ -4054,6 +4054,130 @@ fi done + + +# Extract the first word of "links", so it can be a program name with args. +set dummy links; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4063: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LINKS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$LINKS"; then + ac_cv_prog_LINKS="$LINKS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LINKS="true" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_LINKS" && ac_cv_prog_LINKS="false" +fi +fi +LINKS="$ac_cv_prog_LINKS" +if test -n "$LINKS"; then + echo "$ac_t""$LINKS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + +if test x$LINKS = xtrue; then + HAVE_LINKS_TRUE= + HAVE_LINKS_FALSE='#' +else + HAVE_LINKS_TRUE='#' + HAVE_LINKS_FALSE= +fi + +# Extract the first word of "xsltproc", so it can be a program name with args. +set dummy xsltproc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4103: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_XSLTPROC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$XSLTPROC"; then + ac_cv_prog_XSLTPROC="$XSLTPROC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_XSLTPROC="true" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_XSLTPROC" && ac_cv_prog_XSLTPROC="false" +fi +fi +XSLTPROC="$ac_cv_prog_XSLTPROC" +if test -n "$XSLTPROC"; then + echo "$ac_t""$XSLTPROC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + +if test x$XSLTPROC = xtrue; then + HAVE_XSLTPROC_TRUE= + HAVE_XSLTPROC_FALSE='#' +else + HAVE_XSLTPROC_TRUE='#' + HAVE_XSLTPROC_FALSE= +fi + +# Extract the first word of "sabcmd", so it can be a program name with args. +set dummy sabcmd; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4143: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_SABLOTRON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$SABLOTRON"; then + ac_cv_prog_SABLOTRON="$SABLOTRON" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_SABLOTRON="true" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_SABLOTRON" && ac_cv_prog_SABLOTRON="false" +fi +fi +SABLOTRON="$ac_cv_prog_SABLOTRON" +if test -n "$SABLOTRON"; then + echo "$ac_t""$SABLOTRON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + +if test x$SABLOTRON = xtrue; then + HAVE_SABLOTRON_TRUE= + HAVE_SABLOTRON_FALSE='#' +else + HAVE_SABLOTRON_TRUE='#' + HAVE_SABLOTRON_FALSE= +fi + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -4228,6 +4352,15 @@ s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g s%@X_LIBS@%$X_LIBS%g s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g +s%@LINKS@%$LINKS%g +s%@HAVE_LINKS_TRUE@%$HAVE_LINKS_TRUE%g +s%@HAVE_LINKS_FALSE@%$HAVE_LINKS_FALSE%g +s%@XSLTPROC@%$XSLTPROC%g +s%@HAVE_XSLTPROC_TRUE@%$HAVE_XSLTPROC_TRUE%g +s%@HAVE_XSLTPROC_FALSE@%$HAVE_XSLTPROC_FALSE%g +s%@SABLOTRON@%$SABLOTRON%g +s%@HAVE_SABLOTRON_TRUE@%$HAVE_SABLOTRON_TRUE%g +s%@HAVE_SABLOTRON_FALSE@%$HAVE_SABLOTRON_FALSE%g CEOF EOF @@ -4236,7 +4369,7 @@ cat >> $CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script. ac_file=1 # Number of current file. ac_beg=1 # First line for current file. ac_end=$ac_max_sed_cmds # Line after last line for current file. diff --git a/sid/component/tcl/configure.in b/sid/component/tcl/configure.in index d39f404c95..6a2168727b 100644 --- a/sid/component/tcl/configure.in +++ b/sid/component/tcl/configure.in @@ -118,5 +118,8 @@ AC_CHECK_HEADERS(tk.h) AC_CHECK_HEADERS(dirent.h) AC_CHECK_FUNCS(opendir) +dnl building docs +RH_DOCBUILD_CHECK + dnl Outputs AC_OUTPUT(Makefile) -- 2.11.0