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

Remove the unused DEFINES set in js/xpconnect/shell/moz.build,
subsequently making the MOZ_CALLGRIND subst unused, so don't add a
set_config for it.

build/moz.configure/init.configure

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

build/moz.configure/old.configure

@@ -178,7 +178,6 @@ def old_configure_options(*options):
     '--enable-b2g-camera',
     '--enable-b2g-ril',
     '--enable-bundled-fonts',
-    '--enable-callgrind',
     '--enable-chrome-format',
     '--enable-clang-plugin',
     '--enable-content-sandbox',

js/moz.configure

@@ -84,3 +84,12 @@ def instruments(value, target):
         set_config('MOZ_INSTRUMENTS', '1')
         set_define('MOZ_INSTRUMENTS', '1')
         add_old_configure_assignment('MOZ_INSTRUMENTS', '1')
+
+
+js_option('--enable-callgrind', env='MOZ_CALLGRIND',
+          help='Enable callgrind profiling')
+
+@depends('--enable-callgrind')
+def callgrind(value):
+    if value:
+        set_define('MOZ_CALLGRIND', '1')

js/src/old-configure.in

@@ -2354,13 +2354,8 @@ fi
 dnl ========================================================
 dnl callgrind
 dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(callgrind,
-[  --enable-callgrind      Enable callgrind profiling. Implies --enable-profiling.],
-    MOZ_CALLGRIND=1,
-    MOZ_CALLGRIND= )
 if test -n "$MOZ_CALLGRIND"; then
     MOZ_PROFILING=1
-    AC_DEFINE(MOZ_CALLGRIND)
 fi
 
 dnl ========================================================
@@ -2777,7 +2772,6 @@ AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_SYMBOLS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
-AC_SUBST(MOZ_CALLGRIND)
 AC_SUBST(MOZ_VTUNE)
 AC_SUBST(MOZ_PROFILING)
 AC_SUBST(LIBICONV)

js/xpconnect/shell/moz.build

@@ -20,9 +20,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
         'xpcshellMacUtils.mm',
     ]
 
-if CONFIG['MOZ_CALLGRIND']:
-    DEFINES['MOZ_CALLGRIND'] = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [

old-configure.in

@@ -1226,13 +1226,8 @@ fi
 dnl ========================================================
 dnl callgrind
 dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(callgrind,
-[  --enable-callgrind      Enable callgrind profiling. Implies --enable-profiling.],
-    MOZ_CALLGRIND=1,
-    MOZ_CALLGRIND= )
 if test -n "$MOZ_CALLGRIND"; then
     MOZ_PROFILING=1
-    AC_DEFINE(MOZ_CALLGRIND)
 fi
 
 dnl ========================================================
@@ -7391,7 +7386,6 @@ AC_SUBST(MOZ_DEBUG_SYMBOLS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST_SET(MOZ_EXTENSIONS)
-AC_SUBST(MOZ_CALLGRIND)
 AC_SUBST(MOZ_VTUNE)
 AC_SUBST(MOZ_PROFILING)
 AC_SUBST(LIBICONV)