diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2017-10-19 00:24:52 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2017-11-23 19:54:48 -0800 |
commit | 11fbc982d3fcb95b6774e0af6cc7d506fe876dc0 (patch) | |
tree | 7a2b2ec2af0797d53cdce435f9c83fad444ff65f /mesonbuild/dependencies/base.py | |
parent | a2f31821723d1e7bd445b73c58ec733c199be9d2 (diff) | |
download | meson-11fbc982d3fcb95b6774e0af6cc7d506fe876dc0.zip meson-11fbc982d3fcb95b6774e0af6cc7d506fe876dc0.tar.gz meson-11fbc982d3fcb95b6774e0af6cc7d506fe876dc0.tar.bz2 |
Use ConfigToolDependency for pcap
Diffstat (limited to 'mesonbuild/dependencies/base.py')
-rw-r--r-- | mesonbuild/dependencies/base.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 46d0a99..3dcb41a 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -46,8 +46,6 @@ class DependencyMethods(Enum): QMAKE = 'qmake' # Just specify the standard link arguments, assuming the operating system provides the library. SYSTEM = 'system' - # Detect using pcap-config - PCAPCONFIG = 'pcap-config' # Detect using libwmf-config LIBWMFCONFIG = 'libwmf-config' # This is only supported on OSX - search the frameworks directory by name. @@ -59,6 +57,7 @@ class DependencyMethods(Enum): # For backewards compatibility SDLCONFIG = 'sdlconfig' CUPSCONFIG = 'cups-config' + PCAPCONFIG = 'pcap-config' class Dependency: @@ -78,7 +77,8 @@ class Dependency: # This sets per-too config methods which are deprecated to to the new # generic CONFIG_TOOL value. - if method in [DependencyMethods.SDLCONFIG, DependencyMethods.CUPSCONFIG]: + if method in [DependencyMethods.SDLCONFIG, DependencyMethods.CUPSCONFIG, + DependencyMethods.PCAPCONFIG]: mlog.warning(textwrap.dedent("""\ Configuration method {} has been deprecated in favor of 'config-tool'. This will be removed in a future version of |