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.12/SConstruct
===================================================================
--- rlvm-0.12.orig/SConstruct	2011-07-20 11:54:10.271612181 +0800
+++ rlvm-0.12/SConstruct	2011-07-20 11:54:46.371388822 +0800
@@ -82,7 +82,9 @@
   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')
@@ -262,7 +264,7 @@
 # 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.12/SConscript.luarlvm
===================================================================
--- rlvm-0.12.orig/SConscript.luarlvm	2011-07-20 11:51:40.871145714 +0800
+++ rlvm-0.12/SConscript.luarlvm	2011-07-20 11:54:46.375387505 +0800
@@ -52,7 +52,7 @@
   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("luaRlvm", ['test/luaRlvm.cpp', script_machine_files],
                        use_lib_set = ["SDL", "LUA"],