From 37f442f1d4479b09b0145c366ecba912c7a4aecc Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@googlemail.com>
Date: Wed, 5 Mar 2008 14:05:46 +0000
Subject: fix xdv2pdf build problem (ignore maintainer sections in makefile
 fragments)

git-svn-id: svn://tug.org/texlive/trunk@6862 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/texk/xdv2pdf/configure    | 7 ++++++-
 Build/source/texk/xdv2pdf/configure.in | 4 ++++
 Build/source/texk/xdv2pdf/xdv2pdf.cpp  | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'Build')

diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure
index 88b6022e879..0b984170946 100755
--- a/Build/source/texk/xdv2pdf/configure
+++ b/Build/source/texk/xdv2pdf/configure
@@ -651,6 +651,7 @@ build_alias
 host_alias
 target_alias
 VERSION
+MAINT
 CC
 CFLAGS
 LDFLAGS
@@ -1703,6 +1704,9 @@ _ACEOF
 ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
 
 
+MAINT='#'
+
+
 
 # Extra configure tests to support XeTeX
 
@@ -6142,6 +6146,7 @@ build_alias!$build_alias$ac_delim
 host_alias!$host_alias$ac_delim
 target_alias!$target_alias$ac_delim
 VERSION!$VERSION$ac_delim
+MAINT!$MAINT$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -6165,7 +6170,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/Build/source/texk/xdv2pdf/configure.in b/Build/source/texk/xdv2pdf/configure.in
index 06c91f38f34..fba685ff280 100644
--- a/Build/source/texk/xdv2pdf/configure.in
+++ b/Build/source/texk/xdv2pdf/configure.in
@@ -10,6 +10,10 @@ AC_DEFINE(PACKAGE, "xdv2pdf", [package name])
 
 AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
 
+dnl Disable maintainer portions of included makefile fragments
+MAINT='#'
+AC_SUBST(MAINT)  
+
 dnl First, check if we're configuring on Mac OS X -- can't build elsewhere
 
 sinclude(../web2c/xetexdir/tests.ac)
diff --git a/Build/source/texk/xdv2pdf/xdv2pdf.cpp b/Build/source/texk/xdv2pdf/xdv2pdf.cpp
index 277bfc0ff86..1e7f6e59231 100644
--- a/Build/source/texk/xdv2pdf/xdv2pdf.cpp
+++ b/Build/source/texk/xdv2pdf/xdv2pdf.cpp
@@ -1605,7 +1605,7 @@ doFontDef(FILE* xdv, int k)
 	const fontMapRec*	fr = getFontRec(nameStr);
 	if (fr != NULL) {
 		font.cgFont = fr->cgFont;
-		if (fr->cmap->size() > 0) {
+		if (fr->cmap != NULL && fr->cmap->size() > 0) {
 			if (font.charMap != NULL)
 				delete font.charMap;
 			font.charMap = fr->cmap;	// replacing map that was synthesized from the tfm coverage
-- 
cgit v1.2.3