--- openldap-2.4.33-r1.ebuild	2013-01-08 15:06:38.948555257 -0500
+++ openldap-2.4.33-r2.ebuild	2013-01-08 15:25:43.064357843 -0500
@@ -439,9 +439,18 @@
 			einfo "Building contrib-module: smbk5pwd"
 			cd "${S}/contrib/slapd-modules/smbk5pwd"
 
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+			
 			emake \
-				DEFS="-DDO_SAMBA -DDO_KRB5 -DDO_SHADOW" \
-				KRB5_INC="$(krb5-config --cflags)" \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
 				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
 				|| die "emake smbk5pwd failed"
 		fi