From: Carl Hetherington <cth@carlh.net>
Date: Tue, 22 Sep 2015 15:21:28 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.3.6~27
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=7231634b0535c77037602c23bfb97f707421b338;hp=-c

Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
---

7231634b0535c77037602c23bfb97f707421b338
diff --combined wscript
index 150e9cb16,3afb75cae..8f6c487ee
--- a/wscript
+++ b/wscript
@@@ -26,7 -26,7 +26,7 @@@ import distutils.spaw
  from waflib import Logs
  
  APPNAME = 'dcpomatic'
- VERSION = '2.3.4devel'
+ VERSION = '2.3.5devel'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -159,8 -159,6 +159,8 @@@ def configure(conf)
      else:
          conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
  
 +    # uchardet
 +    conf.check_cfg(package='uchardet', args='--cflags --libs', uselib_store='UCHARDET', mandatory=True)
  
      # libsndfile
      conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)