sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (16f7c8e125ff80a6c5e8c79bb181fb6300922601)

From: Remko van der Vossen <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (16f7c8e125ff80a6c5e8c79bb181fb6300922601)
Date: Fri, 29 Jul 2011 13:17:07 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

http/w3m/BUILD | 4 +++-
http/w3m/CONFIGURE | 18 +++++++++++-------
http/w3m/DEPENDS | 8 ++++++--
http/w3m/HISTORY | 3 +++
4 files changed, 23 insertions(+), 10 deletions(-)

New commits:
commit 16f7c8e125ff80a6c5e8c79bb181fb6300922601
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

w3m: enable compilation without image support

diff --git a/http/w3m/BUILD b/http/w3m/BUILD
index 16adf5e..d5c9f0d 100755
--- a/http/w3m/BUILD
+++ b/http/w3m/BUILD
@@ -1,4 +1,6 @@
-if ! list_find "$W3M_INLINE_IMAGE" "AUTO" ; then
+if list_find "$W3M_INLINE_IMAGE" "NONE" ; then
+ OPTS="--enable-image=no $OPTS"
+elif ! list_find "$W3M_INLINE_IMAGE" "AUTO" ; then
W3M_INLINE_IMAGE="$(echo $W3M_INLINE_IMAGE | tr " " ",")" &&
OPTS="--enable-image=$W3M_INLINE_IMAGE $OPTS"
fi &&
diff --git a/http/w3m/CONFIGURE b/http/w3m/CONFIGURE
index c263ada..84684c6 100755
--- a/http/w3m/CONFIGURE
+++ b/http/w3m/CONFIGURE
@@ -4,19 +4,23 @@ config_query_list W3M_TERM_LIB \
"Which terminal library do you want?" \
ncurses \
termcap &&
-config_query_list W3M_IMAGE_LIB \
- "Which image library do you want?" \
- imlib2 \
- imlib \
- gtk2 \
- gdk-pixbuf &&
-
config_query_multi W3M_INLINE_IMAGE \
"Enable inline image handlers" \
AUTO \
+ NONE \
x11 \
fb \
fb+s &&
+
+if ! list_find "$W3M_INLINE_IMAGE" "NONE" ; then
+ config_query_list W3M_IMAGE_LIB \
+ "Which image library do you want?" \
+ imlib2 \
+ imlib \
+ gtk2 \
+ gdk-pixbuf
+fi &&
+
config_query_string W3M_EDITOR \
"Default editor command" \
"$EDITOR" &&
diff --git a/http/w3m/DEPENDS b/http/w3m/DEPENDS
index c078bed..7c2f541 100755
--- a/http/w3m/DEPENDS
+++ b/http/w3m/DEPENDS
@@ -1,7 +1,11 @@
depends $W3M_TERM_LIB \
"--with-termlib=$W3M_TERM_LIB" &&
-depends ${W3M_IMAGE_LIB/gtk2/gtk+2} \
- "--with-imagelib=${W3M_IMAGE_LIB/gtk2/gtk+2}" &&
+
+if ! list_find "$W3M_INLINE_IMAGE" "NONE" ; then
+ depends ${W3M_IMAGE_LIB/gtk2/gtk+2} \
+ "--with-imagelib=${W3M_IMAGE_LIB/gtk2/gtk+2}"
+fi &&
+
depends libgc \
"--with-gc=/usr" &&

diff --git a/http/w3m/HISTORY b/http/w3m/HISTORY
index 507e3c3..292c5fb 100644
--- a/http/w3m/HISTORY
+++ b/http/w3m/HISTORY
@@ -1,3 +1,6 @@
+2011-07-26 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFIGURE, DEPENDS, BUILD: enable compilation without image support
+
2011-04-09 Justin Boffemmyer <flux AT sourcemage.org>
* DETAILS: updated for 0.5.3
* CONFIGURE: don't ask about options if options they depend one were

[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (16f7c8e125ff80a6c5e8c79bb181fb6300922601), Remko van der Vossen, 07/29/2011