From 2cabbcfc5a81a3e9a08ef9e46aecd8421623273e Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 30 Dec 2009 03:02:39 +0000 Subject: 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 ........ --- Misc/NEWS | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 7e7b060..4480d7e 100644 --- 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 f254058..dc46015 100644 --- 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: -- cgit v0.12