From 29b99d4e1a529e95372106e69745f6079d96ff70 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 18 May 2013 11:40:52 -0700 Subject: [PATCH] Detect the presence of the missing Marble header by compiling it Signed-off-by: Thiago Macieira Signed-off-by: Dirk Hohndel --- Configure.mk | 7 +++---- 1 file 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