263928, 263412 - define default distribution ID in configure.in, not in nsISS for better availability/reliability. r=vlad

configure.in

@@ -3476,6 +3476,10 @@ MOZ_ARG_WITH_STRING(distribution-id,
 [ val=`echo $withval`
     MOZ_DISTRIBUTION_ID="$val"])
 
+if test -z "$MOZ_DISTRIBUTION_ID"; then
+   MOZ_DISTRIBUTION_ID="org.mozilla"
+fi
+
 AC_DEFINE_UNQUOTED(MOZ_DISTRIBUTION_ID,"$MOZ_DISTRIBUTION_ID")
 AC_SUBST(MOZ_DISTRIBUTION_ID)
 

xpfe/components/search/src/nsInternetSearchService.cpp

@@ -112,10 +112,6 @@
 #define INTL_PROPERTIES "chrome://navigator/locale/navigator.properties"
 #endif
 
-#ifndef MOZ_DISTRIBUTION_ID
-#define MOZ_DISTRIBUTION_ID "org.mozilla"
-#endif
-
 static NS_DEFINE_CID(kRDFServiceCID,               NS_RDFSERVICE_CID);
 static NS_DEFINE_CID(kRDFContainerCID,             NS_RDFCONTAINER_CID);
 static NS_DEFINE_CID(kRDFContainerUtilsCID,        NS_RDFCONTAINERUTILS_CID);