| Index: third_party/libxml/using_libxml.scons
|
| ===================================================================
|
| --- third_party/libxml/using_libxml.scons (revision 5775)
|
| +++ third_party/libxml/using_libxml.scons (working copy)
|
| @@ -8,28 +8,11 @@
|
|
|
| Import("env")
|
|
|
| -env.Append(
|
| - CPPPATH = [
|
| - '$LIBXML_DIR/include',
|
| - '$LIBXML_DIR/DerivedSources/include',
|
| - ],
|
| - CPPDEFINES = [
|
| - 'LIBXML_STATIC',
|
| - ],
|
| - LIBS = [
|
| - env['XML_LIB'],
|
| - ],
|
| -)
|
| -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
|
| -# Use of this source code is governed by a BSD-style license that can be
|
| -# found in the LICENSE file.
|
| +if env.WantSystemLib('libxml'):
|
| + env.Append(LIBS = ['xml2'])
|
| +else:
|
| + env.Append(LIBS = ['libxml'])
|
|
|
| -__doc__ = """
|
| -Settings for other components using the libxml library.
|
| -"""
|
| -
|
| -Import("env")
|
| -
|
| env.Append(
|
| CPPPATH = [
|
| '$LIBXML_DIR/include',
|
| @@ -38,7 +21,4 @@
|
| CPPDEFINES = [
|
| 'LIBXML_STATIC',
|
| ],
|
| - LIBS = [
|
| - env['XML_LIB'],
|
| - ],
|
| )
|
|
|