Merge pull request python-ldap#46 – Don't define search path for includes and libs

encukou · web-flow · commit 0ec9b74896f1 · 2017-11-29T15:12:29.000+01:00
python-ldap#46
diff --git a/Modules/LDAPObject.c b/Modules/LDAPObject.c
@@ -13,11 +13,7 @@
 #include "options.h"
 
 #ifdef HAVE_SASL
-#ifdef __APPLE__
 #include <sasl/sasl.h>
-#else
-#include <sasl.h>
-#endif
 #endif
 
 static void free_attrs(char***, PyObject*);
diff --git a/setup.cfg b/setup.cfg
@@ -5,9 +5,10 @@
 # for wrapping OpenLDAP 2 libs
 [_ldap]
 
-# Define extra include and library dirs if needed
-library_dirs = /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64
-include_dirs = /usr/include /usr/include/sasl /usr/local/include /usr/local/include/sasl
+# Define extra include and library dirs if needed. distutils adds non
+# standard library_dirs as rpath.
+# library_dirs = /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64
+# include_dirs = /usr/include /usr/local/include
 
 # These defines needs OpenLDAP built with
 # ./configure --with-cyrus-sasl --with-tls
