[Python-checkins] r77129 - in python/branches/py3k: Misc/NEWS setup.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Dec 30 04:02:03 2009
New Revision: 77129

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/setup.py

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Wed Dec 30 04:02:03 2009
@@ -504,6 +504,9 @@
 Build
 -----
 
+- Issue #7589: Only build the nis module when the correct header files are
+  found.
+
 - Switch to OpenSSL 0.9.8l on Windows.
 
 - Issue #5792: Extend the short float repr support to x86 systems using

Modified: python/branches/py3k/setup.py
==============================================================================
--- python/branches/py3k/setup.py	(original)
+++ python/branches/py3k/setup.py	Wed Dec 30 04:02:03 2009
@@ -972,7 +972,7 @@
             exts.append( Extension('resource', ['resource.c']) )
 
             # Sun yellow pages. Some systems have the functions in libc.
-            if platform not in ['cygwin', 'qnx6']:
+            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: