From: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
Subject: Use system library instead of internal static link
Last-Update: 2011-02-06
Index: rlvm-0.14/SConstruct
===================================================================
--- rlvm-0.14.orig/SConstruct
+++ rlvm-0.14/SConstruct
@@ -92,7 +92,9 @@ if os.path.exists('/proc'):
   cpus = len([l for l in open('/proc/cpuinfo') if l.startswith('processor\t')])
 else:
   cpus = 1
-env.SetOption('num_jobs', cpus + 1)
+if (cpus <= 0):
+  cpus = 1
+env.SetOption('num_jobs', cpus)
 
 # Use timestamps change, followed by MD5 for speed
 env.Decider('MD5-timestamp')
@@ -280,7 +282,7 @@ if not config.CheckGuichan():
 # Really optional libraries that jagarl's file loaders take advantage of if on
 # the system.
 config.CheckLibWithHeader('png', 'png.h', "cpp")
-config.CheckLibWithHeader('jpeg', 'jpeglib.h', "cpp")
+config.CheckLibWithHeader('jpeg', 'jconfig.h', "cpp")
 config.CheckLibWithHeader('mad', 'mad.h', "cpp")
 
 env = config.Finish()
Index: rlvm-0.14/SConscript.luarlvm
===================================================================
--- rlvm-0.14.orig/SConscript.luarlvm
+++ rlvm-0.14/SConscript.luarlvm
@@ -53,7 +53,7 @@ if env['BUILD_LUA_TESTS'] == True:
   test_env.Append(CPPPATH = [ "/usr/include/lua5.1" ] )
 
   # Build our included copy of luabind.
-  test_env.BuildSubcomponent("luabind")
+  test_env.ParseConfig ("pkg-config luabind --cflags --libs")
 
   test_env.RlvmProgram("lua_rlvm", ['test/lua_rlvm.cc', script_machine_files],
                        use_lib_set = ["SDL", "LUA"],