From 86f1830d0ab76b07999ed35e29a32d405ee22ac4 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sun, 6 Apr 2003 10:47:16 +0000
Subject: build fixes for finding Xlibs and for setting vars based on found
 Xlib info and Xinerama info

---
 build/Makefile.incl.in | 4 ++++
 build/Makefile.kernel  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'build')

diff --git a/build/Makefile.incl.in b/build/Makefile.incl.in
index c87609c2..e025751d 100644
--- a/build/Makefile.incl.in
+++ b/build/Makefile.incl.in
@@ -22,6 +22,10 @@ GLIB_LIBS = @GLIB_LIBS@ -DG_DISABLE_DEPRECATED
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@ -DG_DISABLE_DEPRECATED
 
+X_CFLAGS = @X_CFLAGS@
+X_LIBS = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
+XINERAMA_LIBS = @XINERAMA_LIBS@
+
 XFT_CFLAGS = @XFT_CFLAGS@
 XFT_LIBS = @XFT_LIBS@
 
diff --git a/build/Makefile.kernel b/build/Makefile.kernel
index 43aaddce..6d64b416 100644
--- a/build/Makefile.kernel
+++ b/build/Makefile.kernel
@@ -2,9 +2,9 @@ include build/Makefile.incl
 
 dir = kernel
 
-CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) \
+CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS) \
             -DG_LOG_DOMAIN=\"Openbox\"
-LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS)
+LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) $(X_LIBS) $(XINERAMA_LIBS)
 LDFLAGS += -export-dynamic
 
 target = openbox3
-- 
cgit v1.2.3