diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2014-01-03 08:10:48 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2014-01-03 08:10:48 +0000 |
| commit | 12bf8a8fcd1dc244c254982977a2f16a09fb9817 (patch) | |
| tree | 0288c7017471598d16226788450c9bf69ccc66c4 /acinclude.m4 | |
| parent | Merge branch 'bug/doc-ascii' (diff) | |
| parent | Use pkg-config to build with imlib2 1.4.6 (diff) | |
| download | w3m-12bf8a8fcd1dc244c254982977a2f16a09fb9817.tar.gz w3m-12bf8a8fcd1dc244c254982977a2f16a09fb9817.zip | |
Merge branch 'bug/imlib2-config'
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 48e0ff8..c1d112b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -649,6 +649,9 @@ AC_DEFUN([AC_W3M_IMAGE], fi;; imlib2) with_imlib2="yes" + if test x"$PKG_CONFIG" = x; then + PKG_CONFIG=pkg-config + fi if test x"$IMLIB2_CONFIG" = x; then IMLIB2_CONFIG=imlib2-config fi;; @@ -728,7 +731,7 @@ AC_DEFUN([AC_W3M_IMAGE], IMGTARGETS="x11" AC_DEFINE(USE_IMLIB2) IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`" else AC_MSG_WARN([unable to build w3mimgdisplay with X11 support]) fi @@ -756,7 +759,7 @@ AC_DEFUN([AC_W3M_IMAGE], AC_DEFINE(USE_IMLIB2) IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`" else AC_MSG_WARN([unable to build w3mimgdisplay with FB support]) fi |