Tweak Mac build system to make nsLDAPAutoCompleteSession.cpp and friends compile when "options ldap" is on (bug 70933). r=peterv@netscape.com, sr=smfr@netscape.com.

build/mac/build_scripts/Moz/BuildFlags.pm

@@ -224,7 +224,8 @@ sub SetOptionDefines($)
   $optiondefines->{"lowmem"}{"MOZ_MAC_LOWMEM"} = 1;
   $optiondefines->{"ldap_experimental"}{"MOZ_LDAP_XPCOM_EXPERIMENTAL"} = 1;
   $optiondefines->{"useimg2"}{"USE_IMG2"}     = 1;
-  $optiondefines->{"bidi"}{"IBMBIDI"}     = 1;
+  $optiondefines->{"bidi"}{"IBMBIDI"}         = 1;
+  $optiondefines->{"ldap"}{"MOZ_LDAP_XPCOM"}  = 1;
 }
 
 

build/mac/build_scripts/MozillaBuildList.pm

@@ -837,9 +837,10 @@ sub BuildClientDist()
     #LDAP
     if ($main::options{ldap})
     {
-        InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST",      "$distdirectory:directory:");
-        InstallFromManifest(":mozilla:directory:xpcom:base:public:MANIFEST",       "$distdirectory:directory:");
-        InstallFromManifest(":mozilla:directory:xpcom:base:public:MANIFEST_IDL",   "$distdirectory:idl:");
+        InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST",      		"$distdirectory:directory:");
+        InstallFromManifest(":mozilla:directory:xpcom:base:public:MANIFEST",       		"$distdirectory:directory:");
+        InstallFromManifest(":mozilla:directory:xpcom:base:public:MANIFEST_IDL",   		"$distdirectory:idl:");
+        InstallFromManifest(":mozilla:xpfe:component:autocomplete:public:MANIFEST_IDL",	"$distdirectory:idl:");
     }
 
     #XMLEXTRAS
@@ -1123,6 +1124,7 @@ sub BuildIDLProjects()
     if ($main::options{ldap})
     {
         BuildIDLProject(":mozilla:directory:xpcom:macbuild:mozldapIDL.mcp", "mozldap");
+        BuildIDLProject(":mozilla:xpfe:components:autocomplete:macbuild:ldapAutoCompleteIDL.mcp", "ldapAutoComplete");
     }
 
     if ($main::options{xmlextras})

xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp

@@ -21,6 +21,16 @@
  *
  */
 
+
+// Work around lack of conditional build logic in codewarrior's
+// build system.  The MOZ_LDAP_XPCOM preprocessor symbol is only 
+// defined on Mac because noone else needs this weirdness; thus 
+// the XP_MAC check first.  This conditional encloses the entire
+// file, so that in the case where the ldap option is turned off
+// in the mac build, a dummy (empty) object will be generated.
+//
+#if !defined(XP_MAC) || defined(MOZ_LDAP_XPCOM)
+
 #include "nsLDAPAutoCompleteSession.h"
 #include "nsIComponentManager.h"
 #include "nsIConsoleService.h"
@@ -1017,3 +1027,5 @@ nsLDAPAutoCompleteSession::SetServerURL(nsILDAPURL * aServerURL)
 
     return NS_OK;
 }
+
+#endif