17 files changed, 28 insertions, 50 deletions
diff --git a/application/basilisk/components/search/moz.build b/application/basilisk/components/search/moz.build
index aac3a838c4..b406d5f16d 100644
--- a/application/basilisk/components/search/moz.build
+++ b/application/basilisk/components/search/moz.build
@@ -4,4 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DIRS += ['service']
+
 JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/search/current/SearchStaticData.jsm b/application/basilisk/components/search/service/SearchStaticData.jsm
index de2be695c3..de2be695c3 100644
--- a/toolkit/components/search/current/SearchStaticData.jsm
+++ b/application/basilisk/components/search/service/SearchStaticData.jsm
diff --git a/toolkit/components/search/current/SearchSuggestionController.jsm b/application/basilisk/components/search/service/SearchSuggestionController.jsm
index 952838c0c5..952838c0c5 100644
--- a/toolkit/components/search/current/SearchSuggestionController.jsm
+++ b/application/basilisk/components/search/service/SearchSuggestionController.jsm
diff --git a/toolkit/components/search/orginal/moz.build b/application/basilisk/components/search/service/moz.build
index 4ca6790872..423faeffd5 100644
--- a/toolkit/components/search/orginal/moz.build
+++ b/application/basilisk/components/search/service/moz.build
@@ -4,28 +4,21 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-EXTRA_COMPONENTS += [
-    'nsSearchSuggestions.js',
-]
+DIST_SUBDIR = ''
 
-EXTRA_PP_COMPONENTS += [
-    'nsSearchService.js',
-]
+DEFINES['HAVE_SIDEBAR'] = True
 
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
-    DEFINES['HAVE_SIDEBAR'] = True
-    EXTRA_COMPONENTS += [
+EXTRA_COMPONENTS += [
+    'nsSearchSuggestions.js',
     'nsSidebar.js',
-    ]
-
-EXTRA_JS_MODULES += [
-    'SearchSuggestionController.jsm',
 ]
 
 EXTRA_PP_COMPONENTS += [
+    'nsSearchService.js',
     'toolkitsearch.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'SearchStaticData.jsm',
+    'SearchSuggestionController.jsm',
 ]
diff --git a/toolkit/components/search/current/nsSearchService.js b/application/basilisk/components/search/service/nsSearchService.js
index 2ea9384f5f..2ea9384f5f 100644
--- a/toolkit/components/search/current/nsSearchService.js
+++ b/application/basilisk/components/search/service/nsSearchService.js
diff --git a/toolkit/components/search/current/nsSearchSuggestions.js b/application/basilisk/components/search/service/nsSearchSuggestions.js
index a05d8b4b45..a05d8b4b45 100644
--- a/toolkit/components/search/current/nsSearchSuggestions.js
+++ b/application/basilisk/components/search/service/nsSearchSuggestions.js
diff --git a/toolkit/components/search/current/nsSidebar.js b/application/basilisk/components/search/service/nsSidebar.js
index 63976cba70..63976cba70 100644
--- a/toolkit/components/search/current/nsSidebar.js
+++ b/application/basilisk/components/search/service/nsSidebar.js
diff --git a/toolkit/components/search/current/toolkitsearch.manifest b/application/basilisk/components/search/service/toolkitsearch.manifest
index b7c55da0e9..b7c55da0e9 100644
--- a/toolkit/components/search/current/toolkitsearch.manifest
+++ b/application/basilisk/components/search/service/toolkitsearch.manifest
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 7173ca4e79..3f17bfb6d3 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -86,7 +86,9 @@ if CONFIG['MOZ_XUL']:
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     DIRS += ['filepicker']
 
-if CONFIG['MOZ_TOOLKIT_SEARCH']:
+if CONFIG['MOZ_TOOLKIT_SEARCH'] and not CONFIG['MC_BASILISK'] \
+                                and not CONFIG['HYPE_ICEWEASEL'] \
+                                and not CONFIG['HYPE_ICEDOVE']:
     DIRS += ['search']
 
 if CONFIG['MOZ_URL_CLASSIFIER']:
diff --git a/toolkit/components/search/orginal/SearchStaticData.jsm b/toolkit/components/search/SearchStaticData.jsm
index de2be695c3..de2be695c3 100644
--- a/toolkit/components/search/orginal/SearchStaticData.jsm
+++ b/toolkit/components/search/SearchStaticData.jsm
diff --git a/toolkit/components/search/orginal/SearchSuggestionController.jsm b/toolkit/components/search/SearchSuggestionController.jsm
index 0858974bfa..0858974bfa 100644
--- a/toolkit/components/search/orginal/SearchSuggestionController.jsm
+++ b/toolkit/components/search/SearchSuggestionController.jsm
diff --git a/toolkit/components/search/current/moz.build b/toolkit/components/search/current/moz.build
deleted file mode 100644
index 4ca6790872..0000000000
--- a/toolkit/components/search/current/moz.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_COMPONENTS += [
-    'nsSearchSuggestions.js',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'nsSearchService.js',
-]
-
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
-    DEFINES['HAVE_SIDEBAR'] = True
-    EXTRA_COMPONENTS += [
-    'nsSidebar.js',
-    ]
-
-EXTRA_JS_MODULES += [
-    'SearchSuggestionController.jsm',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'toolkitsearch.manifest',
-]
-
-EXTRA_JS_MODULES += [
-    'SearchStaticData.jsm',
-]
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build
index e19e70f183..2f8b3e54c2 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -4,7 +4,19 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if CONFIG['MC_BASILISK'] or CONFIG['HYPE_ICEWEASEL'] or CONFIG['HYPE_ICEDOVE']:
-    DIRS += ['current']
-else:
-    DIRS += ['orginal']
+EXTRA_COMPONENTS += ['nsSearchSuggestions.js']
+
+EXTRA_PP_COMPONENTS += [
+    'nsSearchService.js',
+    'toolkitsearch.manifest',
+]
+
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
+    DEFINES['HAVE_SIDEBAR'] = True
+    EXTRA_COMPONENTS += ['nsSidebar.js']
+
+EXTRA_JS_MODULES += [
+    'SearchStaticData.jsm',
+    'SearchSuggestionController.jsm',
+]
+
diff --git a/toolkit/components/search/orginal/nsSearchService.js b/toolkit/components/search/nsSearchService.js
index 760f13e72b..82f8d155a5 100644
--- a/toolkit/components/search/orginal/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -4556,4 +4556,4 @@ var engineUpdateService = {
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SearchService]);
 
-#include ../../../../toolkit/modules/debug.js
+#include ../../../toolkit/modules/debug.js
diff --git a/toolkit/components/search/orginal/nsSearchSuggestions.js b/toolkit/components/search/nsSearchSuggestions.js
index a05d8b4b45..a05d8b4b45 100644
--- a/toolkit/components/search/orginal/nsSearchSuggestions.js
+++ b/toolkit/components/search/nsSearchSuggestions.js
diff --git a/toolkit/components/search/orginal/nsSidebar.js b/toolkit/components/search/nsSidebar.js
index deb455734f..deb455734f 100644
--- a/toolkit/components/search/orginal/nsSidebar.js
+++ b/toolkit/components/search/nsSidebar.js
diff --git a/toolkit/components/search/orginal/toolkitsearch.manifest b/toolkit/components/search/toolkitsearch.manifest
index b7c55da0e9..b7c55da0e9 100644
--- a/toolkit/components/search/orginal/toolkitsearch.manifest
+++ b/toolkit/components/search/toolkitsearch.manifest