From 4f4e6a2fa889a3a4f85fc1f3956a677146904cdd Mon Sep 17 00:00:00 2001 From: Bryce Denney Date: Fri, 13 Dec 2002 17:52:16 +0000 Subject: [PATCH] - add configure option --enable-docbook. If it is turned on, then during make install it will build the docbook documentation and install it into $(prefix)/share/doc/bochs. If it is not specified, then it will be enabled only if the program "docbook2html" is found in your path. - this completes [ 652957 ] install docbook docs instead of HTML Modified Files: Makefile.in configure configure.in doc/docbook/Makefile.in --- bochs/Makefile.in | 6 +-- bochs/configure | 81 ++++++++++++++++++++++++++++++++--- bochs/configure.in | 28 ++++++++++-- bochs/doc/docbook/Makefile.in | 9 ++-- 4 files changed, 108 insertions(+), 16 deletions(-) diff --git a/bochs/Makefile.in b/bochs/Makefile.in index 064d75257..465f43cd0 100644 --- a/bochs/Makefile.in +++ b/bochs/Makefile.in @@ -238,7 +238,7 @@ $(BX_OBJS): $(BX_INCLUDES) bxversion.h: $(RM) -f bxversion.h echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h - echo '// $$Id: Makefile.in,v 1.129 2002-12-13 17:13:20 bdenney Exp $$' >> bxversion.h + echo '// $$Id: Makefile.in,v 1.130 2002-12-13 17:47:21 bdenney Exp $$' >> bxversion.h echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h echo '// This file is generated by "make bxversion.h"' >> bxversion.h echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h @@ -336,7 +336,7 @@ install_win32: download_dlx # install target for unix ##################################################################### -install_unix: install_bin @INSTALL_PLUGINS_VAR@ install_man install_share install_doc +install_unix: install_bin @INSTALL_PLUGINS_VAR@ install_man install_share install_doc @INSTALL_DOCBOOK_VAR@ install_bin:: for i in $(DESTDIR)$(bindir); do mkdir -p $$i && test -d $$i && test -w $$i; done @@ -621,7 +621,7 @@ $(APP)/.build_plugins: $(APP)/.build bochs_plugins $(LIBTOOL) --finish $(STANDALONE_LIBDIR); touch $(APP)/.build_plugins -install_macosx: all download_dlx +install_macosx: all download_dlx @INSTALL_DOCBOOK_VAR@ -mkdir -p $(prefix) for i in $(INSTALL_LIST_MACOSX); do if test -e $$i; then $(CPMAC) -r $$i $(prefix); else $(CPMAC) -r $(srcdir)/$$i $(prefix); fi; done $(CPMAC) $(srcdir)/.bochsrc $(prefix)/bochsrc-sample.txt diff --git a/bochs/configure b/bochs/configure index 47e299405..9ca1d7c5a 100755 --- a/bochs/configure +++ b/bochs/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in,v 1.185 2002/12/12 19:43:40 vruppert Exp . +# From configure.in Id: configure.in,v 1.186 2002/12/13 16:20:34 bdenney Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -1047,6 +1047,7 @@ Optional Features: --enable-sb16=xxx Sound Blaster 16 Support (xxx=dummy|win|linux|freebsd) --enable-gdb-stub enable gdb stub support --enable-iodebug enable I/O interface to debugger + --enable-docbook build the Docbook documentation Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4205,7 +4206,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4208 "configure"' > conftest.$ac_ext + echo '#line 4209 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4755,7 +4756,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6586,7 +6587,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&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 -z "$ac_cv_path_DOCBOOK2HTML" && ac_cv_path_DOCBOOK2HTML="not_found" + ;; +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 + +echo "$as_me:$LINENO: checking whether to build docbook documentation" >&5 +echo $ECHO_N "checking whether to build docbook documentation... $ECHO_C" >&6 +build_docbook=0 +# Check whether --enable-docbook or --disable-docbook was given. +if test "${enable_docbook+set}" = set; then + enableval="$enable_docbook" + + if test "$enableval" = yes; then build_docbook=1; fi + +else + + if test "$DOCBOOK2HTML" != not_found; then build_docbook=1; fi + + +fi; + +if test $build_docbook = 1; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + INSTALL_DOCBOOK_VAR=install_docbook +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + PRIMARY_TARGET='bochs' PLUGIN_LIBNAME_TRANSFORMATION='%.o=libbx_%.la' @@ -23223,6 +23290,8 @@ s,@SB16_OBJS@,$SB16_OBJS,;t t s,@SOUNDLOW_OBJS@,$SOUNDLOW_OBJS,;t t s,@GDBSTUB_VAR@,$GDBSTUB_VAR,;t t s,@IODEBUG_OBJS@,$IODEBUG_OBJS,;t t +s,@DOCBOOK2HTML@,$DOCBOOK2HTML,;t t +s,@INSTALL_DOCBOOK_VAR@,$INSTALL_DOCBOOK_VAR,;t t s,@IODEV_LIB_VAR@,$IODEV_LIB_VAR,;t t s,@EXTRA_BX_OBJS@,$EXTRA_BX_OBJS,;t t s,@NONINLINE_VAR@,$NONINLINE_VAR,;t t diff --git a/bochs/configure.in b/bochs/configure.in index 502c4f969..4c5716c9d 100644 --- a/bochs/configure.in +++ b/bochs/configure.in @@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) AC_INIT(bochs.h) -AC_REVISION([[$Id: configure.in,v 1.187 2002-12-13 17:39:03 bdenney Exp $]]) +AC_REVISION([[$Id: configure.in,v 1.188 2002-12-13 17:52:09 bdenney Exp $]]) AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(ltdlconf.h) @@ -446,7 +446,7 @@ AC_CHECK_HEADER(assert.h, AC_DEFINE(HAVE_ASSERT_H, 1)) AC_MSG_CHECKING(for plugins support) AC_ARG_ENABLE(plugins, - [ --enable-plugins enable plugins], + [ --enable-plugins enable plugins], [if test "$enableval" = yes; then bx_plugins=1 else @@ -1506,6 +1506,28 @@ AC_ARG_ENABLE(iodebug, AC_SUBST(IODEBUG_OBJS) +AC_PATH_PROG(DOCBOOK2HTML, docbook2html, not_found) +AC_MSG_CHECKING(whether to build docbook documentation) +build_docbook=0 +AC_ARG_ENABLE(docbook, + [ --enable-docbook build the Docbook documentation], + [ + if test "$enableval" = yes; then build_docbook=1; fi + ], + [ + dnl Not specified. If they have docbook2html, then yes. + if test "$DOCBOOK2HTML" != not_found; then build_docbook=1; fi + ] + ) + +if test $build_docbook = 1; then + AC_MSG_RESULT(yes) + INSTALL_DOCBOOK_VAR=install_docbook +else + AC_MSG_RESULT(no) +fi +AC_SUBST(INSTALL_DOCBOOK_VAR) +AC_SUBST(DOCBOOK2HTML) PRIMARY_TARGET='bochs' PLUGIN_LIBNAME_TRANSFORMATION='%.o=libbx_%.la' @@ -1568,7 +1590,7 @@ AC_ARG_WITH(sdl, ) AC_ARG_WITH(svga, - [ --with-svga use SVGALib libraries], + [ --with-svga use SVGALib libraries], ) AC_ARG_WITH(wx, diff --git a/bochs/doc/docbook/Makefile.in b/bochs/doc/docbook/Makefile.in index 7ca81dc6c..96d2ad010 100644 --- a/bochs/doc/docbook/Makefile.in +++ b/bochs/doc/docbook/Makefile.in @@ -1,6 +1,6 @@ ################################################################### # doc/docbook/Makefile -# $Id: Makefile.in,v 1.2 2002-12-13 17:20:27 bdenney Exp $ +# $Id: Makefile.in,v 1.3 2002-12-13 17:52:16 bdenney Exp $ # # Builds documentation in various formats from SGML source, and # allows easy update to the Bochs web site. @@ -9,6 +9,7 @@ prefix = @prefix@ docdir = $(prefix)/share/doc/bochs +DOCBOOK2HTML = @DOCBOOK2HTML@ # name of the major documentation sections SECTIONS=user documentation development @@ -34,11 +35,11 @@ SSH=ssh -x all: $(SECTION_HTML) user/book1.html: user/user.dbk - cd user; docbook2html user.dbk + cd user; $(DOCBOOK2HTML) user.dbk documentation/book1.html: documentation/documentation.dbk - cd documentation; docbook2html documentation.dbk + cd documentation; $(DOCBOOK2HTML) documentation.dbk development/book1.html: development/development.dbk - cd development; docbook2html development.dbk + cd development; $(DOCBOOK2HTML) development.dbk fixperm:: # fix permissions locally so that tar will install things right