1) Add support for dirsec-nspr and dirsec-nss to nspr.m4 and nss.m4 2) Add support for mozldap6 - use mozldap6 if available, otherwise, use mozldap 3) Add support to get svrcore-devel from pkg-config, or look for system svrcore-devel The configure diffs are omitted for brevity
Created attachment 138851 [details] diffs for fix
The changes look good, but I have one minor comment. The current build will not work with the plain "mozldap" package since Makefile.am is trying to link with the "60" libraries. There is also the fact that we are now using the new ber types that were introduced in mozldap6 throughout the server code. Do we even need to check for the plain "mozldap" package?
I think you're right. The server code is not backwards compatible, and we will have to have the mozldap6 package name for quite some time so as not to conflict with any mozldap (v5.17) packages which may have been released as part of cs or fortitude.
Created attachment 138881 [details] new diffs This version omits checking for the mozldap pkgconfig package, and only checks for mozldap6. In addition to this, we explicitly check the ldap c sdk vendor version in mozldap.m4 to catch potential problems with unsupported versions at configure time.
Looks good.
Reviewed by: nkinder (Thanks!) Files: see diff Branch: HEAD Fix Description: Look for the dirsec-nspr and dirsec-nss if nspr and nss are not found in pkg-config. Look for mozldap6 then mozldap in pkg-config. Look for svrcore-devel in pkg-config, then look for it in the system directories. Nathan pointed out that we do not support mozldap v5.x anymore, so we should just look for mozldap6 with pkg-config. I also added an explicit check of the vendor version in the header file to make sure we are using 600 or greater. Platforms tested: RHEL4 Flag Day: no Doc impact: no Checking in configure; /cvs/dirsec/ldapserver/configure,v <-- configure new revision: 1.3; previous revision: 1.2 done Checking in m4/mozldap.m4; /cvs/dirsec/ldapserver/m4/mozldap.m4,v <-- mozldap.m4 new revision: 1.2; previous revision: 1.1 done Checking in m4/nspr.m4; /cvs/dirsec/ldapserver/m4/nspr.m4,v <-- nspr.m4 new revision: 1.2; previous revision: 1.1 done Checking in m4/nss.m4; /cvs/dirsec/ldapserver/m4/nss.m4,v <-- nss.m4 new revision: 1.2; previous revision: 1.1 done Checking in m4/svrcore.m4; /cvs/dirsec/ldapserver/m4/svrcore.m4,v <-- svrcore.m4 new revision: 1.2; previous revision: 1.1 done
The current build seems to support mozldap6 and srvcore just fine. Verified aginst: 1196978446 redhat-ds-base-8.0.0-11.el5dsrv Thu Dec 06 2007 1196978448 redhat-ds-admin-8.0.0-1.15.el5dsrv Thu Dec 06 2007 1196978450 redhat-ds-console-8.0.0-8.el5dsrv Thu Dec 06 2007 1196978451 redhat-admin-console-8.0.0-9.el5dsrv Thu Dec 06 2007