[w3m-dev-en 00796]

* configure: expand here. ($var in Makefile is $v + ar)
* XMakefile: clean w3mimg/**/*.o
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2002-10-27 17:16:36 +00:00
parent f725f869d8
commit 89b7d50a23
3 changed files with 18 additions and 11 deletions

18
configure vendored
View File

@@ -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"