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 368cec651a2de5e14ef174692efe6fc3b6aefa23..4724ae587d701de548ea05d51c34cc1275202f71 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -504,6 +504,9 @@ Extension Modules
 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

diff --git a/setup.py b/setup.py
index 9ea4e67d60546c76c53ff59ac6c03cc5ef42d76d..04305de3355d76d42b59976368ce15fe740835ea 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -972,7 +972,7 @@ class PyBuildExt(build_ext):
             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: