Index: third_party/libjpeg/libjpeg.scons |
=================================================================== |
--- third_party/libjpeg/libjpeg.scons (revision 5550) |
+++ third_party/libjpeg/libjpeg.scons (working copy) |
@@ -32,6 +32,9 @@ |
env = env.Clone() |
+if env.WantSystemLib('libjpeg'): |
+ Return() |
+ |
env.Prepend( |
CPPPATH = [ |
'$CHROME_SRC_DIR', |
Property changes on: third_party/libjpeg/libjpeg.scons |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/third_party/libjpeg/SConscript:r69-2775 |