Fix dependency rules for in-tree mkdepend.

Force solaris to use in-tree mkdepend since their system makedepend up to at least solaris 7 causes the build times to more than double with the new non-compiler dependency scheme.

config/config.mk

@@ -411,6 +411,9 @@ MKDEPEND	= $(MOZ_NATIVE_MAKEDEPEND)
 else
 MKDEPEND_DIR	= $(DEPTH)/config/mkdepend
 MKDEPEND	= $(MKDEPEND_DIR)/mkdepend
+ifndef COMPILER_DEPEND
+MKDEPEND_BUILTIN = $(MKDEPEND_DIR)/mkdepend
+endif
 endif
 
 MKDEPENDENCIES	= depend.mk

config/rules.mk

@@ -1268,15 +1268,9 @@ endif
 else
 
 ifndef MOZ_NATIVE_MAKEDEPEND
-$(MKDEPEND):
-	cd $(DEPTH)/config; $(MAKE) nsinstall
-	cd $(MKDEPEND_DIR); $(MAKE)
-endif
-
-ifndef MOZ_NATIVE_MAKEDEPEND
-MKDEPEND_BUILTIN	= $(MKDEPEND)
-else
-MKDEPEND_BUILTIN	=
+$(MKDEPEND_BUILTIN):
+	$(MAKE) -C $(DEPTH)/config nsinstall
+	$(MAKE) -C $(MKDEPEND_DIR) mkdepend
 endif
 
 endif # ! COMPILER_DEPEND

configure.in

@@ -994,6 +994,7 @@ dnl the qsort routine under solaris is faulty
 *-solaris*) 
     AC_DEFINE(BROKEN_QSORT)
     TARGET_NSPR_MDCPUCFG='\"md/_solaris32.cfg\"'
+    SYSTEM_MAKEDEPEND=
     if test -z "$GNU_CC"; then
        AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
        LDFLAGS='-xildoff'