From 01df5d59e56a1b060568f8cad2e89f7eea22fc70 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 29 Aug 2011 08:51:20 +0200
Subject: xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git
 update 29 aug 2011

---
 apps/xwininfo/configure.ac | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'apps/xwininfo/configure.ac')

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
-- 
cgit v1.2.3