Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (55991b92a9fd4865aaf0139dfb846f1107acccae)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (55991b92a9fd4865aaf0139dfb846f1107acccae)
  • Date: Sun, 9 Jul 2006 06:37:24 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

doc/xpdf/BUILD | 9 ++++-----
doc/xpdf/CONFIGURE | 11 ++++-------
doc/xpdf/HISTORY | 5 +++++
3 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 55991b92a9fd4865aaf0139dfb846f1107acccae
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

Fix bug #11897.

diff --git a/doc/xpdf/BUILD b/doc/xpdf/BUILD
index c25aabd..b5b4a7a 100755
--- a/doc/xpdf/BUILD
+++ b/doc/xpdf/BUILD
@@ -1,8 +1,7 @@
-export CFLAGS="$CFLAGS -I/usr/include/freetype2"
-export CXXFLAGS="$CFLAGS"
-export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-
-export OPTS="$OPTS --enable-multithreaded"
+CFLAGS="$CFLAGS -I/usr/include/freetype2"
+CXXFLAGS="$CFLAGS"
+CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
+OPTS="$OPTS --enable-multithreaded $A4_PAPER"

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

Archive powered by MHonArc 2.6.24.

Top of Page