ayatana-commits team mailing list archive

[Alberto Ruiz <alberto.ruiz@xxxxxxxxxxxxx>]

Alberto Ruiz has proposed merging lp:~alberto.ruiz/lo-menubar/build-updates into lp:lo-menubar.

Requested reviews:
  Björn Michaelsen (bjoern-michaelsen)

For more details, see:
https://code.launchpad.net/~alberto.ruiz/lo-menubar/build-updates/+merge/104817

This branch updates the waf script so that boost is checked on configure time and the default paths for certain libraries and resources point to the current libreoffice install paths.
-- 
https://code.launchpad.net/~alberto.ruiz/lo-menubar/build-updates/+merge/104817
Your team ayatana-commits is subscribed to branch lp:lo-menubar.

=== modified file 'wscript'
--- wscript	2011-03-21 12:49:40 +0000
+++ wscript	2012-05-04 23:37:18 +0000
@@ -24,21 +24,22 @@
 def configure(conf):
 	conf.load('compiler_cxx')
 	
-	uno_sdk_libpath = '%s/basis3.3/sdk/lib' % Options.options.LO_PREFIX
+	uno_sdk_libpath = '%s/sdk/lib' % Options.options.LO_PREFIX
 	
 	conf.check_cxx(lib='uno_sal', uselib_store='SALLIB', libpath=uno_sdk_libpath, mandatory=True)
 	conf.check_cxx(lib='uno_cppu', uselib_store='CPPULIB', libpath=uno_sdk_libpath, mandatory=True)
 	#conf.check_cc(lib='uno_salhelpergcc3', uselib_store='SALHELPERLIB',  mandatory=True)
 	conf.check_cxx(lib='uno_cppuhelpergcc3', uselib_store='CPPUHELPERLIB', libpath=uno_sdk_libpath,  mandatory=True)
+        conf.check_cxx(header_name='boost/scoped_ptr.hpp')
 	
-	conf.find_program('cppumaker', var='CPPUMAKER', path_list=[Options.options.LO_PREFIX + '/basis3.3/sdk/bin'], mandatory=True)
+	conf.find_program('cppumaker', var='CPPUMAKER', path_list=[Options.options.LO_PREFIX + '/sdk/bin'], mandatory=True)
 
 	conf.env['TYPES_RDB'] = conf.find_file('types.rdb',
 	                                       path_list=[Options.options.URE_PREFIX + '/share/misc/'],
 	                                       mandatory=True)
 	
 	conf.env['OFFAPI_RDB'] = conf.find_file('offapi.rdb',
-	                                        path_list=[Options.options.LO_PREFIX + '/basis3.3/program'],
+	                                        path_list=[Options.options.LO_PREFIX + '/program/types'],
 	                                        mandatory=True)
 	
 	conf.check_cfg(package='gio-2.0', uselib_store='GIO',