[PATCH 2/3] Detect the presence of the missing Marble header by compiling it

Thiago Macieira thiago at macieira.org
Sat May 18 11:40:52 PDT 2013


Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
 Configure.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Configure.mk b/Configure.mk
index a3d654f..745b03c 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
-- 
1.7.11.7



More information about the subsurface mailing list