From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 26 Nov 2017 03:04:46 +0000 (+1000)
Subject: bpo-11063: Handle uuid.h being in default include path (GH-4565)
X-Git-Tag: v3.7.0a3~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53efbf3977a44e382397e7994a2524b4f8c9d053;p=python

bpo-11063: Handle uuid.h being in default include path (GH-4565)

find_file() returns an empty list if it finds the requested
header on the standard include path, so header existence
checks need to be explicitly against "is not None".
---

diff --git a/setup.py b/setup.py
index 0678ddec41..c22de17f95 100644
--- a/setup.py
+++ b/setup.py
@@ -1680,12 +1680,11 @@ class PyBuildExt(build_ext):
 
         # Build the _uuid module if possible
         uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"])
-        if uuid_incs:
+        if uuid_incs is not None:
             if self.compiler.find_library_file(lib_dirs, 'uuid'):
                 uuid_libs = ['uuid']
             else:
                 uuid_libs = []
-        if uuid_incs:
             self.extensions.append(Extension('_uuid', ['_uuidmodule.c'],
                                    libraries=uuid_libs,
                                    include_dirs=uuid_incs))