--- w3m-0.5.3-git20190105/configure.orig	2019-01-05 08:41:27.000000000 +0000
+++ w3m-0.5.3-git20190105/configure	2020-03-27 20:42:51.539079131 +0000
@@ -6798,215 +6798,20 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_imagelib" >&5
 $as_echo "$with_imagelib" >&6; }
   with_imlib=no
-  with_imlib2=no
+  with_imlib2=yes
   with_gdkpixbuf=no
   with_gtk2=no
-  for imagelib in $with_imagelib
-  do
-   case "$imagelib" in
-   imlib)
-     with_imlib="yes"
-     if test x"$IMLIB_CONFIG" = x; then
-       IMLIB_CONFIG=imlib-config
-     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;;
-   gdk-pixbuf)
-     with_gdkpixbuf="yes"
-     if test x"$GDKPIXBUF_CONFIG" = x; then
-       GDKPIXBUF_CONFIG=gdk-pixbuf-config
-     fi;;
-   gtk2)
-     with_gtk2="yes"
-     if test x"$PKG_CONFIG" = x; then
-       PKG_CONFIG=pkg-config
-     fi;;
-   esac
-  done
+
+  have_imlib2="yes"
   IMGTARGETS=""
   IMGLINK='$(CC)'
-  if test x"$with_gtk2" = xyes; then
-   version="`$PKG_CONFIG --modversion gdk-pixbuf-2.0 2>/dev/null`"
- if test x"$version" != x; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking GdkPixbuf version" >&5
-$as_echo_n "checking GdkPixbuf version... " >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5
-$as_echo "$version" >&6; }
-   set -- `echo "$version" | sed 's/[^0-9]/ /g'`
-   if test "$1" -ne "2" -o "$2" -lt "0" || test "$2" -eq "0" -a "$3" -lt "0"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 2.0.0)" >&5
-$as_echo "$as_me: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 2.0.0)" >&2;}
-     have_gdkpixbuf="no"; have_gtk2="no"
-   else
-     have_gdkpixbuf="yes"; have_gtk2="yes"
-   fi
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GdkPixbuf is not installed.  Install GdkPixbuf (version >= 2.0.0)" >&5
-$as_echo "$as_me: WARNING: GdkPixbuf is not installed.  Install GdkPixbuf (version >= 2.0.0)" >&2;}
-   have_gdkpixbuf="no"; have_gtk2="no"
- fi
-  fi
-  if test x"$with_gdkpixbuf" = xyes; then
-   if test x"$have_gdkpixbuf" != xyes; then
-    version="`$GDKPIXBUF_CONFIG --version 2>/dev/null`"
- if test x"$version" != x; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking GdkPixbuf version" >&5
-$as_echo_n "checking GdkPixbuf version... " >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5
-$as_echo "$version" >&6; }
-   set -- `echo "$version" | sed 's/[^0-9]/ /g'`
-   if test "$1" -ne "0" -o "$2" -lt "16" || test "$2" -eq "16" -a "$3" -lt "0"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&5
-$as_echo "$as_me: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&2;}
-     have_gdkpixbuf="no"
-   else
-     have_gdkpixbuf="yes"
-   fi
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GdkPixbuf is not installed.  Install GdkPixbuf (version >= 0.16.0)" >&5
-$as_echo "$as_me: WARNING: GdkPixbuf is not installed.  Install GdkPixbuf (version >= 0.16.0)" >&2;}
-   have_gdkpixbuf="no"
- fi
-   fi
-  fi
-  if test x"$with_imlib" = xyes; then
-   version="`$IMLIB_CONFIG --version 2>/dev/null`"
- if test x"$version" != x; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Imlib version" >&5
-$as_echo_n "checking Imlib version... " >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5
-$as_echo "$version" >&6; }
-   set -- `echo "$version" | sed 's/[^0-9]/ /g'`
-   if test "$1" -ne "1" -o "$2" -lt "9" || test "$2" -eq "9" -a "$3" -lt "8"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Imlib is too old. Install Imlib (version >= 1.9.8)" >&5
-$as_echo "$as_me: WARNING: Imlib is too old. Install Imlib (version >= 1.9.8)" >&2;}
-     have_imlib="no"
-   else
-     have_imlib="yes"
-   fi
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Imlib is not installed.  Install Imlib (version >= 1.9.8)" >&5
-$as_echo "$as_me: WARNING: Imlib is not installed.  Install Imlib (version >= 1.9.8)" >&2;}
-   have_imlib="no"
- fi
-  fi
-  if test x"$with_imlib2" = xyes; then
-   version="`$IMLIB2_CONFIG --version 2>/dev/null`"
- if test x"$version" != x; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Imlib2 version" >&5
-$as_echo_n "checking Imlib2 version... " >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5
-$as_echo "$version" >&6; }
-   set -- `echo "$version" | sed 's/[^0-9]/ /g'`
-   if test "$1" -ne "1" -o "$2" -lt "0" || test "$2" -eq "0" -a "$3" -lt "5"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Imlib2 is too old. Install Imlib2 (version >= 1.0.5)" >&5
-$as_echo "$as_me: WARNING: Imlib2 is too old. Install Imlib2 (version >= 1.0.5)" >&2;}
-     have_imlib2="no"
-   else
-     have_imlib2="yes"
-   fi
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Imlib2 is not installed.  Install Imlib2 (version >= 1.0.5)" >&5
-$as_echo "$as_me: WARNING: Imlib2 is not installed.  Install Imlib2 (version >= 1.0.5)" >&2;}
-   have_imlib2="no"
- fi
-  fi
-  if test x"$x11" = xyes; then
-   if test x"$have_gtk2" = xyes; then
-     $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h
-
-     IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
-     IMGTARGETS="x11"
-     $as_echo "#define USE_GDKPIXBUF 1" >>confdefs.h
-
-     $as_echo "#define USE_GTK2 1" >>confdefs.h
-
-     IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
-     IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
-   elif test x"$have_gdkpixbuf" = xyes; then
-     $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h
-
-     IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
-     IMGTARGETS="x11"
-     $as_echo "#define USE_GDKPIXBUF 1" >>confdefs.h
-
-     IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
-     IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
-   elif test x"$have_imlib" = xyes; then
-     $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h
-
-     IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
-     IMGTARGETS="x11"
-     $as_echo "#define USE_IMLIB 1" >>confdefs.h
-
-     IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
-     IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
-     IMGTARGETS="x11"
-   elif test x"$have_imlib2" = xyes; then
-     $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h
-
-     IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
-     IMGTARGETS="x11"
-     $as_echo "#define USE_IMLIB2 1" >>confdefs.h
-
-     IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
-     IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`"
-   else
-     { $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;}
-   fi
-  fi
-  if test x"$fb" = xyes; then
-   if test x"$have_gtk2" = xyes; then
-     $as_echo "#define USE_W3MIMG_FB 1" >>confdefs.h
-
-     IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
-     IMGTARGETS="${IMGTARGETS} fb"
-     $as_echo "#define USE_GDKPIXBUF 1" >>confdefs.h
-
-     $as_echo "#define USE_GTK2 1" >>confdefs.h
-
-     IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0`"
-     IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0`"
-   elif test x"$have_gdkpixbuf" = xyes; then
-     $as_echo "#define USE_W3MIMG_FB 1" >>confdefs.h
-
-     IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
-     IMGTARGETS="${IMGTARGETS} fb"
-     $as_echo "#define USE_GDKPIXBUF 1" >>confdefs.h
-
-     IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
-     IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
-   elif test x"$have_imlib2" = xyes; then
-     $as_echo "#define USE_W3MIMG_FB 1" >>confdefs.h
-
-     IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
-     IMGTARGETS="${IMGTARGETS} fb"
-     $as_echo "#define USE_IMLIB2 1" >>confdefs.h
-
-     IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
-     IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
-     IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`"
-   else
-     { $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;}
-   fi
-  fi
-  if test x"$win" = xyes; then
-    $as_echo "#define USE_W3MIMG_WIN 1" >>confdefs.h
+  $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h
+  IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
+  IMGTARGETS="x11"
+  $as_echo "#define USE_IMLIB2 1" >>confdefs.h
+  IMGX11CFLAGS=""
+  IMGX11LDFLAGS="-lX11 -lImlib2"
 
-    IMGOBJS="$IMGOBJS win/win_w3mimg.o"
-    IMGTARGETS="${IMGTARGETS} win"
-    IMGWINCFLAGS="-I/usr/include/w32api"
-    IMGWINLDFLAGS="-lgdiplus -lgdi32 -luser32"
-    IMGLINK='$(CXX)'
-  fi
   $as_echo "#define IMGTARGETS \"\$IMGTARGETS\"" >>confdefs.h
 
   $as_echo "#define IMGOBJS \"\$IMGOBJS\"" >>confdefs.h
@@ -7361,24 +7166,6 @@
 _ACEOF
 
 
-for lib in bsd BSD 44bsd socket nsl dld dl
-do
- lib=$lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -l$lib" >&5
-$as_echo_n "checking for -l$lib... " >&6; }
- extlib="not found"
- for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64
- do
-   if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then
-    LIBS="$LIBS -l$lib"
-    extlib="found at $dir"
-    break
-   fi
- done
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $extlib" >&5
-$as_echo "$extlib" >&6; }
-done
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPv6 support is enabled" >&5
 $as_echo_n "checking if IPv6 support is enabled... " >&6; }
 # Check whether --enable-ipv6 was given.