aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog20
-rw-r--r--Makefile.in10
-rw-r--r--TODO9
-rw-r--r--acinclude.m432
-rwxr-xr-xconfigure180
-rw-r--r--configure.ac39
-rw-r--r--doc/Makefile.am6
-rw-r--r--doc/Makefile.in17
-rw-r--r--example/Makefile.in10
-rw-r--r--testsuite/Makefile.in10
-rw-r--r--testsuite/libdejagnu/Makefile.in10
11 files changed, 186 insertions, 157 deletions
diff --git a/ChangeLog b/ChangeLog
index e0011c8..5c70d4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2004-02-08 Ben Elliston <bje@wasabisystems.com>
+
+ * configure.ac: Quote strings throughout in good Autoconf style.
+ Remove AC_PROG_YACC invocation. Search for docbook2dvi, et al and
+ expect using AC_PATH_PROG. Remove DJ_AC_PATH_DOCBOOK in favour of
+ existing macros. Remove stale BOARDS and CONFIG substs. Ensure Tcl
+ is at version 8.3 or greater.
+ * configure: Regenerate.
+ * acinclude.m4: Remove.
+ * aclocal.m4: Regenerate.
+ * Makefile.in: Likewise.
+ * doc/Makefile.am (%.pdf: %.sgml): Use $(DOCBOOK2PDF).
+ (%.dvi: %.sgml): Use $(DOCBOOK2DVI).
+ (%.html: %.sgml): Use $(DOCBOOK2HTML).
+ * doc/Makefile.in: Regenerate.
+ * example/Makefile.in: Likewise.
+ * testsuite/Makefile.in: Likewise.
+ * testsuite/libdejagnu/Makefile.in: Likewise.
+ * TODO: Update.
+
2004-02-08 Daniel Jacobowitz <drow@mvista.com>
* baseboards/cf.exp: Use -T instead of -Wl,-T for ldscript.
diff --git a/Makefile.in b/Makefile.in
index bbcad3a..cb74ef9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,8 +45,7 @@ DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
TODO config.guess config.sub depcomp install-sh missing \
mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -100,11 +99,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOARDS = @BOARDS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG = @CONFIG@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
@@ -112,7 +109,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOCBOOK = @DOCBOOK@
+DOCBOOK2DVI = @DOCBOOK2DVI@
+DOCBOOK2HTML = @DOCBOOK2HTML@
+DOCBOOK2PDF = @DOCBOOK2PDF@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -142,7 +141,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_STRIP = @ac_ct_STRIP@
diff --git a/TODO b/TODO
index 4a10afe..05e6474 100644
--- a/TODO
+++ b/TODO
@@ -1,18 +1,15 @@
-Last updated $Date: 2004/02/08 05:22:06 $
+Last updated $Date: 2004/02/08 12:57:53 $
Bigger items
============
+* Internationali[sz]ation.
+* Use a throw-away slave interpreter for running each test case.
* Transfer timeouts should be dependent on file size and link speed.
* Add more support for target boards and RTOSes.
* Use the new expect terminal support for an "escape codes" API.
* Use expectk and write a GUI testing API, complete with record/playback.
-Configure/build
-===============
-
-* Add a configure test to make sure the right version of Tcl is installed.
-
Documentation
=============
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 80214e5..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-AC_DEFUN([DJ_AC_PATH_DOCBOOK], [
-AC_MSG_CHECKING(for Docbook tools)
-AC_ARG_WITH(oskith, [ --with-docbook directory where the db2 sgml tools are], with_docbook=${withval})
-AC_CACHE_VAL(ac_cv_c_docbook,[
-dnl first check to see if --with-docbook was specified
-if test x"${with_docbook}" != x ; then
- if test -f ${with_docbook}/db2html ; then
- ac_cv_c_docbook=`(cd ${with_docbook}; pwd)`
- else
- AC_MSG_ERROR([${with_docbook} directory doesn't contain SGML tools])
- fi
-fi
-])
-if test x"${ac_cv_c_docbook}" = x ; then
- for i in $ac_default_prefix/bin /usr/local/bin $OSKITHDIR/../bin /usr/bin /bin /opt /home; do
- dnl See is we have an SGML tool in that directory.
- if test -f $i/db2html ; then
- ac_cv_c_docbook=$i
- break
- fi
- done
-fi
-
-if test x"${ac_cv_c_docbook}" = x ; then
- AC_MSG_RESULT(none)
-else
- DOCBOOK="${ac_cv_c_docbook}"
- AC_MSG_RESULT(${ac_cv_c_docbook})
-fi
-
-AC_SUBST(DOCBOOK)
-])
diff --git a/configure b/configure
index 252f8ae..00b2816 100755
--- a/configure
+++ b/configure
@@ -273,7 +273,7 @@ PACKAGE_BUGREPORT=
ac_unique_file="runtest.exp"
ac_subdirs_all="$ac_subdirs_all example/calc example/hello"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC EXPECT DOCBOOK BOARDS CONFIG subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE DOCBOOK2DVI DOCBOOK2PDF DOCBOOK2HTML EXPECT subdirs LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -818,11 +818,6 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
-Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-docbook directory where the db2 sgml tools are
-
Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
@@ -3384,46 +3379,126 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-for ac_prog in 'bison -y' byacc
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+
+# Extract the first word of "docbook2dvi", so it can be a program name with args.
+set dummy docbook2dvi; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_YACC+set}" = set; then
+if test "${ac_cv_path_DOCBOOK2DVI+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$YACC"; then
- ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $DOCBOOK2DVI in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_DOCBOOK2DVI="$DOCBOOK2DVI" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_YACC="$ac_prog"
+ ac_cv_path_DOCBOOK2DVI="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+ test -z "$ac_cv_path_DOCBOOK2DVI" && ac_cv_path_DOCBOOK2DVI="false"
+ ;;
+esac
fi
+DOCBOOK2DVI=$ac_cv_path_DOCBOOK2DVI
+
+if test -n "$DOCBOOK2DVI"; then
+ echo "$as_me:$LINENO: result: $DOCBOOK2DVI" >&5
+echo "${ECHO_T}$DOCBOOK2DVI" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# Extract the first word of "docbook2pdf", so it can be a program name with args.
+set dummy docbook2pdf; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_DOCBOOK2PDF+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $DOCBOOK2PDF in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_DOCBOOK2PDF="$DOCBOOK2PDF" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_DOCBOOK2PDF="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_path_DOCBOOK2PDF" && ac_cv_path_DOCBOOK2PDF="false"
+ ;;
+esac
fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
- echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6
+DOCBOOK2PDF=$ac_cv_path_DOCBOOK2PDF
+
+if test -n "$DOCBOOK2PDF"; then
+ echo "$as_me:$LINENO: result: $DOCBOOK2PDF" >&5
+echo "${ECHO_T}$DOCBOOK2PDF" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
- test -n "$YACC" && break
+# Extract the first word of "docbook2html", so it can be a program name with args.
+set dummy docbook2html; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_DOCBOOK2HTML+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $DOCBOOK2HTML in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_DOCBOOK2HTML="$DOCBOOK2HTML" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_DOCBOOK2HTML="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
done
-test -n "$YACC" || YACC="yacc"
+
+ test -z "$ac_cv_path_DOCBOOK2HTML" && ac_cv_path_DOCBOOK2HTML="false"
+ ;;
+esac
+fi
+DOCBOOK2HTML=$ac_cv_path_DOCBOOK2HTML
+
+if test -n "$DOCBOOK2HTML"; then
+ echo "$as_me:$LINENO: result: $DOCBOOK2HTML" >&5
+echo "${ECHO_T}$DOCBOOK2HTML" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
# Extract the first word of "expect", so it can be a program name with args.
@@ -3471,59 +3546,29 @@ echo "$as_me: error: unable to locate expect" >&2;}
{ (exit 1); exit 1; }; }
fi
-
-echo "$as_me:$LINENO: checking for Docbook tools" >&5
-echo $ECHO_N "checking for Docbook tools... $ECHO_C" >&6
-
-# Check whether --with-oskith or --without-oskith was given.
-if test "${with_oskith+set}" = set; then
- withval="$with_oskith"
- with_docbook=${withval}
-fi;
-if test "${ac_cv_c_docbook+set}" = set; then
+echo "$as_me:$LINENO: checking Tcl version 8.3 or greater" >&5
+echo $ECHO_N "checking Tcl version 8.3 or greater... $ECHO_C" >&6
+if test "${ac_cv_dg_tcl_modern+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-if test x"${with_docbook}" != x ; then
- if test -f ${with_docbook}/db2html ; then
- ac_cv_c_docbook=`(cd ${with_docbook}; pwd)`
- else
- { { echo "$as_me:$LINENO: error: ${with_docbook} directory doesn't contain SGML tools" >&5
-echo "$as_me: error: ${with_docbook} directory doesn't contain SGML tools" >&2;}
- { (exit 1); exit 1; }; }
- fi
-fi
+ ac_cv_dg_tcl_modern=`$EXPECT << EOF
+if [ expr \\${tcl_version} >= 8.3 ] then { puts yes } else { puts no }
+EOF`
fi
-if test x"${ac_cv_c_docbook}" = x ; then
- for i in $ac_default_prefix/bin /usr/local/bin $OSKITHDIR/../bin /usr/bin /bin /opt /home; do
- if test -f $i/db2html ; then
- ac_cv_c_docbook=$i
- break
- fi
- done
-fi
-
-if test x"${ac_cv_c_docbook}" = x ; then
- echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+if test x${ac_cv_dg_tcl_modern} = xyes ; then
+ echo "$as_me:$LINENO: result: ${ac_cv_dg_tcl_modern}" >&5
+echo "${ECHO_T}${ac_cv_dg_tcl_modern}" >&6
else
- DOCBOOK="${ac_cv_c_docbook}"
- echo "$as_me:$LINENO: result: ${ac_cv_c_docbook}" >&5
-echo "${ECHO_T}${ac_cv_c_docbook}" >&6
+ { { echo "$as_me:$LINENO: error: Tcl 8.3 or greater is required" >&5
+echo "$as_me: error: Tcl 8.3 or greater is required" >&2;}
+ { (exit 1); exit 1; }; }
fi
-
-BOARDS='$(boards)'
-
-CONFIG='$(config)'
-
-
-
-
subdirs="$subdirs example/calc example/hello"
@@ -4252,11 +4297,10 @@ s,@ac_ct_CXX@,$ac_ct_CXX,;t t
s,@CXXDEPMODE@,$CXXDEPMODE,;t t
s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s,@YACC@,$YACC,;t t
+s,@DOCBOOK2DVI@,$DOCBOOK2DVI,;t t
+s,@DOCBOOK2PDF@,$DOCBOOK2PDF,;t t
+s,@DOCBOOK2HTML@,$DOCBOOK2HTML,;t t
s,@EXPECT@,$EXPECT,;t t
-s,@DOCBOOK@,$DOCBOOK,;t t
-s,@BOARDS@,$BOARDS,;t t
-s,@CONFIG@,$CONFIG,;t t
s,@subdirs@,$subdirs,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
diff --git a/configure.ac b/configure.ac
index c40dbcf..93857cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
-AC_INIT(runtest.exp)
-AM_INIT_AUTOMAKE(dejagnu, 1.4.4)
+AC_INIT([runtest.exp])
+AM_INIT_AUTOMAKE([dejagnu], 1.4.4)
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
@@ -10,23 +10,32 @@ AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
AC_EXEEXT
-AC_PROG_YACC
-AC_PATH_PROG(EXPECT, expect)
+dnl Search for the Docbook utilities.
+AC_PATH_PROG([DOCBOOK2DVI], [docbook2dvi], [false])
+AC_PATH_PROG([DOCBOOK2PDF], [docbook2pdf], [false])
+AC_PATH_PROG([DOCBOOK2HTML], [docbook2html], [false])
+
+dnl Search for expect.
+AC_PATH_PROG([EXPECT], [expect])
if test -z $ac_cv_path_EXPECT ; then
AC_MSG_ERROR([unable to locate expect])
fi
-dnl we need the path to Docbook so we can build packages.
-DJ_AC_PATH_DOCBOOK
-
-dnl Level of indirection for automake macro (baseboards:boards_DATA)
-BOARDS='$(boards)'
-AC_SUBST(BOARDS)
-CONFIG='$(config)'
-AC_SUBST(CONFIG)
+dnl Check the Tcl version is >= 8.3.
+AC_MSG_CHECKING([Tcl version 8.3 or greater])
+AC_CACHE_VAL(ac_cv_dg_tcl_modern,[
+ ac_cv_dg_tcl_modern=`$EXPECT << EOF
+if @<:@ expr \\${tcl_version} >= 8.3 @:>@ then { puts yes } else { puts no }
+EOF`
+])
+if test x${ac_cv_dg_tcl_modern} = xyes ; then
+ AC_MSG_RESULT(${ac_cv_dg_tcl_modern})
+else
+ AC_MSG_ERROR([Tcl 8.3 or greater is required])
+fi
-AC_CONFIG_SUBDIRS(example/calc example/hello)
+AC_CONFIG_SUBDIRS([example/calc example/hello])
-AC_OUTPUT(Makefile doc/Makefile testsuite/Makefile example/Makefile
- testsuite/libdejagnu/Makefile)
+AC_OUTPUT([Makefile doc/Makefile testsuite/Makefile example/Makefile
+ testsuite/libdejagnu/Makefile])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0333355..6199be0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -56,18 +56,18 @@ docs: $(TARGETS)
%.pdf: %.sgml
src=$(srcdir); \
dir=`(cd $${src}; pwd)`; \
- $(DOCBOOK)/db2pdf $${dir}/$*.sgml
+ $(DOCBOOK2PDF) $${dir}/$*.sgml
%.dvi: %.sgml
src=$(srcdir); \
dir=`(cd $${src}; pwd)`; \
- $(DOCBOOK)/db2dvi $${dir}/$*.sgml
+ $(DOCBOOK2DVI) $${dir}/$*.sgml
%.html: %.sgml
src=$(srcdir); \
dir=`(cd $${src}; pwd)`; \
mkdir html; \
- $(DOCBOOK)/db2html -o html $${dir}/$*.sgml
+ $(DOCBOOK2HTML) $${dir}/$*.sgml
# Now for some extra dependencies that the automatic rules will not
# catch:
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 76e0260..1d72c63 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -37,8 +37,7 @@ subdir = doc
DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in texinfo.tex
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -70,11 +69,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOARDS = @BOARDS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG = @CONFIG@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
@@ -82,7 +79,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOCBOOK = @DOCBOOK@
+DOCBOOK2DVI = @DOCBOOK2DVI@
+DOCBOOK2HTML = @DOCBOOK2HTML@
+DOCBOOK2PDF = @DOCBOOK2PDF@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -112,7 +111,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -146,6 +144,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
dist_man_MANS = runtest.1
info_TEXINFOS = dejagnu.texi
+DOCBOOK = @DOCBOOK@
TARGETS = book1.html overview.ps overview.pdf
EXTRA_DIST = overview.sgml user.sgml ref.sgml \
overview.pdf \
@@ -532,18 +531,18 @@ docs: $(TARGETS)
%.pdf: %.sgml
src=$(srcdir); \
dir=`(cd $${src}; pwd)`; \
- $(DOCBOOK)/db2pdf $${dir}/$*.sgml
+ $(DOCBOOK2PDF) $${dir}/$*.sgml
%.dvi: %.sgml
src=$(srcdir); \
dir=`(cd $${src}; pwd)`; \
- $(DOCBOOK)/db2dvi $${dir}/$*.sgml
+ $(DOCBOOK2DVI) $${dir}/$*.sgml
%.html: %.sgml
src=$(srcdir); \
dir=`(cd $${src}; pwd)`; \
mkdir html; \
- $(DOCBOOK)/db2html -o html $${dir}/$*.sgml
+ $(DOCBOOK2HTML) $${dir}/$*.sgml
# Now for some extra dependencies that the automatic rules will not
# catch:
diff --git a/example/Makefile.in b/example/Makefile.in
index 0949ece..ac0812b 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -36,8 +36,7 @@ POST_UNINSTALL = :
subdir = example
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -65,11 +64,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOARDS = @BOARDS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG = @CONFIG@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
@@ -77,7 +74,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOCBOOK = @DOCBOOK@
+DOCBOOK2DVI = @DOCBOOK2DVI@
+DOCBOOK2HTML = @DOCBOOK2HTML@
+DOCBOOK2PDF = @DOCBOOK2PDF@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -107,7 +106,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_STRIP = @ac_ct_STRIP@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 8422ef3..ac83da1 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -36,8 +36,7 @@ POST_UNINSTALL = :
subdir = testsuite
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -63,11 +62,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOARDS = @BOARDS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CONFIG = @CONFIG@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
@@ -75,7 +72,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOCBOOK = @DOCBOOK@
+DOCBOOK2DVI = @DOCBOOK2DVI@
+DOCBOOK2HTML = @DOCBOOK2HTML@
+DOCBOOK2PDF = @DOCBOOK2PDF@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -105,7 +104,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_STRIP = @ac_ct_STRIP@
diff --git a/testsuite/libdejagnu/Makefile.in b/testsuite/libdejagnu/Makefile.in
index 870d67b..f09a88d 100644
--- a/testsuite/libdejagnu/Makefile.in
+++ b/testsuite/libdejagnu/Makefile.in
@@ -39,8 +39,7 @@ check_PROGRAMS = unit$(EXEEXT)
subdir = testsuite/libdejagnu
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -73,11 +72,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOARDS = @BOARDS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = -I$(top_srcdir) -g
-CONFIG = @CONFIG@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
@@ -85,7 +82,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOCBOOK = @DOCBOOK@
+DOCBOOK2DVI = @DOCBOOK2DVI@
+DOCBOOK2HTML = @DOCBOOK2HTML@
+DOCBOOK2PDF = @DOCBOOK2PDF@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -115,7 +114,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_STRIP = @ac_ct_STRIP@
generated by cgit v1.1 at 2024-07-03 19:40:54 +0000