[w3m-dev-en 00796]

* configure: expand here. ($var in Makefile is $v + ar)
* XMakefile: clean w3mimg/**/*.o
From: Fumitoshi UKAI  <ukai@debian.or.jp>

3 files changed, 18 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f766a0..1e48824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-10-28  Fumitoshi UKAI  <ukai@debian.or.jp>
 
+	* [w3m-dev-en 00796]
+	* configure: expand here. ($var in Makefile is $v + ar)
+	* XMakefile: clean w3mimg/**/*.o
+
+2002-10-28  Fumitoshi UKAI  <ukai@debian.or.jp>
+
 	* [w3m-dev-en 00795]
 	* configure: IMLIB_CONFIG, IMLIB2_CONFIG, GDKPIXBUF_CONFIG
 	* rc.c (CMT_DISP_IMAGE): need if not defined USE_IMAGE
@@ -3998,4 +4004,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.452 2002/10/27 16:59:32 ukai Exp $
+$Id: ChangeLog,v 1.453 2002/10/27 17:16:36 ukai Exp $
diff --git a/XMakefile b/XMakefile
index 8a47798..fd56c76 100644
--- a/XMakefile
+++ b/XMakefile
@@ -1,4 +1,4 @@
-# $Id: XMakefile,v 1.27 2002/07/18 06:07:25 ukai Exp $
+# $Id: XMakefile,v 1.28 2002/10/27 17:16:40 ukai Exp $
 SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
 	form.c map.c frame.c rc.c menu.c mailcap.c image.c\
 	func.c cookie.c history.c backend.c $(KEYBIND_SRC)
@@ -182,6 +182,7 @@ uninstall:
 clean: sweep
 	-rm -f *.o *.a $(TARGETS) mktable$(EXT)
 	-rm -f funcname.c funcname1.h funcname2.h tagtable.c functable.c
+	-rm -f w3mimg/*.o w3mimg/*/*.o 
 	-for dir in $(SCRIPTSUBDIRS);	\
 	do	\
 		(cd $$dir; $(MAKE) clean); \
diff --git a/configure b/configure
index acb7789..3300b34 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.79 2002/10/27 16:59:33 ukai Exp $
+# $Id: configure,v 1.80 2002/10/27 17:16:42 ukai Exp $
 #	Configuration.
 #
 
@@ -2143,14 +2143,14 @@ if [ "$use_image" = y ]; then
 	  def_use_w3mimg_x11="#define USE_W3MIMG_X11"
 	  def_use_gdkpixbuf='#define USE_GDKPIXBUF'
 	  imgobjs="$imgobjs w3mimg/x11/x11_w3mimg.o"
-	  imgx11cflags='`$GDKPIXBUF_CONFIG --cflags`'
-	  imgx11ldflags='`$GDKPIXBUF_CONFIG --libs` -lgdk_pixbuf_xlib'
+	  imgx11cflags="`${GDKPIXBUF_CONFIG} --cflags`"
+	  imgx11ldflags="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
       elif find_imlib; then
 	  def_use_w3mimg_x11="#define USE_W3MIMG_X11"
 	  def_use_imlib='#define USE_IMLIB'
 	  imgobjs="$imgobjs w3mimg/x11/x11_w3mimg.o"
-	  imgx11cflags='`$IMLIB_CONFIG --cflags`'
-	  imgx11ldflags='`$IMLIB_CONFIG --libs`'
+	  imgx11cflags="`${IMLIB_CONFIG} --cflags`"
+	  imgx11ldflags="`${IMLIB_CONFIG} --libs`"
       else
 	  use_w3mimg_x11=n
 	  echo "Disable X11 inline image"
@@ -2161,14 +2161,14 @@ if [ "$use_image" = y ]; then
 	  def_use_w3mimg_fb="#define USE_W3MIMG_FB"
 	  imgobjs="$imgobjs w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
 	  def_use_gdkpixbuf='#define USE_GDKPIXBUF'
-	  imgfbcflags='`$GDKPIXBUF_CONFIG --cflags`'
-	  imgfbldflags='`$GDKPIXBUF_CONFIG --libs`'
+	  imgfbcflags="`${GDKPIXBUF_CONFIG} --cflags`"
+	  imgfbldflags="`${GDKPIXBUF_CONFIG} --libs`"
       elif find_imlib2; then
 	  def_use_imlib2='#define USE_IMLIB2'
 	  imgobjs="$imgobjs w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
 	  def_use_imlib2='#define USE_IMLIB2'
-	  imgfbcflags='`$IMLIB2_CONFIG --cflags`'
-	  imgfbldflags='`$IMLIB2_CONFIG --libs`'
+	  imgfbcflags="`${IMLIB2_CONFIG} --cflags`"
+	  imgfbldflags="`${IMLIB2_CONFIG} --libs`"
       else
 	  use_w3mimg_fb=n
 	  echo "Disable Linux framebuffer inline image"