* configure.ac (DOCBOOK2X_TEXI): Add search for this program.

	* configure: Regenerate.
	* Makefile.am (DOCBOOK2PDF, DOCBOOK2RTF, DOCBOOK2PS): New.
	(DOCBOOK2HTML, DOCBOOK2X_TEXI): Likewise.
	(dejagnu.pdf): Use $(DOCBOOK2PDF).
	(dejagnu.ps): Likewise, use $(DOCBOOK2PS).
	(dejagnu.rtf): Likewise, use $(DOCBOOK2RTF).
	(html): Likewise, use $(DOCBOOK2HTML).
	(doc/dejagnu.texi): Produce using the docbook2x-texi wrapper,
	which is much simpler. Likewise, use $(DOCBOOK2X_TEXI).
	* Makefile.in: Regenerate.

5 files changed, 82 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index ac7fb96..0833f58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2005-12-24  Ben Elliston  <bje@gnu.org>
 
+	* configure.ac (DOCBOOK2X_TEXI): Add search for this program.
+	* configure: Regenerate.
+	* Makefile.am (DOCBOOK2PDF, DOCBOOK2RTF, DOCBOOK2PS): New.
+	(DOCBOOK2HTML, DOCBOOK2X_TEXI): Likewise.
+	(dejagnu.pdf): Use $(DOCBOOK2PDF).
+	(dejagnu.ps): Likewise, use $(DOCBOOK2PS).
+	(dejagnu.rtf): Likewise, use $(DOCBOOK2RTF).
+	(html): Likewise, use $(DOCBOOK2HTML).
+	(doc/dejagnu.texi): Produce using the docbook2x-texi wrapper,
+	which is much simpler. Likewise, use $(DOCBOOK2X_TEXI).
+	* Makefile.in: Regenerate.
+
+2005-12-24  Ben Elliston  <bje@gnu.org>
+
 	* Makefile.am (EXTRA_DIST): Remove $(PACKAGING_METAFILES).
 	(XML): Remove $(srcdir) from each filename; VPATH suffices.
 	(PACKAGING_METAFILES): Remove.
diff --git a/Makefile.am b/Makefile.am
index d3faaef..1d91053 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,25 +199,28 @@ unit_SOURCES = testsuite/libdejagnu/unit.cc
 dist_man_MANS = doc/runtest.1
 info_TEXINFOS = doc/dejagnu.texi
 
+DOCBOOK2PDF = @DOCBOOK2PDF@
+DOCBOOK2RTF= = @DOCBOOK2RTF@
+DOCBOOK2PS = @DOCBOOK2PS@
+DOCBOOK2HTML = @DOCBOOK2HTML@
+DOCBOOK2X_TEXI = @DOCBOOK2X_TEXI@
+
 XML = doc/dejagnu.xml doc/legal.xml doc/ref.xml doc/user.xml
 
 dejagnu.pdf: $(XML)
-	docbook2pdf $(srcdir)/doc/dejagnu.xml
+	$(DOCBOOK2PDF) $(srcdir)/doc/dejagnu.xml
 
 dejagnu.ps: $(XML)
-	docbook2ps $(srcdir)/doc/dejagnu.xml
+	$(DOCBOOK2PS) $(srcdir)/doc/dejagnu.xml
 
 dejagnu.rtf: $(XML)
-	docbook2rtf $(srcdir)/doc/dejagnu.xml
+	$(DOCBOOK2RTF) $(srcdir)/doc/dejagnu.xml
 
 html:
-	docbook2html -o html $(srcdir)/doc/dejagnu.xml
+	$(DOCBOOK2HTML) -o html $(srcdir)/doc/dejagnu.xml
 
 doc/dejagnu.texi: $(XML)
-	db2x_xsltproc -s texi $(srcdir)/doc/dejagnu.xml -o dejagnu.txml
-	db2x_texixml dejagnu.txml
-	mv dejagnu.texi $(srcdir)/doc
-	rm dejagnu.txml
+	$(DOCBOOK2X_TEXI) $(srcdir)/doc/dejagnu.xml --to-stdout > $(srcdir)/$@
 
 # Packaging.
 
diff --git a/Makefile.in b/Makefile.in
index e721373..645912e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,7 +80,7 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 SOURCES = $(unit_SOURCES)
 DIST_SOURCES = $(unit_SOURCES)
 am__dirstamp = $(am__leading_dot)dirstamp
-INFO_DEPS = $(srcdir)/doc/dejagnu.info
+INFO_DEPS = $(srcdir)/doc/untitled.info
 am__TEXINFO_TEX_DIR = $(srcdir)
 DVIS = doc/dejagnu.dvi
 PDFS = doc/dejagnu.pdf
@@ -142,7 +142,8 @@ DEPDIR = @DEPDIR@
 DOCBOOK2HTML = @DOCBOOK2HTML@
 DOCBOOK2PDF = @DOCBOOK2PDF@
 DOCBOOK2PS = @DOCBOOK2PS@
-DOCBOOK2RTF = @DOCBOOK2RTF@
+DOCBOOK2RTF = = @DOCBOOK2RTF@
+DOCBOOK2X_TEXI = @DOCBOOK2X_TEXI@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -578,7 +579,7 @@ doc/$(am__dirstamp):
 	@$(mkdir_p) doc
 	@: > doc/$(am__dirstamp)
 
-$(srcdir)/doc/dejagnu.info: doc/dejagnu.texi 
+$(srcdir)/doc/untitled.info: doc/dejagnu.texi 
 	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && cd $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
@@ -600,17 +601,17 @@ $(srcdir)/doc/dejagnu.info: doc/dejagnu.texi
 	fi; \
 	rm -rf $$backupdir; exit $$rc
 
-doc/dejagnu.dvi: doc/dejagnu.texi  doc/$(am__dirstamp)
+doc/untitled.dvi: doc/dejagnu.texi  doc/$(am__dirstamp)
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
 	$(TEXI2DVI) -o $@ `test -f 'doc/dejagnu.texi' || echo '$(srcdir)/'`doc/dejagnu.texi
 
-doc/dejagnu.pdf: doc/dejagnu.texi  doc/$(am__dirstamp)
+doc/untitled.pdf: doc/dejagnu.texi  doc/$(am__dirstamp)
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
 	$(TEXI2PDF) -o $@ `test -f 'doc/dejagnu.texi' || echo '$(srcdir)/'`doc/dejagnu.texi
 
-doc/dejagnu.html: doc/dejagnu.texi  doc/$(am__dirstamp)
+doc/untitled.html: doc/dejagnu.texi  doc/$(am__dirstamp)
 	rm -rf $(@:.html=.htp)
 	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
 	 -o $(@:.html=.htp) `test -f 'doc/dejagnu.texi' || echo '$(srcdir)/'`doc/dejagnu.texi; \
@@ -668,8 +669,8 @@ mostlyclean-aminfo:
 	-rm -rf dejagnu.aux dejagnu.cp dejagnu.cps dejagnu.fn dejagnu.fns dejagnu.ky \
 	  dejagnu.kys dejagnu.log dejagnu.pg dejagnu.pgs dejagnu.tmp \
 	  dejagnu.toc dejagnu.tp dejagnu.tps dejagnu.vr dejagnu.vrs \
-	  doc/dejagnu.dvi doc/dejagnu.pdf doc/dejagnu.ps \
-	  doc/dejagnu.html
+	  doc/untitled.dvi doc/untitled.pdf doc/untitled.ps \
+	  doc/untitled.html
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -1151,22 +1152,19 @@ uninstall-man: uninstall-man1
 
 
 dejagnu.pdf: $(XML)
-	docbook2pdf $(srcdir)/doc/dejagnu.xml
+	$(DOCBOOK2PDF) $(srcdir)/doc/dejagnu.xml
 
 dejagnu.ps: $(XML)
-	docbook2ps $(srcdir)/doc/dejagnu.xml
+	$(DOCBOOK2PS) $(srcdir)/doc/dejagnu.xml
 
 dejagnu.rtf: $(XML)
-	docbook2rtf $(srcdir)/doc/dejagnu.xml
+	$(DOCBOOK2RTF) $(srcdir)/doc/dejagnu.xml
 
 html:
-	docbook2html -o html $(srcdir)/doc/dejagnu.xml
+	$(DOCBOOK2HTML) -o html $(srcdir)/doc/dejagnu.xml
 
 doc/dejagnu.texi: $(XML)
-	db2x_xsltproc -s texi $(srcdir)/doc/dejagnu.xml -o dejagnu.txml
-	db2x_texixml dejagnu.txml
-	mv dejagnu.texi $(srcdir)/doc
-	rm dejagnu.txml
+	$(DOCBOOK2X_TEXI) $(srcdir)/doc/dejagnu.xml --to-stdout > $(srcdir)/$@
 
 # Packaging.
 
diff --git a/configure b/configure
index 3d3c447..93456af 100755
--- a/configure
+++ b/configure
@@ -274,7 +274,7 @@ PACKAGE_STRING='GNU DejaGnu 1.4.4'
 PACKAGE_BUGREPORT='bug-dejagnu@gnu.org'
 
 ac_subdirs_all="$ac_subdirs_all example/calc example/hello example/mathhelper"
-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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 DOCBOOK2HTML DOCBOOK2RTF DOCBOOK2PDF DOCBOOK2PS EXPECT 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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 DOCBOOK2HTML DOCBOOK2RTF DOCBOOK2PDF DOCBOOK2PS DOCBOOK2X_TEXI EXPECT subdirs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3570,6 +3570,46 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+# Extract the first word of "docbook2x-texi", so it can be a program name with args.
+set dummy docbook2x-texi; 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_DOCBOOK2X_TEXI+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $DOCBOOK2X_TEXI in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DOCBOOK2X_TEXI="$DOCBOOK2X_TEXI" # 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_DOCBOOK2X_TEXI="$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_DOCBOOK2X_TEXI" && ac_cv_path_DOCBOOK2X_TEXI="false"
+  ;;
+esac
+fi
+DOCBOOK2X_TEXI=$ac_cv_path_DOCBOOK2X_TEXI
+
+if test -n "$DOCBOOK2X_TEXI"; then
+  echo "$as_me:$LINENO: result: $DOCBOOK2X_TEXI" >&5
+echo "${ECHO_T}$DOCBOOK2X_TEXI" >&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.
 set dummy expect; ac_word=$2
@@ -4368,6 +4408,7 @@ s,@DOCBOOK2HTML@,$DOCBOOK2HTML,;t t
 s,@DOCBOOK2RTF@,$DOCBOOK2RTF,;t t
 s,@DOCBOOK2PDF@,$DOCBOOK2PDF,;t t
 s,@DOCBOOK2PS@,$DOCBOOK2PS,;t t
+s,@DOCBOOK2X_TEXI@,$DOCBOOK2X_TEXI,;t t
 s,@EXPECT@,$EXPECT,;t t
 s,@subdirs@,$subdirs,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
diff --git a/configure.ac b/configure.ac
index 64e50ed..21950ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ AC_PATH_PROG([DOCBOOK2HTML], [docbook2html], [false])
 AC_PATH_PROG([DOCBOOK2RTF], [docbook2rtf], [false])
 AC_PATH_PROG([DOCBOOK2PDF], [docbook2pdf], [false])
 AC_PATH_PROG([DOCBOOK2PS], [docbook2ps], [false])
+AC_PATH_PROG([DOCBOOK2X_TEXI], [docbook2x-texi], [false])
 
 dnl Search for expect.
 AC_PATH_PROG([EXPECT], [expect])