Bug 209538

Created attachment 137871 [details]
diffs for fix

It may not be necessary to think of this possibility, but if there are multiple
versions of LDAP C SDK accidentally installed in $LDAPSDKLIBDIR, e.g.,
libldap50.so, and libldap60.so, then libldap50.so would be picked up first and
it sets ldapsdk_ver=50...  I think it'd be nice if we can do it with the
descendant order (or pick up the higher number?)

+if test -z "$ldapsdk_ver" ; then
+   # figure out version of ldapsdk
+    for file in $LDAPSDKLIBDIR/libldap??.so* ; do
+        case $file in
+        *libldap60.so*) ldapsdk_ver=60 ;;
+        *) ldapsdk_ver=50 ;;
+        esac
+        break
+    done   
+fi
+

Created attachment 137879 [details]
new diffs

Thanks Noriko.	Here are the new diffs.  If it finds 60 libs, it breaks out of
the for loop.  Otherwise, it keeps looking for 50 libs.

Looks cool!

Created attachment 137881 [details]
cvs commit log

Reviewed by: nhosoi (Thanks!)
Files: see diff
Branch: HEAD
Fix Description: If there is a mozldap6 package on the system, assume
the lib suffix is 60, otherwise, 50.  If no mozldap package is on the
system, look for libldap60.so* in the given ldapsdk_lib directory.  If
found, assume 60, otherwise, 50.
There were also a few problems with the way we were looking for ICU,
mostly copy/paste errors, but one was that pkg-config does not have an
icu package on some systems, so you have to use icu-config instead.
Noriko pointed out that if both 50 and 60 libs are in the same dir, the 50 libs
will be selected first - we want 60 libs to have preference. The new diffs will
select 60 libs if found, or 50 libs if not.
Platforms tested: FC5
Flag Day: no
Doc impact: no

Changed QA Whiteboard to to_be_verified_by_dev.

We are currently building adminserver (which builds mod_admserv) using mozldap
version 6 as the default across numerous platforms, even if mozldap 5 is on the
system.  Marking as verified.