storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use pkg-config to build with imlib2 1.4.6

Browse Source
This commit is contained in:
Tatsuya Kinoshita
2014-01-03 16:33:18 +09:00
parent dbd52ac2ca
commit bc40004701
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acinclude.m4
View File

@@ -649,6 +649,9 @@ AC_DEFUN([AC_W3M_IMAGE],
fi;; fi;;
imlib2) imlib2)
with_imlib2="yes" with_imlib2="yes"
if test x"$PKG_CONFIG" = x; then
PKG_CONFIG=pkg-config
fi
if test x"$IMLIB2_CONFIG" = x; then if test x"$IMLIB2_CONFIG" = x; then
IMLIB2_CONFIG=imlib2-config IMLIB2_CONFIG=imlib2-config
fi;; fi;;
@@ -728,7 +731,7 @@ AC_DEFUN([AC_W3M_IMAGE],
IMGTARGETS="x11" IMGTARGETS="x11"
AC_DEFINE(USE_IMLIB2) AC_DEFINE(USE_IMLIB2)
IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`" IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`"
else else
AC_MSG_WARN([unable to build w3mimgdisplay with X11 support]) AC_MSG_WARN([unable to build w3mimgdisplay with X11 support])
fi fi
@@ -756,7 +759,7 @@ AC_DEFUN([AC_W3M_IMAGE],
AC_DEFINE(USE_IMLIB2) AC_DEFINE(USE_IMLIB2)
IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`" IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`"
else else
AC_MSG_WARN([unable to build w3mimgdisplay with FB support]) AC_MSG_WARN([unable to build w3mimgdisplay with FB support])
fi fi

7
configure vendored
View File

@@ -6811,6 +6811,9 @@ $as_echo "$with_imagelib" >&6; }
fi;; fi;;
imlib2) imlib2)
with_imlib2="yes" with_imlib2="yes"
if test x"$PKG_CONFIG" = x; then
PKG_CONFIG=pkg-config
fi
if test x"$IMLIB2_CONFIG" = x; then if test x"$IMLIB2_CONFIG" = x; then
IMLIB2_CONFIG=imlib2-config IMLIB2_CONFIG=imlib2-config
fi;; fi;;
@@ -6955,7 +6958,7 @@ $as_echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >=
$as_echo "#define USE_IMLIB2 1" >>confdefs.h $as_echo "#define USE_IMLIB2 1" >>confdefs.h
IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`" IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`"
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with X11 support" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with X11 support" >&5
$as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;} $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;}
@@ -6991,7 +6994,7 @@ $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;}
IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`" IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`"
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with FB support" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with FB support" >&5
$as_echo "$as_me: WARNING: unable to build w3mimgdisplay with FB support" >&2;} $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with FB support" >&2;}