* 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 <bje@redhat.com>
* sid-control-cfgroot.txt: Generate.
2001-06-27 graydon hoare <graydon@redhat.com>
* sid-control-cfgroot.xml: Add.
* compConfig.cxx (cfgroot_component): Add missing throw() specifiers
to this dtor.
+2001-07-04 graydon hoare <graydon@redhat.com>
+
+ * 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 <bje@redhat.com>
+
+ * sid-control-cfgroot.txt: Generate.
+
+2001-06-27 graydon hoare <graydon@redhat.com>
+
+ * sid-control-cfgroot.xml: Add.
+
2001-06-26 Frank Ch. Eigler <fche@redhat.com>
* Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
DEJAGNUTESTS=badconf.exp
check-local: all
(cd ../testsuite ; $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS) $(DEJAGNUTESTS)" )
+
+html_stylesheet=$(srcdir)/../component_html.xsl
+include $(srcdir)/../../config/Makefile.docs
# 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@
LD = @LD@
LIBLTDL = @LIBLTDL@
LIBTOOL = @LIBTOOL@
+LINKS = @LINKS@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
+SABLOTRON = @SABLOTRON@
VERSION = @VERSION@
+XSLTPROC = @XSLTPROC@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
pkgdata_DATA = sid-control-cfgroot.txt
DEJAGNUTESTS = badconf.exp
+
+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
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 = $(pkgdata_DATA)
DIST_COMMON = ./stamp-h.in ChangeLog Makefile.am Makefile.in acconfig.h \
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)
check-local: all
(cd ../testsuite ; $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS) $(DEJAGNUTESTS)" )
+@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:
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)
+
+])
+
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:2211: 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:2251: 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:2291: 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
+
+
+
subdirs="libltdl"
trap '' 1 2 15
s%@CXX@%$CXX%g
s%@CXXCPP@%$CXXCPP%g
s%@LIBLTDL@%$LIBLTDL%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
s%@subdirs@%$subdirs%g
CEOF
# 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.
AC_CHECK_HEADERS(time.h)
AC_CHECK_FUNCS(ctime)
+dnl building docs
+RH_DOCBUILD_CHECK
+
dnl Outputs
AC_CONFIG_SUBDIRS(libltdl)
AC_OUTPUT(Makefile)