diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2013-05-19 08:35:48 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-20 06:59:42 -0700 |
| commit | 15bb4fccbb14c0e69637ca5920a1e68071700b8e (patch) | |
| tree | 8a5ad718aaa2fdbe8c81b6037f1c821789c83d34 | |
| parent | 0d370ba108df707fe89b4afb45dea3a4146ad02a (diff) | |
| download | subsurface-15bb4fccbb14c0e69637ca5920a1e68071700b8e.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-- | Configure.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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) |