Remove module specific defines from ACDEFINES.

Bug #203429 sr=darin a=sspitzer

configure

@@ -15115,6 +15115,9 @@ EOF
     cat $_CONFIG_DEFS_H
   fi
 
+rm -f confdefs.h.save
+mv confdefs.h confdefs.h.save
+egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
@@ -15130,6 +15133,8 @@ rm -f conftest.defs
 
 MOZ_DEFINES=$DEFS
 
+rm -f confdefs.h
+mv confdefs.h.save confdefs.h
 
 . ${srcdir}/allmakefiles.sh
 echo $MAKEFILES | $my_perl $my_srcdir/build/autoconf/acoutput-fast.pl > conftest.sh

configure.in

@@ -5343,9 +5343,14 @@ EOF
   fi
 
 dnl Probably shouldn't call this manually but we always want the output of DEFS
+rm -f confdefs.h.save
+mv confdefs.h confdefs.h.save
+egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
 AC_OUTPUT_MAKE_DEFS()
 MOZ_DEFINES=$DEFS
 AC_SUBST(MOZ_DEFINES)
+rm -f confdefs.h
+mv confdefs.h.save confdefs.h
 
 dnl Load the list of Makefiles to generate.
 dnl   To add new Makefiles, edit allmakefiles.sh.