Made PDF generation work again (at least on trebuchet)

2001-05-15 18:07:16 +00:00
parent 60084a1a5a
commit f9f9c47053
5 changed files with 98 additions and 52 deletions
--- a/80
+++ b/80
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-# From configure.in Revision: 1.252 
+# From configure.in Revision: 1.253 

 ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
 ## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
@@ -5197,24 +5197,24 @@ test -n "$OPENJADE" || OPENJADE="openjade"


 #
-# Look for tex & pdftex.
+# Look for TeX.
 #

-for ac_prog in tex
+for ac_prog in jadetex
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:5209: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_TEX'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_JADETEX'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$TEX" in
+  case "$JADETEX" in
  /*)
-  ac_cv_path_TEX="$TEX" # Let the user override the test with a path.
+  ac_cv_path_JADETEX="$JADETEX" # Let the user override the test with a path.
  ;;
  ?:/*)			 
-  ac_cv_path_TEX="$TEX" # Let the user override the test with a dos path.
+  ac_cv_path_JADETEX="$JADETEX" # Let the user override the test with a dos path.
  ;;
  *)
  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
@@ -5222,7 +5222,7 @@ else
  for ac_dir in $ac_dummy; do 
    test -z "$ac_dir" && ac_dir=.
    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_TEX="$ac_dir/$ac_word"
+      ac_cv_path_JADETEX="$ac_dir/$ac_word"
      break
    fi
  done
@@ -5230,34 +5230,34 @@ else
  ;;
 esac
 fi
-TEX="$ac_cv_path_TEX"
-if test -n "$TEX"; then
-  echo "$ac_t""$TEX" 1>&6
+JADETEX="$ac_cv_path_JADETEX"
+if test -n "$JADETEX"; then
+  echo "$ac_t""$JADETEX" 1>&6
 else
  echo "$ac_t""no" 1>&6
 fi

-test -n "$TEX" && break
+test -n "$JADETEX" && break
 done
-test -n "$TEX" || TEX="tex"
+test -n "$JADETEX" || JADETEX="jadetex"



-for ac_prog in pdftex
+for ac_prog in pdfjadetex
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:5252: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PDFTEX'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_PDFJADETEX'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$PDFTEX" in
+  case "$PDFJADETEX" in
  /*)
-  ac_cv_path_PDFTEX="$PDFTEX" # Let the user override the test with a path.
+  ac_cv_path_PDFJADETEX="$PDFJADETEX" # Let the user override the test with a path.
  ;;
  ?:/*)			 
-  ac_cv_path_PDFTEX="$PDFTEX" # Let the user override the test with a dos path.
+  ac_cv_path_PDFJADETEX="$PDFJADETEX" # Let the user override the test with a dos path.
  ;;
  *)
  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
@@ -5265,7 +5265,7 @@ else
  for ac_dir in $ac_dummy; do 
    test -z "$ac_dir" && ac_dir=.
    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PDFTEX="$ac_dir/$ac_word"
+      ac_cv_path_PDFJADETEX="$ac_dir/$ac_word"
      break
    fi
  done
@@ -5273,16 +5273,16 @@ else
  ;;
 esac
 fi
-PDFTEX="$ac_cv_path_PDFTEX"
-if test -n "$PDFTEX"; then
-  echo "$ac_t""$PDFTEX" 1>&6
+PDFJADETEX="$ac_cv_path_PDFJADETEX"
+if test -n "$PDFJADETEX"; then
+  echo "$ac_t""$PDFJADETEX" 1>&6
 else
  echo "$ac_t""no" 1>&6
 fi

-test -n "$PDFTEX" && break
+test -n "$PDFJADETEX" && break
 done
-test -n "$PDFTEX" || PDFTEX="pdftex"
+test -n "$PDFJADETEX" || PDFJADETEX="pdfjadetex"



@@ -5338,12 +5338,35 @@ then
 fi


+PRINTSTYLE=""
+echo $ac_n "checking for print/docbook.dsl""... $ac_c" 1>&6
+echo "configure:5344: checking for print/docbook.dsl" >&5
+for d in /usr/pkg/share/sgml /usr/local/share/sgml
+do
+	for s in docbook/dsssl/modular dsssl/docbook
+	do
+		f=$d/$s/print/docbook.dsl
+		if test -f $f
+		then
+			PRINTSTYLE=$f
+			echo "$ac_t""$f" 1>&6
+			break
+		fi
+	done
+done
+if test "X$PRINTSTYLE" = "X"
+then
+	echo "$ac_t"""not found"" 1>&6;
+	PRINTSTYLE=docbook.dsl
+fi
+
+
 #
 # Look for XML declarations
 #
 XMLDCL=""
 echo $ac_n "checking for xml.dcl""... $ac_c" 1>&6
-echo "configure:5347: checking for xml.dcl" >&5
+echo "configure:5370: checking for xml.dcl" >&5
 for d in /usr/pkg/share/sgml /usr/local/share/sgml
 do
 	f=$d/docbook/dsssl/modular/dtds/decls/xml.dcl
@@ -5366,7 +5389,7 @@ fi
 #

 echo $ac_n "checking for docbook2X""... $ac_c" 1>&6
-echo "configure:5370: checking for docbook2X" >&5
+echo "configure:5393: checking for docbook2X" >&5
 DOCBOOK2X=""
 for d in /usr/pkg/share/sgml /usr/local/share/sgml
 do
@@ -5734,10 +5757,11 @@ s%@ISC_PLATFORM_QUADFORMAT@%$ISC_PLATFORM_QUADFORMAT%g
 s%@ISC_PLATFORM_RLIMITTYPE@%$ISC_PLATFORM_RLIMITTYPE%g
 s%@ISC_PLATFORM_BRACEPTHREADONCEINIT@%$ISC_PLATFORM_BRACEPTHREADONCEINIT%g
 s%@OPENJADE@%$OPENJADE%g
-s%@TEX@%$TEX%g
-s%@PDFTEX@%$PDFTEX%g
+s%@JADETEX@%$JADETEX%g
+s%@PDFJADETEX@%$PDFJADETEX%g
 s%@SGMLCATALOG@%$SGMLCATALOG%g
 s%@HTMLSTYLE@%$HTMLSTYLE%g
+s%@PRINTSTYLE@%$PRINTSTYLE%g
 s%@XMLDCL@%$XMLDCL%g
 s%@DOCBOOK2X@%$DOCBOOK2X%g
 s%@BIND9_TOP_BUILDDIR@%$BIND9_TOP_BUILDDIR%g
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl

-AC_REVISION($Revision: 1.253 $)
+AC_REVISION($Revision: 1.254 $)

 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -1409,14 +1409,14 @@ AC_PATH_PROGS(OPENJADE, openjade, openjade)
 AC_SUBST(OPENJADE)

 #
-# Look for tex & pdftex.
+# Look for TeX.
 #

-AC_PATH_PROGS(TEX, tex, tex)
-AC_SUBST(TEX)
+AC_PATH_PROGS(JADETEX, jadetex, jadetex)
+AC_SUBST(JADETEX)

-AC_PATH_PROGS(PDFTEX, pdftex, pdftex)
-AC_SUBST(PDFTEX)
+AC_PATH_PROGS(PDFJADETEX, pdfjadetex, pdfjadetex)
+AC_SUBST(PDFJADETEX)

 AC_MSG_CHECKING(for SGML catalog)
 for d in /usr/pkg/share/sgml /usr/local/share/sgml
@@ -1468,6 +1468,28 @@ then
 fi
 AC_SUBST(HTMLSTYLE)

+PRINTSTYLE=""
+AC_MSG_CHECKING(for print/docbook.dsl)
+for d in /usr/pkg/share/sgml /usr/local/share/sgml
+do
+	for s in docbook/dsssl/modular dsssl/docbook
+	do
+		f=$d/$s/print/docbook.dsl
+		if test -f $f
+		then
+			PRINTSTYLE=$f
+			AC_MSG_RESULT($f)
+			break
+		fi
+	done
+done
+if test "X$PRINTSTYLE" = "X"
+then
+	AC_MSG_RESULT("not found");
+	PRINTSTYLE=docbook.dsl
+fi
+AC_SUBST(PRINTSTYLE)
+
 #
 # Look for XML declarations
 #
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-# $Id: Makefile.in,v 1.5 2001/05/15 17:33:29 gson Exp $
+# $Id: Makefile.in,v 1.6 2001/05/15 18:07:15 gson Exp $

 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -39,24 +39,21 @@ Bv9ARM.html: Bv9ARM-book.xml
 	    -d ./nominum-docbook-html.dsl \
 	    ${XMLDCL} ./Bv9ARM-book.xml

-Bv9ARM-book.dvi: Bv9ARM-book.pdf
+Bv9ARM-book.tex: Bv9ARM-book.xml
 	${OPENJADE} -v \
+	     -c ${SGMLCATALOG} \
 	     -d ./nominum-docbook-print.dsl \
 	     -t tex \
 	     ${XMLDCL} ./Bv9ARM-book.xml
-	rm Bv9ARM-book.aux Bv9ARM-book.dvi Bv9ARM-book.log
-	@TEX@ "&jadetex" ./Bv9ARM-book.tex
-	@TEX@ "&jadetex" ./Bv9ARM-book.tex
-	@TEX@ "&jadetex" ./Bv9ARM-book.tex

-Bv9ARM-book.pdf: Bv9ARM-book.xml
-	${OPENJADE} -v \
-	    -c @SGMLDIR@/catalog \
-	    -d ./nominum-docbook-print.dsl \
-	    -t tex \
-	    ${XMLDCL} ./Bv9ARM-book.xml
-	rm Bv9ARM-book.aux Bv9ARM-book.pdf Bv9ARM-book.log
-	@PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex
-	@PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex
-	@PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex
+Bv9ARM-book.dvi: Bv9ARM-book.tex
+	rm -f Bv9ARM-book.aux Bv9ARM-book.dvi Bv9ARM-book.log
+	${JADETEX} ./Bv9ARM-book.tex || true
+	${JADETEX} ./Bv9ARM-book.tex || true
+	${JADETEX} ./Bv9ARM-book.tex || true

+Bv9ARM-book.pdf: Bv9ARM-book.tex
+	rm -f Bv9ARM-book.aux Bv9ARM-book.pdf Bv9ARM-book.log
+	${PDFJADETEX} ./Bv9ARM-book.tex || true
+	${PDFJADETEX} ./Bv9ARM-book.tex || true
+	${PDFJADETEX} ./Bv9ARM-book.tex || true
--- a/doc/arm/nominum-docbook-print.dsl.in
+++ b/doc/arm/nominum-docbook-print.dsl.in
@@ -1,5 +1,5 @@
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY dbstyle SYSTEM "@SGMLDIR@/docbook/dsssl/modular/print/docbook.dsl" CDATA DSSSL>
+<!ENTITY dbstyle SYSTEM "@PRINTSTYLE@" CDATA DSSSL>
 ]>


--- a/make/rules.in
+++ b/make/rules.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-# $Id: rules.in,v 1.34 2001/05/15 17:33:32 gson Exp $
+# $Id: rules.in,v 1.35 2001/05/15 18:07:13 gson Exp $

 ###
 ### Common Makefile rules for BIND 9.
@@ -184,6 +184,9 @@ SGMLCATALOG = @SGMLCATALOG@
 HTMLSTYLE = @HTMLSTYLE@
 XMLDCL = @XMLDCL@
 DOCBOOK2X = @DOCBOOK2X@
+JADETEX = @JADETEX@
+PDFJADETEX = @PDFJADETEX@
+
 ONSGMLS = onsgmls
 SGMLSPL = sgmlspl