Bug 1257434 - Move --enable-dmd to moz.configure. r=ted

build/moz.configure/init.configure

@@ -260,6 +260,7 @@ def wanted_mozconfig_variables(help):
          'MOZ_ARTIFACT_BUILDS',
          'MOZ_BUILD_APP',
          'MOZ_CALLGRIND',
+         'MOZ_DMD',
          'MOZ_FMP4',
          'MOZ_INSTRUMENT_EVENT_LOOP',
          'MOZ_INSTRUMENTS',

build/moz.configure/old.configure

@@ -191,7 +191,6 @@ def old_configure_options(*options):
     '--enable-debug-js-modules',
     '--enable-debug-symbols',
     '--enable-directshow',
-    '--enable-dmd',
     '--enable-dtrace',
     '--enable-dump-painting',
     '--enable-elf-hack',

old-configure.in

@@ -1255,14 +1255,7 @@ dnl ========================================================
 dnl = Enable DMD
 dnl ========================================================
 
-MOZ_ARG_ENABLE_BOOL(dmd,
-[  --enable-dmd            Enable DMD; also enables jemalloc, replace-malloc and profiling],
-    MOZ_DMD=1,
-    MOZ_DMD= )
-
 if test "$MOZ_DMD"; then
-    AC_DEFINE(MOZ_DMD)
-
     if test "${CPU_ARCH}" = "arm"; then
         CFLAGS="$CFLAGS -funwind-tables"
         CXXFLAGS="$CXXFLAGS -funwind-tables"
@@ -1272,7 +1265,6 @@ if test "$MOZ_DMD"; then
     MOZ_REPLACE_MALLOC=1                # DMD enables replace-malloc
     MOZ_PROFILING=1                     # DMD enables profiling
 fi
-AC_SUBST(MOZ_DMD)
 
 dnl ========================================================
 dnl Profiling

toolkit/moz.configure

@@ -47,6 +47,18 @@ def sps_profiler_define(value):
         set_define('MOZ_ENABLE_PROFILER_SPS', '1')
 
 
+option('--enable-dmd', env='MOZ_DMD',
+       help='Enable Dark Matter Detector (heap profiler). '
+            'Also enables jemalloc, replace-malloc and profiling')
+
+@depends('--enable-dmd')
+def dmd(value):
+    if value:
+        set_config('MOZ_DMD', '1')
+        set_define('MOZ_DMD', '1')
+        add_old_configure_assignment('MOZ_DMD', '1')
+
+
 # Javascript engine
 # ==============================================================
 include('../js/moz.configure')