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
  ........
................
diff --git a/setup.py b/setup.py
index 8670766..39f8840 100644
--- a/setup.py
+++ b/setup.py
@@ -979,8 +979,9 @@
                 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 = []