From 775bc4f682981f2fa95d255ad5bb3ede735f557f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 20 Feb 2006 15:36:45 +0000 Subject: r13567: merge for 3.0.21c svn merge -r13559:13563 $SVNURL/branches/SAMBA_3_0 svn merge -r13557:13559 $SVNURL/branches/SAMBA_3_0 svn merge -r13546:13547 $SVNURL/branches/SAMBA_3_0 svn merge -r13198:13202 $SVNURL/branches/SAMBA_3_0 svn merge -r13209:13211 $SVNURL/branches/SAMBA_3_0 svn merge -r13216:13222 $SVNURL/branches/SAMBA_3_0 svn merge -r13224:13229 $SVNURL/branches/SAMBA_3_0 svn merge -r13231:13232 $SVNURL/branches/SAMBA_3_0 svn merge -r13235:13238 $SVNURL/branches/SAMBA_3_0 svn merge -r13238:13257 $SVNURL/branches/SAMBA_3_0 svn merge -r13257:13262 $SVNURL/branches/SAMBA_3_0 svn merge -r13288:13290 $SVNURL/branches/SAMBA_3_0 svn merge -r13294:13296 $SVNURL/branches/SAMBA_3_0 svn merge -r13299:13306 $SVNURL/branches/SAMBA_3_0 svn merge -r13310:13314 $SVNURL/branches/SAMBA_3_0 svn merge -r13322:13327 $SVNURL/branches/SAMBA_3_0 svn merge -r13351:13363 $SVNURL/branches/SAMBA_3_0 svn merge -r13363:13364 $SVNURL/branches/SAMBA_3_0 svn merge -r13364:13366 $SVNURL/branches/SAMBA_3_0 svn merge -r13375:13376 $SVNURL/branches/SAMBA_3_0 svn merge -r13382:13384 $SVNURL/branches/SAMBA_3_0 svn merge -r13391:13392 $SVNURL/branches/SAMBA_3_0 svn merge -r13392:13393 $SVNURL/branches/SAMBA_3_0 svn merge -r13393:13394 $SVNURL/branches/SAMBA_3_0 svn merge -r13407:13408 $SVNURL/branches/SAMBA_3_0 svn merge -r13410:13411 $SVNURL/branches/SAMBA_3_0 svn merge -r13412:13416 $SVNURL/branches/SAMBA_3_0 svn merge -r13416:13417 $SVNURL/branches/SAMBA_3_0 svn merge -r13460:13473 $SVNURL/branches/SAMBA_3_0 svn merge -r13475:13477 $SVNURL/branches/SAMBA_3_0 svn merge -r13484:13489 $SVNURL/branches/SAMBA_3_0 svn merge -r13489:13491 $SVNURL/branches/SAMBA_3_0 svn merge -r13495:13497 $SVNURL/branches/SAMBA_3_0 svn merge -r13497:13498 $SVNURL/branches/SAMBA_3_0 svn merge -r13498:13500 $SVNURL/branches/SAMBA_3_0 svn merge -r13510:13511 $SVNURL/branches/SAMBA_3_0 svn merge -r13513:13514 $SVNURL/branches/SAMBA_3_0 svn merge -r13515:13517 $SVNURL/branches/SAMBA_3_0 svn merge -r13523:13524 $SVNURL/branches/SAMBA_3_0 svn merge -r13524:13525 $SVNURL/branches/SAMBA_3_0 svn merge -r13525:13526 $SVNURL/branches/SAMBA_3_0 svn merge -r13526:13527 $SVNURL/branches/SAMBA_3_0 svn merge -r13527:13535 $SVNURL/branches/SAMBA_3_0 --- source/python/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/python/setup.py') diff --git a/source/python/setup.py b/source/python/setup.py index ffdafd70877..ce417710b30 100755 --- a/source/python/setup.py +++ b/source/python/setup.py @@ -63,9 +63,9 @@ for lib in string.split(samba_libs): next_is_flag = 0; elif lib == "-Wl,-rpath": next_is_path = 1; - elif lib[0:2] in ("-l"): + elif lib[0:2] == ("-l"): libraries.append(lib[2:]) - elif lib[0:8] in ("-pthread"): + elif lib[0:8] == ("-pthread"): pass # Skip linker flags elif lib[0:2] == "-L": library_dirs.append(lib[2:]) -- cgit