patch: change sasl.h into sasl/sasl.h

[Alain Spineux]

Hello

May I suggest to change (in file LDAPObject.c )

> #include <sasl.h>

into

> #include <sasl/sasl.h>

That way you can change (in file setup.cfg)

>  library_dirs = /usr/local/openldap-2.3/lib
>  include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl

into

>  library_dirs = /usr/local/openldap-2.3/lib
>  include_dirs = /usr/local/openldap-2.3/include

That way gcc will use its own header location and not use the
one installed in /usr/include/sasl by any linux distribution
This is useful when having multiple version of gcc ...

That way on my own system I don't need tu update setup.cfg.
I hope this will do the same for lot of other user.
I looked in cyrus-imapd source, all files use <sasl/sasl.h> !


Here is the patch

Best regards.

Alain


diff -r -c python-ldap-2.3.orig/Modules/LDAPObject.c python-ldap-2.3
/Modules/LDAPObject.c
*** python-ldap-2.3.orig/Modules/LDAPObject.c   Tue Mar 27 22:34:31 2007
--- python-ldap-2.3/Modules/LDAPObject.c        Fri Jun  1 01:01:50 2007
***************
*** 18,24 ****
  #include "options.h"

  #ifdef HAVE_SASL
! #include <sasl.h>
  #endif

  static void free_attrs(char***);
--- 18,24 ----
  #include "options.h"

  #ifdef HAVE_SASL
! #include <sasl/sasl.h>
  #endif

  static void free_attrs(char***);
diff -r -c python-ldap-2.3.orig/setup.cfg python-ldap-2.3/setup.cfg
*** python-ldap-2.3.orig/setup.cfg      Wed Nov 15 18:26:26 2006
--- python-ldap-2.3/setup.cfg   Fri Jun  1 01:02:04 2007
***************
*** 8,14 ****
  [_ldap]

  library_dirs = /usr/local/openldap-2.3/lib
! include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl

  extra_compile_args =
  extra_objects =
--- 8,14 ----
  [_ldap]

  library_dirs = /usr/local/openldap-2.3/lib
! include_dirs = /usr/local/openldap-2.3/include

  extra_compile_args =
  extra_objects =


-- 
--
Alain Spineux
aspineux gmail com
May the sources be with you
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-ldap/attachments/20070601/c9980ea5/attachment.html>