* Florian Bruhin <me _at_ the _minus_ compiler _dot_ org> [2013-08-13 10:03:17 +0200]: > My proposed fix would be to check if Xinerama is installed in the > Makefile, and if not, install without Xinerama. A patch to do so is > attached. I just noticed we might want to use pkg-config to get the -l line when we're calling it anyways, so I replaced pkg-config --exists xinerama && echo -lXinerama by pkg-config --silence-errors --libs xinerama I also changed $(shell ...) to `...` to match the rest of the Makefile better. New patch attached. Florian -- www.the-compiler.org | Top-posting sucks! http://s.cmpl.cc/top I love long mails! | http://email.is-not-s.ms/ A Law of Computer Programming: Make it possible for programmers to write in English and you will find that programmers cannot write in English.
From f3f3be1e687e027d7ff2e43c25b3e394e9c59add Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git _at_ the _minus_ compiler _dot_ org>
Date: Tue, 13 Aug 2013 09:59:24 +0200
Subject: [PATCH] Only build with Xinerama if it's available
---
config.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.mk b/config.mk
index a3cfd35..36d70c0 100644
--- a/config.mk
+++ b/config.mk
@@ -3,8 +3,8 @@ X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
# Xinerama
-XINERAMALIBS = -L${X11LIB} -lXinerama
-XINERAMAFLAGS = -DXINERAMA
+XINERAMALIBS = `pkg-config --silence-errors --libs xinerama`
+XINERAMAFLAGS = `pkg-config --exists xinerama && echo -DXINERAMA`
INCS = -Isrc/ -I/usr/include -I${X11INC} `pkg-config --cflags glib-2.0`
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 $(XINERAMALIBS) `pkg-config --libs
glib-2.0`
--
1.8.3.4
Attachment:
pgpx6hc2fLoC3.pgp
Description: PGP signature