From faedd18b1c2b141f7893895084c9711bf6d66656 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Mon, 9 Jul 2012 16:57:23 +0200
Subject: [PATCH] Check more explicitly for X11 presence.

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2c03a1f6e6..018b70d5ff 100644
--- a/Makefile
+++ b/Makefile
@@ -125,8 +125,9 @@ ifeq ($(HAVE_SDL), 1)
    DEFINES += $(SDL_CFLAGS) $(BSD_LOCAL_INC)
    LIBS += $(SDL_LIBS)
 
-ifneq ($(OSX), 1)
-   LIBS += -lX11
+ifeq ($(HAVE_X11), 1)
+   LIBS += $(X11_LIBS)
+   DEFINES += $(X11_CFLAGS)
 endif
 
 ifeq ($(HAVE_OPENGL), 1)