wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 673209 - check result of egrep during mozilla-config.h generation and abort on failure r=khuey

Browse Source 
--HG--
extra : rebase_source : f5871b4c4d7367a1b80a92a0ce87f89dca55121a
This commit is contained in:
Gregory Szorc 2011-07-25 12:50:00 -04:00
parent 9fb2adee2c
commit d9aa5a7d9a
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -9384,9 +9384,13 @@ if test -n "$_NON_GLOBAL_ACDEFINES"; then
done
fi
_EGREP_PATTERN="${_EGREP_PATTERN}dummy_never_defined)"
sort confdefs.h | egrep -v "$_EGREP_PATTERN" >> $_CONFIG_TMP
if test "$?" != 0; then
AC_MSG_ERROR([Error outputting config definitions])
fi
cat >> $_CONFIG_TMP <<\EOF
#endif /* _MOZILLA_CONFIG_H_ */
@ -9408,6 +9412,9 @@ 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
if test "$?" != 0; then
AC_MSG_ERROR([Error outputting confdefs.h])
fi
AC_OUTPUT_MAKE_DEFS()
MOZ_DEFINES=$DEFS
AC_SUBST(MOZ_DEFINES)

7
js/src/configure.in
View File

@ -5936,6 +5936,10 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_never_defined)"
sort confdefs.h | egrep -v "$_EGREP_PATTERN" >> $_CONFIG_TMP
if test "$?" != 0; then
AC_MSG_ERROR([Error outputting config definitions])
fi
cat >> $_CONFIG_TMP <<\EOF
#endif /* _JS_CONFDEFS_H_ */
@ -5957,6 +5961,9 @@ 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
if test "$?" != 0; then
AC_MSG_ERROR([Error outputting confdefs.h])
fi
AC_OUTPUT_MAKE_DEFS()
MOZ_DEFINES=$DEFS
AC_SUBST(MOZ_DEFINES)