From f9a6dab7931db9118b6f3f93cb2c6bdc51679d23 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 30 Dec 2009 03:06:54 +0000 Subject: [PATCH] Merged revisions 77129,77132 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77129 | benjamin.peterson | 2009-12-29 21:02:03 -0600 (Tue, 29 Dec 2009) | 9 lines Merged revisions 77128 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77128 | benjamin.peterson | 2009-12-29 20:58:50 -0600 (Tue, 29 Dec 2009) | 1 line only build the nis module when the headers are found #7589 ........ ................ r77132 | benjamin.peterson | 2009-12-29 21:03:54 -0600 (Tue, 29 Dec 2009) | 9 lines Merged revisions 77130 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77130 | benjamin.peterson | 2009-12-29 21:02:34 -0600 (Tue, 29 Dec 2009) | 1 line wrap long line ........ ................ --- Misc/NEWS | 3 +++ setup.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 6bcae0afbb2..c3bbb64c054 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -403,6 +403,9 @@ Extension Modules Build ----- +- Issue #7589: Only build the nis module when the correct header files are + found. + - Issue 4601: 'make install' did not set the appropriate permissions on directories. diff --git a/setup.py b/setup.py index 86707664a18..39f884081e9 100644 --- a/setup.py +++ b/setup.py @@ -979,8 +979,9 @@ class PyBuildExt(build_ext): missing.append('resource') # Sun yellow pages. Some systems have the functions in libc. - if platform not in ['cygwin', 'atheos', 'qnx6']: - if (self.compiler.find_library_file(lib_dirs, 'nsl')): + if (platform not in ['cygwin', 'qnx6'] and + find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): + if (self.compiler_obj.find_library_file(lib_dirs, 'nsl')): libs = ['nsl'] else: libs = []