patch -p1 < $SOURCE_CACHE/$SOURCE2 &&
default_build
diff --git a/doc/xpdf/CONFIGURE b/doc/xpdf/CONFIGURE
index 5d72f41..2bbea44 100755
--- a/doc/xpdf/CONFIGURE
+++ b/doc/xpdf/CONFIGURE
@@ -1,7 +1,4 @@
-if ! grep -q OPTS $SPELL_CONFIG; then
- if query "Use A4 as default paper size instead of Letter for Postscript
output?" n
- then OPTS="--enable-a4-paper"
- else OPTS=""
- fi
- echo "OPTS=$OPTS" >> $SPELL_CONFIG
-fi
+config_query_option A4_PAPER \
+"Use A4 as default paper size instead of Letter for Postscript output?" n \
+"--enable-a4-paper" \
+""
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index ff77e55..7a1dd4b 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,8 @@
+2006-07-09 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE: Replaced $SPELL_OPTION hack for paper size
+ selection with config_query_option A4_PAPER, bug #11897.
+ * BUILD: Append $OPTS with $A4_PAPER, removed exports.
+
2006-03-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: added dependency on ghostscript-fonts-std, doesn't display
any text if those fonts aren't installed
[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (55991b92a9fd4865aaf0139dfb846f1107acccae),
Juuso Alasuutari, 07/09/2006