diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-11 18:40:27 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-11 16:00:38 +0200 |
| commit | c5a58c3ea708c274b11aac76e37c9f823a8579f1 (patch) | |
| tree | 975f47fa7d29645da7f8a0d5c0b8f7130d8d7a61 /buildtools/wafsamba/samba3.py | |
| parent | d271bf8dc2d37453e84ceea86a5cc70bef22d6d7 (diff) | |
| download | samba-c5a58c3ea708c274b11aac76e37c9f823a8579f1.tar.gz samba-c5a58c3ea708c274b11aac76e37c9f823a8579f1.tar.bz2 samba-c5a58c3ea708c274b11aac76e37c9f823a8579f1.zip | |
build: use include paths for pkg-config found libraries
Diffstat (limited to 'buildtools/wafsamba/samba3.py')
| -rw-r--r-- | buildtools/wafsamba/samba3.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index afdf99ae0b..dc23065905 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -60,32 +60,32 @@ def s3_fix_kwargs(bld, kwargs): if bld.CONFIG_SET('BUILD_TDB2'): if bld.CONFIG_SET('USING_SYSTEM_TDB2'): - (tdb2_includes, tdb2_ldflags) = library_flags(bld, 'tdb') - extra_includes += tdb2_includes + (tdb2_includes, tdb2_ldflags, tdb2_cpppath) = library_flags(bld, 'tdb') + extra_includes += tdb2_cpppath else: extra_includes += [ '../lib/tdb2' ] else: if bld.CONFIG_SET('USING_SYSTEM_TDB'): - (tdb_includes, tdb_ldflags) = library_flags(bld, 'tdb') - extra_includes += tdb_includes + (tdb_includes, tdb_ldflags, tdb_cpppath) = library_flags(bld, 'tdb') + extra_includes += tdb_cpppath else: extra_includes += [ '../lib/tdb/include' ] if bld.CONFIG_SET('USING_SYSTEM_TEVNT'): - (tevent_includes, tevent_ldflags) = library_flags(bld, 'tevent') - extra_includes += tevent_includes + (tevent_includes, tevent_ldflags, tevent_cpppath) = library_flags(bld, 'tevent') + extra_includes += tevent_cpppath else: extra_includes += [ '../lib/tevent' ] if bld.CONFIG_SET('USING_SYSTEM_TALLOC'): - (talloc_includes, talloc_ldflags) = library_flags(bld, 'talloc') - extra_includes += talloc_includes + (talloc_includes, talloc_ldflags, talloc_cpppath) = library_flags(bld, 'talloc') + extra_includes += talloc_cpppath else: extra_includes += [ '../lib/talloc' ] if bld.CONFIG_SET('USING_SYSTEM_POPT'): - (popt_includes, popt_ldflags) = library_flags(bld, 'popt') - extra_includes += popt_includes + (popt_includes, popt_ldflags, popt_cpppath) = library_flags(bld, 'popt') + extra_includes += popt_cpppath else: extra_includes += [ '../lib/popt' ] |