From 1b7ed2b9298d323c386de553183e577343f381f0 Mon Sep 17 00:00:00 2001 From: bje Date: Sat, 4 Aug 2001 11:50:50 +0000 Subject: [PATCH] 2001-07-23 Ben Elliston * families/Makefile.am (SUBDIRS): Set to @family_subdirs@. * families/configure.in: New file. * families/configure: Likewise. * families/aclocal.m4: Likewise. * configure.in (AC_CONFIG_SUBDIRS): Add "families". (make_subdirs): Remove "families". (AC_OUTPUT): Remove "families/Makefile". 2001-07-17 graydon hoare * configure.in: Add support for families/*. 2001-07-11 Frank Ch. Eigler * component.dtd: Move here, though XML files refer to copy at `http://sources.redhat.com/sid/component.dtd'. 2001-07-10 Frank Ch. Eigler * component_html.xsl: Tweak to allow libxml2/libxslt to process. 2001-07-10 matthew green * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. 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. * component_html.xsl: Add. 2001-03-22 Ben Elliston * Makefile.in: Regenerate. * configure: Likewise. * aclocal.m4: Likewise. --- sid/component/CATALOG | 2 +- sid/component/ChangeLog | 47 +++++++++++++- sid/component/Makefile.in | 3 + sid/component/aclocal.m4 | 33 ++++++++-- sid/component/configure | 150 +++++++++++++++++++++++++++++++++++++++++---- sid/component/configure.in | 4 +- 6 files changed, 219 insertions(+), 20 deletions(-) diff --git a/sid/component/CATALOG b/sid/component/CATALOG index e049f15ec7..7b6684dc61 100644 --- a/sid/component/CATALOG +++ b/sid/component/CATALOG @@ -41,9 +41,9 @@ hw-cache-* Other memory caches (ref. component docs) hw-cpu-arm7t ARM7 / ARM7T CPU model hw-cpu-m32r/d M32R/D CPU model hw-disk-ide IDE hard drive model (controller + drives) +hw-glue-bus-mux Bus multiplexer hw-glue-probe-bus Bus traffic tracer. hw-glue-sequence Sequential pin event dispatcher -hw-glue-bus-mux Bus multiplexer hw-interrupt-arm/ref ARM7 reference peripheral: interrupt controller hw-interrupt-cogent/cma222 Interrupt controller: Cogent CMA222 ARM CPU board hw-lcd-hd44780u HD44780U LCD controller diff --git a/sid/component/ChangeLog b/sid/component/ChangeLog index 7d6e5caf49..75237f8cdd 100644 --- a/sid/component/ChangeLog +++ b/sid/component/ChangeLog @@ -1,17 +1,55 @@ 2001-07-25 Frank Ch. Eigler From Corinna Vinschen - * configure.in (lcd_libs): Look for -lncurses too, if -lcurses + * configure.in (lcd_libs): Look for -lncurses too, if -lcurses is not found. 2001-07-23 Frank Ch. Eigler * siddoc.in (listfiles): Adapt to new XML-origin .txt files. +2001-07-23 Ben Elliston + + * families/Makefile.am (SUBDIRS): Set to @family_subdirs@. + * families/configure.in: New file. + * families/configure: Likewise. + * families/aclocal.m4: Likewise. + + * configure.in (AC_CONFIG_SUBDIRS): Add "families". + (make_subdirs): Remove "families". + (AC_OUTPUT): Remove "families/Makefile". + +2001-07-17 graydon hoare + + * configure.in: Add support for families/*. + 2001-07-16 Ben Elliston * Makefile.am (check-recursive): New rule. +2001-07-11 Frank Ch. Eigler + + * component.dtd: Move here, though XML files refer to copy at + `http://sources.redhat.com/sid/component.dtd'. + +2001-07-10 Frank Ch. Eigler + + * component_html.xsl: Tweak to allow libxml2/libxslt to process. + +2001-07-10 matthew green + + * Makefile.in: Regenerate. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +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. + * component_html.xsl: Add. + 2001-06-26 Frank Ch. Eigler * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir. @@ -28,10 +66,15 @@ * CATALOG: Add hw-visual-probe-bus, hw-visual-probe-pin. +2001-03-22 Ben Elliston + + * Makefile.in: Regenerate. + * configure: Likewise. + * aclocal.m4: Likewise. + 2001-03-21 Ben Elliston * Makefile.in: Regenerate. - * configure: Regenerate. 2001-01-12 Jeff Johnston diff --git a/sid/component/Makefile.in b/sid/component/Makefile.in index 10871efe2f..042eb48894 100644 --- a/sid/component/Makefile.in +++ b/sid/component/Makefile.in @@ -69,6 +69,7 @@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ LD = @LD@ LIBTOOL = @LIBTOOL@ +LINKS = @LINKS@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -76,7 +77,9 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SABLOTRON = @SABLOTRON@ VERSION = @VERSION@ +XSLTPROC = @XSLTPROC@ lcd_libs = @lcd_libs@ make_subdirs = @make_subdirs@ sidtarget_arm = @sidtarget_arm@ diff --git a/sid/component/aclocal.m4 b/sid/component/aclocal.m4 index abca69a166..626ea531a6 100644 --- a/sid/component/aclocal.m4 +++ b/sid/component/aclocal.m4 @@ -600,9 +600,36 @@ 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) + +]) + dnl sidtargets.m4 -*- m4 -*- -dnl Copyright (C) 1999, 2000 Red Hat. +dnl Copyright (C) 1999, 2000, 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. @@ -644,8 +671,6 @@ sidtarget_m32r=$sidtarget_default sidtarget_m68k=$sidtarget_default sidtarget_ppc=$sidtarget_default - - dnl Iterate over all listed targets for targ in $all_targets do @@ -681,7 +706,6 @@ AC_SUBST(sidtarget_arm) AM_CONDITIONAL(SIDTARGET_ARM,[test "x$sidtarget_arm" = x1]) AC_MSG_RESULT($sidtarget_arm) - AC_MSG_CHECKING(MIPS family support) AC_SUBST(sidtarget_mips) AM_CONDITIONAL(SIDTARGET_MIPS,[test "x$sidtarget_mips" = x1]) @@ -702,6 +726,5 @@ AC_SUBST(sidtarget_ppc) AM_CONDITIONAL(SIDTARGET_PPC,[test "x$sidtarget_ppc" = x1]) AC_MSG_RESULT($sidtarget_ppc) - ]) diff --git a/sid/component/configure b/sid/component/configure index 4c38b2573c..aff937ab26 100755 --- a/sid/component/configure +++ b/sid/component/configure @@ -3077,6 +3077,129 @@ fi +# 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:3084: 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:3124: 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:3164: 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 + + + + sid_host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host` @@ -3112,8 +3235,6 @@ sidtarget_m32r=$sidtarget_default sidtarget_m68k=$sidtarget_default sidtarget_ppc=$sidtarget_default - - for targ in $all_targets do case "$targ" in @@ -3140,7 +3261,7 @@ esac echo $ac_n "checking ARM family support""... $ac_c" 1>&6 -echo "configure:3144: checking ARM family support" >&5 +echo "configure:3265: checking ARM family support" >&5 @@ -3153,9 +3274,8 @@ else fi echo "$ac_t""$sidtarget_arm" 1>&6 - echo $ac_n "checking MIPS family support""... $ac_c" 1>&6 -echo "configure:3159: checking MIPS family support" >&5 +echo "configure:3279: checking MIPS family support" >&5 @@ -3169,7 +3289,7 @@ fi echo "$ac_t""$sidtarget_mips" 1>&6 echo $ac_n "checking M32R family support""... $ac_c" 1>&6 -echo "configure:3173: checking M32R family support" >&5 +echo "configure:3293: checking M32R family support" >&5 @@ -3183,7 +3303,7 @@ fi echo "$ac_t""$sidtarget_m32r" 1>&6 echo $ac_n "checking M68K family support""... $ac_c" 1>&6 -echo "configure:3187: checking M68K family support" >&5 +echo "configure:3307: checking M68K family support" >&5 @@ -3197,7 +3317,7 @@ fi echo "$ac_t""$sidtarget_m68k" 1>&6 echo $ac_n "checking PPC family support""... $ac_c" 1>&6 -echo "configure:3201: checking PPC family support" >&5 +echo "configure:3321: checking PPC family support" >&5 @@ -3213,8 +3333,7 @@ echo "$ac_t""$sidtarget_ppc" 1>&6 - -subdirs="cfgroot tcl audio cgen-cpu timers" +subdirs="cfgroot tcl audio cgen-cpu families timers" @@ -3412,6 +3531,15 @@ s%@CXXCPP@%$CXXCPP%g s%@lcd_libs@%$lcd_libs%g s%@socket_libs@%$socket_libs%g s%@CYGWIN@%$CYGWIN%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%@sidtarget_arm@%$sidtarget_arm%g s%@SIDTARGET_ARM_TRUE@%$SIDTARGET_ARM_TRUE%g s%@SIDTARGET_ARM_FALSE@%$SIDTARGET_ARM_FALSE%g @@ -3692,7 +3820,7 @@ if test "$no_recursion" != yes; then esac done - for ac_config_dir in cfgroot tcl audio cgen-cpu timers; do + for ac_config_dir in cfgroot tcl audio cgen-cpu families timers; do # Do not complain, so a configure script can configure whichever # parts of a large source tree are present. diff --git a/sid/component/configure.in b/sid/component/configure.in index 54f23e1d96..abd7fce3b7 100644 --- a/sid/component/configure.in +++ b/sid/component/configure.in @@ -74,6 +74,8 @@ fi AC_SUBST(CYGWIN) +dnl building docs +RH_DOCBUILD_CHECK dnl Perform --target/--enable-targets processing. CY_SIDTARGET_CHECK @@ -85,7 +87,7 @@ dnl cfgroot is here because it's statically linked, and libltdl is its baby. dnl tcl is here because it looks for tcl/tk in a too complex way for this file. dnl audio is here because it has more host-dependent configuration dnl cgen-cpu is here because it has target-dependent configuration -AC_CONFIG_SUBDIRS([cfgroot tcl audio cgen-cpu timers]) +AC_CONFIG_SUBDIRS([cfgroot tcl audio cgen-cpu families timers]) -- 2.11.0