summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2013-05-19 08:35:48 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-20 07:04:10 -0700
commita13e97380b64f429a8d0c97f965bb8ec7b67af76 (patch)
tree38c48ae72ab12808f5485c978a449f34d0c13906
parent204b9d401f4611b43bb13edff926bbc4a0469108 (diff)
downloadsubsurface-a13e97380b64f429a8d0c97f965bb8ec7b67af76.tar.gz
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 <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e0689548d..895a3338e 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,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)