diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7ebc76c..e4ccc3d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -569,6 +569,8 @@ AC_DEFUN([AC_W3M_IMAGE], [AC_SUBST(USE_IMAGE) AC_SUBST(USE_W3MIMG_X11) AC_SUBST(USE_W3MIMG_FB) + AC_SUBST(USE_W3MIMG_WIN) + AC_SUBST(IMGLINK) AC_SUBST(W3MIMGDISPLAY_SETUID) AC_SUBST(INSTALL_W3MIMGDISPLAY) INSTALL_W3MIMGDISPLAY='${INSTALL_PROGRAM}' @@ -583,10 +585,12 @@ AC_DEFUN([AC_W3M_IMAGE], AC_SUBST(IMGX11LDFLAGS) AC_SUBST(IMGFBCFLAGS) AC_SUBST(IMGFBLDFLAGS) + AC_SUBST(IMGWINCFLAGS) + AC_SUBST(IMGWINLDFLAGS) AC_MSG_CHECKING(if image is enabled) AC_ARG_ENABLE(image, [ --enable-image[=DEVS] enable inline image handler for DEVS - DEVS may be comma separeted: x11,fb,fb+s + DEVS may be comma separeted: x11,fb,fb+s,win default: autodetected. 'no' means disable inline image],, [enable_image="yes"]) @@ -600,10 +604,14 @@ AC_DEFUN([AC_W3M_IMAGE], if test -c /dev/fb0; then enable_image=x11,fb fi;; + CYGWIN*) + enable_image=x11,win;; esac fi save_ifs="$IFS"; IFS=","; - for img in $enable_image; do + set x $enable_image; shift + IFS="$save_ifs" + for img in "$[]@"; do case $img in x11) x11=yes;; fb) fb=yes;; @@ -611,9 +619,9 @@ AC_DEFUN([AC_W3M_IMAGE], AC_DEFINE(W3MIMGDISPLAY_SETUID) INSTALL_W3MIMGDISPLAY='${INSTALL} -o root -m 4755 -s' AC_DEFINE(INSTALL_W3MIMGDISPLAY, $INSTALL_W3MIMGDISPLAY);; + win) win=yes;; esac done - IFS="$save_ifs" enable_image=yes AC_DEFINE(USE_IMAGE) AC_MSG_CHECKING(image library) @@ -659,6 +667,7 @@ AC_DEFUN([AC_W3M_IMAGE], esac done IMGTARGETS="" + IMGLINK='$(CC)' if test x"$with_gtk2" = xyes; then AC_W3M_CHECK_VER([GdkPixbuf], [`$PKG_CONFIG --modversion gdk-pixbuf-2.0 2>/dev/null`], @@ -752,12 +761,23 @@ AC_DEFUN([AC_W3M_IMAGE], AC_MSG_WARN([unable to build w3mimgdisplay with FB support]) fi fi + if test x"$win" = xyes; then + AC_DEFINE(USE_W3MIMG_WIN) + IMGOBJS="$IMGOBJS win/win_w3mimg.o" + IMGTARGETS="${IMGTARGETS} win" + IMGWINCFLAGS="-I/usr/include/w32api" + IMGWINLDFLAGS="-lgdiplus -lgdi32 -luser32" + IMGLINK='$(CXX)' + fi AC_DEFINE(IMGTARGETS, "$IMGTARGETS") AC_DEFINE(IMGOBJS, "$IMGOBJS") AC_DEFINE(IMGX11CFLAGS, "$IMGX11CFLAGS") AC_DEFINE(IMGX11LDFLAGS, "$IMGX11LDFLAGS") AC_DEFINE(IMGFBCFLAGS, "$IMGFBCFLAGS") - AC_DEFINE(IMGFBLDFLAGS, "$IMGLDFLAGS") + AC_DEFINE(IMGFBLDFLAGS, "$IMGFBLDFLAGS") + AC_DEFINE(IMGLINK, "$IMGLINK") + AC_DEFINE(IMGWINCFLAGS, "$IMGWINCFLAGS") + AC_DEFINE(IMGWINLDFLAGS, "$IMGWINLDFLAGS") fi]) # ---------------------------------------------------------------- # AC_W3M_XFACE |