From 15bb4fccbb14c0e69637ca5920a1e68071700b8e Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Sun, 19 May 2013 08:35:48 +0300 Subject: [PATCH] Detect libdivecomputer using pkg-config if possible If libdivecomputer is managed by pkg-config, we should query it for the compiler parameters on Linux also. Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- Configure.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Configure.mk b/Configure.mk index c7b6ba5bf..e482de6d7 100644 --- a/Configure.mk +++ b/Configure.mk @@ -33,6 +33,9 @@ ifeq ($(CC), i686-w64-mingw32-gcc) else ifeq ($(UNAME), darwin) LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer) LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer) +else ifeq ($(shell $(PKGCONFIG) --exists libdivecomputer; echo $$?),0) + LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer) + LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer) else libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a) libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)