From af49f5cbf103afc3878cb13b70b6549db752c73b Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sat, 4 Dec 2010 18:10:35 +0000
Subject: Make libnsfb dynamically detect the available surface libraries

svn path=/trunk/libnsfb/; revision=10972
---
 src/surface/Makefile | 10 +++++++++-
 src/surface/x.c      |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/surface')

diff --git a/src/surface/Makefile b/src/surface/Makefile
index 3abbfb6..6eddcb6 100644
--- a/src/surface/Makefile
+++ b/src/surface/Makefile
@@ -1,4 +1,12 @@
 # Sources
-DIR_SOURCES := surface.c sdl.c vnc.c able.c ram.c linux.c x.c
+DIR_SOURCES := surface.c vnc.c able.c ram.c linux.c
+
+ifeq ($(NSFB_SDL_AVAILABLE),yes)
+  DIR_SOURCES := $(DIR_SOURCES) sdl.c
+endif
+
+ifeq ($(NSFB_XCB_AVAILABLE),yes)
+  DIR_SOURCES := $(DIR_SOURCES) x.c
+endif
 
 include build/makefiles/Makefile.subdir
diff --git a/src/surface/x.c b/src/surface/x.c
index 2b8d3bf..a8c06ee 100644
--- a/src/surface/x.c
+++ b/src/surface/x.c
@@ -7,7 +7,6 @@
  */
 
 #define _XOPEN_SOURCE 500
-#define NEED_HINTS_ALLOC
 
 #include <stdbool.h>
 #include <stdlib.h>
-- 
cgit v1.2.3