X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=c0b14cbf600325536b3de8f69dd23dddbcc8e99c;hb=29f84e2b8785585885e0658bdf9938967547460f;hp=4b3164f71e16d6101133c96c504a0318f630eb54;hpb=8aa97c043d73e0c6c8bc484a307b944702c7d3dd;p=dcpomatic.git diff --git a/wscript b/wscript index 4b3164f71..c0b14cbf6 100644 --- a/wscript +++ b/wscript @@ -92,8 +92,8 @@ def configure(conf): conf.env.DEBUG = conf.options.enable_debug conf.env.STATIC_DCPOMATIC = conf.options.static_dcpomatic conf.env.ENABLE_DISK = conf.options.enable_disk - if conf.options.destdir is None: - conf.env.INSTALL_PREFIX = conf.env.PREFIX + if conf.options.destdir == '': + conf.env.INSTALL_PREFIX = conf.options.prefix else: conf.env.INSTALL_PREFIX = conf.options.destdir @@ -276,37 +276,6 @@ def configure(conf): # leqm_nrt conf.check_cfg(package='leqm_nrt', args='--cflags --libs', uselib_store='LEQM_NRT', mandatory=True) - # See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not - conf.check_cxx(fragment=""" - #include - int main(void) { - Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, 1024);\n - return 0; }\n - """, - mandatory=False, - msg='Checking for format_stride_for_width', - okmsg='yes', - includes=conf.env['INCLUDES_CAIROMM'], - uselib='CAIROMM', - define_name='DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH') - - # See if we have Pango::Layout::show_in_cairo_context; Centos 5 does not - conf.check_cxx(fragment=""" - #include - int main(void) { - Cairo::RefPtr context; - Glib::RefPtr layout; - layout->show_in_cairo_context (context); - return 0; }\n - """, - mandatory=False, - msg='Checking for show_in_cairo_context', - okmsg='yes', - includes=conf.env['INCLUDES_PANGOMM'], - uselib='PANGOMM', - define_name='DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT') - - # libcxml if conf.options.static_cxml: conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags', uselib_store='CXML', mandatory=True)