ayatana-commits team mailing list archive

[Ken VanDine <ken.vandine@xxxxxxxxxxxxx>]

Ken VanDine has proposed merging lp:~ken-vandine/lo-menubar/no_stlport into lp:lo-menubar.

Requested reviews:
  LO Menubar Rockstars (lo-menubar-team)

For more details, see:
https://code.launchpad.net/~ken-vandine/lo-menubar/no_stlport/+merge/51790

Don't check for stlport, we don't use it.

-- 
https://code.launchpad.net/~ken-vandine/lo-menubar/no_stlport/+merge/51790
Your team ayatana-commits is subscribed to branch lp:lo-menubar.

=== modified file 'wscript'
--- wscript	2011-03-01 13:12:05 +0000
+++ wscript	2011-03-01 18:07:39 +0000
@@ -41,11 +41,6 @@
 	                                        path_list=[Options.options.LO_PREFIX + '/basis3.3/program'],
 	                                        mandatory=True)
 	
-	#TODO: Check if linking against stlport in 64bits is actually a problem
-	stlport4 = conf.check_cxx(lib='stlport_gcc', uselib_store='STLPORTLIB', mandatory=False)
-	if not stlport4:
-		conf.check_cxx(lib='stlport', uselib_store='STLPORTLIB', mandatory=True)
-
 	conf.check_cfg(package='gio-2.0', uselib_store='GIO',
 	               atleast_version='2.26.0', args='--cflags --libs',
 	               mandatory=True)