From: Tristan Chabredier <wwp@claws-mail.org>
Date: Wed, 5 Jul 2006 07:26:26 +0000 (+0000)
Subject: 2006-07-05 [wwp]	2.3.1cvs59
X-Git-Tag: rel_2_4_0~39
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=2909c661cf376f245c3d39f6f52640084c89641a;ds=inline

2006-07-05 [wwp]	2.3.1cvs59

	* manual/xml2pdf
		use JAVA and SAXON (or SAXONJAR) env. vars is there's defined.
---

diff --git a/ChangeLog b/ChangeLog
index 19b669510..801d8e797 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-05 [wwp]	2.3.1cvs59
+
+	* manual/xml2pdf
+		use JAVA and SAXON (or SAXONJAR) env. vars is there's defined.
+
 2006-07-04 [colin]	2.3.1cvs58
 
 	* src/mimeview.c
diff --git a/PATCHSETS b/PATCHSETS
index 2bf830840..1b69c11a6 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1659,3 +1659,4 @@
 ( cvs diff -u -r 1.83.2.73 -r 1.83.2.74 src/mimeview.c;  cvs diff -u -r 1.20.2.9 -r 1.20.2.10 src/mimeview.h;  cvs diff -u -r 1.96.2.119 -r 1.96.2.120 src/textview.c;  ) > 2.3.1cvs56.patchset
 ( cvs diff -u -r 1.274.2.122 -r 1.274.2.123 src/mainwindow.c;  cvs diff -u -r 1.101.2.27 -r 1.101.2.28 src/news.c;  ) > 2.3.1cvs57.patchset
 ( cvs diff -u -r 1.83.2.74 -r 1.83.2.75 src/mimeview.c;  cvs diff -u -r 1.96.2.120 -r 1.96.2.121 src/textview.c;  cvs diff -u -r 1.36.2.70 -r 1.36.2.71 src/common/utils.c;  ) > 2.3.1cvs58.patchset
+( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/xml2pdf;  ) > 2.3.1cvs59.patchset
diff --git a/configure.ac b/configure.ac
index 998f57be2..3268fbf21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=58
+EXTRA_VERSION=59
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/manual/xml2pdf b/manual/xml2pdf
index 5830c5bba..be4218f95 100644
--- a/manual/xml2pdf
+++ b/manual/xml2pdf
@@ -10,28 +10,29 @@ then
 	exit 1
 fi
 
-JAVA=`which java`
-if [ "$JAVA" = "" ]
-then
+test -z "$JAVA" && \
+	JAVA=`which java`
+test -z "$JAVA" && \
 	JAVA="$JAVA_HOME/bin/java"
-fi
 if [ ! -x "$JAVA" ]
 then
-	echo 'error: java not found in your $PATH or in $JAVA_HOME/bin' \
-		&& exit 1
+	echo 'error: java not found in your $PATH or in $JAVA_HOME/bin'
+	exit 1
 fi
 
-SAXON=`which saxon`
-if [ "$SAXON" = "" ]
+test -z "$SAXON" && \
+	SAXON=`which saxon`
+if [ -z "$SAXON" ]
 then
-	SAXONJAR='/usr/share/java/saxon.jar'
-	if [ ! -f $SAXONJAR ]
+	test -z "$SAXONJAR" && \
+		SAXONJAR='/usr/share/java/saxon.jar'
+	if [ ! -f "$SAXONJAR" ]
 	then
 		SAXONJAR='/usr/local/share/java/saxon.jar'
-		if [ ! -f $SAXONJAR ]
+		if [ ! -f "$SAXONJAR" ]
 		then
-			echo "error: neither saxon nor saxon.jar were found" \
-				&& exit 1
+			echo "error: neither saxon nor saxon.jar were found"
+			exit 1
 		fi
 	fi
 	SAXON="$JAVA -jar $SAXONJAR"