diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2013-10-15 11:45:24 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2013-10-15 11:45:24 +0000 |
| commit | 6b88d0ccfccdea54807bd63a1609167f57e3e880 (patch) | |
| tree | 6a07113484c3031a17a545dcee20f5acaf9ecad7 | |
| parent | Revert "Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5" (diff) | |
| download | w3m-6b88d0ccfccdea54807bd63a1609167f57e3e880.tar.gz w3m-6b88d0ccfccdea54807bd63a1609167f57e3e880.zip | |
Explicitly add -lX11 to IMGX11LDFLAGS only when gtk2
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e4ccc3d..3b180dd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -706,7 +706,7 @@ AC_DEFUN([AC_W3M_IMAGE], AC_DEFINE(USE_GDKPIXBUF) AC_DEFINE(USE_GTK2) IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" - IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" elif test x"$have_gdkpixbuf" = xyes; then AC_DEFINE(USE_W3MIMG_X11) IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" @@ -6927,7 +6927,7 @@ $as_echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= $as_echo "#define USE_GTK2 1" >>confdefs.h IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" - IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" elif test x"$have_gdkpixbuf" = xyes; then $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h |