diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-05-18 11:40:52 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-18 17:18:16 -0700 |
| commit | 29b99d4e1a529e95372106e69745f6079d96ff70 (patch) | |
| tree | 75bf20275da94afdc897f1aa162d71d3deaa8a7c | |
| parent | 6bea555c1965862e725f0589b8bf01e75442fd96 (diff) | |
| download | subsurface-29b99d4e1a529e95372106e69745f6079d96ff70.tar.gz | |
Detect the presence of the missing Marble header by compiling it
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | Configure.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Configure.mk b/Configure.mk index a3d654f8b..745b03ce1 100644 --- a/Configure.mk +++ b/Configure.mk @@ -146,10 +146,9 @@ ZIPFLAGS = $(strip $(shell $(PKGCONFIG) --cflags libzip 2> /dev/null)) LIBSQLITE3 = $(shell $(PKGCONFIG) --libs sqlite3 2> /dev/null) SQLITE3FLAGS = $(strip $(shell $(PKGCONFIG) --cflags sqlite3)) -UNAME_A = $(shell uname -a) -ifneq (,$(filter $(UNAME_A), Debian)) - MARBLEFLAGS = -DINCOMPLETE_MARBLE -endif +# Before Marble 4.9, the GeoDataTreeModel.h header wasn't installed +# Check if it's present by trying to compile +MARBLEFLAGS = $(shell $(CXX) $(QTCXXFLAGS) -E -include marble/GeoDataTreeModel.h -xc++ /dev/null > /dev/null 2>&1 || echo " -DINCOMPLETE_MARBLE") # Write the configure file all: configure |