diff options
| author |  Dirk Hohndel <hohndel@mail.gr8dns.org> | 2013-05-18 09:44:54 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-18 09:49:37 -0700 |
| commit | de50f6625746928711d7fb7f0fa579d194931970 (patch) | |
| tree | 81ea712a3c4c417d6ed120b55524fec8f1f42862 /Configure.mk | |
| parent | 1fac07af4f5093df59d3ce3e85d660a817bd039e (diff) | |
| download | subsurface-de50f6625746928711d7fb7f0fa579d194931970.tar.gz | |
Work around broken Marble on Debian
This is a major hack. Debian appears to be missing a necessary header file
for Marble to work correctly. We include this header file for now and hack
the Configure process to recognize that we are on Debian and force using
our local copy of the header file in that case.
This may be needed on Ubuntu as well.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Configure.mk')
| -rw-r--r-- | Configure.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Configure.mk b/Configure.mk index 3d5e5c978..86b375985 100644 --- a/Configure.mk +++ b/Configure.mk @@ -146,6 +146,13 @@ 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 +else + MARBLEFLAGS = -DQT_NO_KEYWORDS +endif + # Write the configure file all: configure configure $(CONFIGURE): Configure.mk @@ -181,6 +188,7 @@ configure $(CONFIGURE): Configure.mk ZIPFLAGS = $(ZIPFLAGS)\\\ LIBSQLITE3 = $(LIBSQLITE3)\\\ SQLITE3FLAGS = $(SQLITE3FLAGS)\\\ + MARBLEFLAGS = $(MARBLEFLAGS)\\\ " | tr '\\' '\n' > $(CONFIGFILE) else |