diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-29 08:51:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-29 08:51:20 +0200 |
| commit | 01df5d59e56a1b060568f8cad2e89f7eea22fc70 (patch) | |
| tree | 9db83037fd85d0974b60fc1a05e0665083f26000 /apps/xwininfo/configure.ac | |
| parent | fd1f4d9fe3ea67fa6def8ee4927a8f71e0440f12 (diff) | |
| download | vcxsrv-01df5d59e56a1b060568f8cad2e89f7eea22fc70.tar.gz vcxsrv-01df5d59e56a1b060568f8cad2e89f7eea22fc70.tar.bz2 vcxsrv-01df5d59e56a1b060568f8cad2e89f7eea22fc70.zip | |
xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29
aug 2011
Diffstat (limited to 'apps/xwininfo/configure.ac')
| -rw-r--r-- | apps/xwininfo/configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/xwininfo/configure.ac b/apps/xwininfo/configure.ac index b86aa20f5..e712ba661 100644 --- a/apps/xwininfo/configure.ac +++ b/apps/xwininfo/configure.ac @@ -45,9 +45,7 @@ if test "x$ac_cv_func_strnlen_working" = xyes; then AC_DEFINE(HAVE_STRNLEN, 1, [Define to 1 if you have a working strnlen function.]) fi -# Check for iconv in libc, then libiconv -AC_SEARCH_LIBS([iconv], [iconv], [AC_DEFINE([HAVE_ICONV], 1, - [Define to 1 if you have the iconv() function])]) +AM_ICONV # Allow using xcb-icccm, but don't make it the default while the API is # still being changed. @@ -70,6 +68,7 @@ PKG_CHECK_MODULES(XWININFO, [xcb >= 1.6] xcb-shape ${xcb_icccm_pc}) # and libX11 headers for cursorfont.h PKG_CHECK_MODULES(XLIB, x11 [xproto >= 7.0.17]) XWININFO_CFLAGS="${XWININFO_CFLAGS} ${XLIB_CFLAGS}" +XWININFO_LIBS="${XWININFO_LIBS} ${LIBICONV}" AC_CONFIG_FILES([ Makefile |