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

diff --git a/Misc/NEWS b/Misc/NEWS
index 7e7b060515c799608484128fb43a734921da1830..4480d7e09acf066d8d5273c94d4f4a3c987ddaf9 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -124,6 +124,9 @@ Library
 Build
 -----
 
+- Issue #7589: Only build the nis module when the correct header files are
+  found.
+
 - Switch to OpenSSL 0.9.8l on Windows.
 
 - Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it

diff --git a/setup.py b/setup.py
index f2540584882127449044e1883b6f3b0b52ee1e34..dc46015def6280e957b6b87199fd1d9b0b47625f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1065,7 +1065,7 @@ 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 platform not in ['cygwin', 'atheos', 'qnx6'] and find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None:
                 if (self.compiler.find_library_file(lib_dirs, 'nsl')):
                     libs = ['nsl']
                 else: