adium 2258:b2753e931a95: Enable Kerberos support on Snow Leopard...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/b2753e931a95
revision:	2258:b2753e931a95
author:		Ryan Govostes
date:		Wed May 20 18:33:09 2009 -0400

Enable Kerberos support on Snow Leopard, but keep it disabled under Leopard.
Subject: adium 2259:9da149b81c6c: Um, I need to commit the merge, David sez.

details:	http://hg.adium.im/adium/rev/9da149b81c6c
revision:	2259:9da149b81c6c
author:		Ryan Govostes
date:		Wed May 20 18:37:26 2009 -0400

Um, I need to commit the merge, David sez.

diffstat:

 Dependencies/build.sh                             |  17 +++++++++++++----
 Frameworks/Adium Framework/Source/AIContactMenu.m |   4 ++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 95fc122f62c3 -r 9da149b81c6c Dependencies/build.sh
--- a/Dependencies/build.sh	Wed May 20 16:57:28 2009 -0400
+++ b/Dependencies/build.sh	Wed May 20 18:37:26 2009 -0400
@@ -444,6 +444,17 @@
 	PROTOCOLS="bonjour,facebook,gg,irc,jabber,msn,myspace,novell,oscar,qq,"
 	PROTOCOLS+="sametime,simple,yahoo,zephyr"
 	
+	# Leopard's 64-bit Kerberos library is missing symbols, as evidenced by
+	#    $ nm -arch x86_64 /usr/lib/libkrb4.dylib | grep krb_rd_req
+	# So, only enable it on Snow Leopard
+	if [ "$(sysctl -b kern.osrelease | awk -F '.' '{ print $1}')" -ge 10 ]; then
+		KERBEROS="--with-krb4"
+	else
+		warning "Kerberos support is disabled."
+		KERBEROS=""
+	fi
+		
+	
 	if needsconfigure $@; then
 		status "Configuring libpurple"
 		CFLAGS="$FLAGS -I/usr/include/kerberosIV \
@@ -476,10 +487,8 @@
 				--disable-avahi \
 				--disable-dbus \
 				--enable-gnutls=no \
-				--enable-nss=no
-				
-		# I disabled Kerberos support since 10.5's 64-bit Kerberos framework is
-		# missing some stuff.
+				--enable-nss=no \
+				"$KERBEROS"
 	fi
 	
 	status "Building and installing libpurple"
diff -r 95fc122f62c3 -r 9da149b81c6c Frameworks/Adium Framework/Source/AIContactMenu.m
--- a/Frameworks/Adium Framework/Source/AIContactMenu.m	Wed May 20 16:57:28 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIContactMenu.m	Wed May 20 18:37:26 2009 -0400
@@ -288,6 +288,10 @@
 			[menuItem setImage:[self imageForListObject:listObject usingUserIcon:shouldUseUserIcon]];
 		}
 		
+		if (!(shouldUseDisplayName ? listObject.displayName : listObject.formattedUID)) {
+			NSLog(@"%@ nil? sUDN = %d, dN = %@, fUID = %@", listObject, shouldUseDisplayName, listObject.displayName, listObject.formattedUID);
+		}
+		
 		[menuItem setTitle:(shouldUseDisplayName ? listObject.displayName : listObject.formattedUID)];
 		[menuItem setToolTip:(shouldSetTooltip ? [listObject.statusMessage string] : nil)];