summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-01 22:40:49 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-01 22:40:49 +0100
commit744d20add3a3be77b9424fd73e9dcd8b146fc23a (patch)
tree2f53de17ee33518e114fbcc00cc8228e470f61dc /wscript
parent3fa1dc2bc3d353692ea9b2cd9cdb685dd94b85f4 (diff)
parent533443c335cbd8c3dc24591976e63003308aaf9a (diff)
Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic
Diffstat (limited to 'wscript')
-rw-r--r--wscript9
1 files changed, 6 insertions, 3 deletions
diff --git a/wscript b/wscript
index e8f6240d3..93db7d3ee 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dvdomatic'
-VERSION = '0.106pre'
+VERSION = '0.106beta1'
def options(opt):
opt.load('compiler_cxx')
@@ -112,8 +112,11 @@ def configure(conf):
if conf.env.TARGET_LINUX:
conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True)
- # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
- conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
+ if conf.env.STATIC:
+ conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+ else:
+ # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
+ conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)