From aae60af8a3376d57bd9faf68239a22e9c960fa04 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 16 Mar 2012 10:32:06 +0100 Subject: [PATCH] Unbreak win32 build Commit de62a1096 broke win32 as it removed the HAVE_X11R6 checks for building xim, but did not replace them with USE_X11. This made it try to build xim on non-X targets. --- modules/input/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index da989eb4ba..46e00fb43e 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -30,11 +30,13 @@ im_xim_la_SOURCES = \ imxim.c libstatic_im_xim_la_SOURCES = $(im_xim_la_SOURCES) im_xim_la_LIBADD = $(LDADDS) +if USE_X11 if INCLUDE_IM_XIM STATIC_XIM_MODULE = libstatic-im-xim.la else XIM_MODULE=im-xim.la endif +endif im_am_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_am_et_la_SOURCES = imam-et.c