diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2021-02-16 11:05:18 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2021-02-16 15:43:26 +0000 |
| commit | 0bdd042e3802e27dcb55bae542d845c8db0183a1 (patch) | |
| tree | 2191982cb893e4ebf942e49fd1a585d2312b0686 /acinclude.m4 | |
| parent | Indentation and wording fixes for configure --help (diff) | |
| download | w3m-0bdd042e3802e27dcb55bae542d845c8db0183a1.tar.gz w3m-0bdd042e3802e27dcb55bae542d845c8db0183a1.zip | |
Prefer Imlib2 over GTK2 by default
Bug-Debian: https://github.com/tats/w3m/issues/95
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672121
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index af9802b..0d08e9b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -722,7 +722,14 @@ AC_DEFUN([AC_W3M_IMAGE], [have_imlib2="no"]) fi if test x"$x11" = xyes; then - if test x"$have_gtk2" = xyes; then + if test x"$have_imlib2" = xyes; then + AC_DEFINE(USE_W3MIMG_X11) + IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" + IMGTARGETS="x11" + AC_DEFINE(USE_IMLIB2) + IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`" + elif test x"$have_gtk2" = xyes; then AC_DEFINE(USE_W3MIMG_X11) IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" IMGTARGETS="x11" @@ -745,19 +752,20 @@ AC_DEFUN([AC_W3M_IMAGE], IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`" IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`" IMGTARGETS="x11" - elif test x"$have_imlib2" = xyes; then - AC_DEFINE(USE_W3MIMG_X11) - IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" - IMGTARGETS="x11" - AC_DEFINE(USE_IMLIB2) - IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`" else AC_MSG_WARN([unable to build w3mimgdisplay with X11 support]) fi fi if test x"$fb" = xyes; then - if test x"$have_gtk2" = xyes; then + if test x"$have_imlib2" = xyes; then + AC_DEFINE(USE_W3MIMG_FB) + IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" + IMGTARGETS="${IMGTARGETS} fb" + AC_DEFINE(USE_IMLIB2) + IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" + IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" + IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`" + elif test x"$have_gtk2" = xyes; then AC_DEFINE(USE_W3MIMG_FB) IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" IMGTARGETS="${IMGTARGETS} fb" @@ -772,14 +780,6 @@ AC_DEFUN([AC_W3M_IMAGE], AC_DEFINE(USE_GDKPIXBUF) IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`" IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`" - elif test x"$have_imlib2" = xyes; then - AC_DEFINE(USE_W3MIMG_FB) - IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" - IMGTARGETS="${IMGTARGETS} fb" - AC_DEFINE(USE_IMLIB2) - IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" - IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`" else AC_MSG_WARN([unable to build w3mimgdisplay with FB support]) fi |