diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 76a2a00f5c..06185744ca 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -137,7 +137,6 @@ MOZ_UPDATE_PACKAGING = @MOZ_UPDATE_PACKAGING@ MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@ MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@ MOZ_DISABLE_VISTA_SDK_REQUIREMENTS = @MOZ_DISABLE_VISTA_SDK_REQUIREMENTS@ -MOZ_DISABLE_PARENTAL_CONTROLS = @MOZ_DISABLE_PARENTAL_CONTROLS@ XPC_IDISPATCH_SUPPORT = @XPC_IDISPATCH_SUPPORT@ MOZ_SPELLCHECK = @MOZ_SPELLCHECK@ MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@ diff --git a/configure.in b/configure.in index 2382ddf32a..8c5780abbc 100644 --- a/configure.in +++ b/configure.in @@ -556,8 +556,6 @@ fi if test "$MOZ_WINSDK_TARGETVER" -lt "06000000"; then MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=1 AC_DEFINE(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS) - # We can't build parental controls either - MOZ_DISABLE_PARENTAL_CONTROLS=1 fi fi @@ -5509,20 +5507,6 @@ MOZ_ARG_DISABLE_BOOL(tests, ENABLE_TESTS=, ENABLE_TESTS=1 ) -dnl ======================================================== -dnl parental controls (for Windows Vista) -dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(parental-controls, -[ --disable-parental-controls - Do not build parental controls], - MOZ_DISABLE_PARENTAL_CONTROLS=1, - MOZ_DISABLE_PARENTAL_CONTROLS=) -if test -n "$MOZ_DISABLE_PARENTAL_CONTROLS"; then - AC_DEFINE(MOZ_DISABLE_PARENTAL_CONTROLS) -fi - -AC_SUBST(MOZ_DISABLE_PARENTAL_CONTROLS) - dnl ======================================================== dnl = dnl = Module specific options