From: Alain S. <asp...@gm...> - 2007-05-31 23:26:58
|
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 |
From: <mi...@st...> - 2007-06-01 10:00:30
|
Alain Spineux wrote: > > 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. Alain, this seems to make sense. But are you sure that it's valid for all versions of Cyrus-SASL? I'd love to accept this change but I wonder whether it will break older installations. Note that you can correct the current include-statement by tweaking setup.cfg. But not the other way. In OpenLDAP sources the following construct is used: #ifdef HAVE_SASL_SASL_H #include <sasl/sasl.h> #else #include <sasl.h> #endif I guess HAVE_SASL_SASL_H is set by autoconf though. Ciao, Michael. |
From: Alain S. <asp...@gm...> - 2007-06-01 11:19:34
|
On 6/1/07, Michael Str=F6der <mi...@st...> wrote: > > Alain Spineux wrote: > > > > 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 =3D /usr/local/openldap- 2.3/lib > >> include_dirs =3D /usr/local/openldap-2.3/include /usr/include/sasl > > > > into > > > >> library_dirs =3D /usr/local/openldap-2.3/lib > >> include_dirs =3D /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. > > Alain, this seems to make sense. But are you sure that it's valid for > all versions of Cyrus-SASL? I No :-( I looked postfix sources and found about SASL 1.5.5 On some systems this generates the necessary Makefile definitions: (for SASL version 1.5.5): % make tidy # if you have left-over files from a previous build % make makefiles CCARGS=3D"-DUSE_SASL_AUTH -I/usr/local/include" \ AUXLIBS=3D"-L/usr/local/lib -lsasl" (for SASL version 2.1.1): % make tidy # if you have left-over files from a previous build % make makefiles CCARGS=3D"-DUSE_SASL_AUTH -I/usr/local/include/sasl" \ AUXLIBS=3D"-L/usr/local/lib -lsasl2" 'd love to accept this change but I wonder > whether it will break older installations. This is what I worry about. Note that you can correct the > current include-statement by tweaking setup.cfg. But not the other way. > > In OpenLDAP sources the following construct is used: > > #ifdef HAVE_SASL_SASL_H > #include <sasl/sasl.h> > #else > #include <sasl.h> > #endif > > I guess HAVE_SASL_SASL_H is set by autoconf though. Yes I saw that. Keep the idea in your mind, and a day, if you use like me a "tree rooted" system like openpkg, don't replace the current /usr/include/sasl with /openpkg/include/sasl/sasl.h, just apply my patch :-) Ciao, Michael. > Regards. Alain -- Alain Spineux aspineux gmail com May the sources be with you |
From: <mi...@st...> - 2007-06-04 05:37:13
|
Alain Spineux wrote: > > On 6/1/07, *Michael Ströder* <mi...@st... > <mailto:mi...@st...>> wrote: > > Alain Spineux wrote: > > > > May I suggest to change (in file LDAPObject.c ) > >> #include <sasl.h> > > into > >> #include <sasl/sasl.h> > > Alain, this seems to make sense. But are you sure that it's valid for > all versions of Cyrus-SASL? I > > No :-( So let's keep it as it is. Ciao, Michael. |
From: Alain S. <asp...@gm...> - 2007-06-04 11:30:53
|
On 6/3/07, Michael Str=F6der <mi...@st...> wrote: > > Alain Spineux wrote: > > > > Alain, this seems to make sense. But are you sure that it's valid > for > > all versions of Cyrus-SASL? I > > > > No :-( > > So let's keep it as it is. Right. Ciao, Michael. > > Regards --=20 -- Alain Spineux aspineux gmail com May the sources be with you |