Backout changeset efc2f07a829b (bug 734125) because of bustage

This commit is contained in:
Mike Hommey 2012-06-20 09:23:41 +02:00
Родитель a0ddedd7ba
Коммит 3ab23d661a
6 изменённых файлов: 11 добавлений и 10 удалений

Просмотреть файл

@ -139,7 +139,7 @@ foreach $ac_file (@makefiles) {
}
open (INFILE, "<$ac_file_in")
or ( die "can't read $ac_file_in: No such file or directory\n");
or ( warn "can't read $ac_file_in: No such file or directory\n" and next);
open (OUTFILE, ">$ac_file")
or ( warn "Unable to create $ac_file\n" and next);

Просмотреть файл

@ -8852,10 +8852,6 @@ dnl
dnl This does not change the $MAKEFILES variable.
dnl
echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
res="$?"
if test "$res" != 0; then
exit $res
fi
. ./conftest.sh
rm conftest.sh

Просмотреть файл

@ -139,7 +139,7 @@ foreach $ac_file (@makefiles) {
}
open (INFILE, "<$ac_file_in")
or ( die "can't read $ac_file_in: No such file or directory\n");
or ( warn "can't read $ac_file_in: No such file or directory\n" and next);
open (OUTFILE, ">$ac_file")
or ( warn "Unable to create $ac_file\n" and next);

Просмотреть файл

@ -4664,10 +4664,6 @@ dnl
dnl This does not change the $MAKEFILES variable.
dnl
echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
res="$?"
if test "$res" != 0; then
exit $res
fi
. ./conftest.sh
rm conftest.sh

Просмотреть файл

@ -576,6 +576,7 @@ elif [ "$MOZ_WIDGET_TOOLKIT" = "cocoa" ]; then
add_makefiles "
content/xbl/builtin/mac/Makefile
dom/plugins/ipc/interpose/Makefile
dom/system/cocoa/Makefile
image/decoders/icon/mac/Makefile
intl/locale/src/mac/Makefile
netwerk/system/mac/Makefile
@ -1126,6 +1127,7 @@ fi
if [ "$MOZ_B2G_RIL" ]; then
add_makefiles "
dom/system/b2g/Makefile
dom/telephony/Makefile
dom/wifi/Makefile
ipc/ril/Makefile

Просмотреть файл

@ -8,6 +8,7 @@ xulrunner/Makefile
xulrunner/app/Makefile
xulrunner/app/profile/Makefile
xulrunner/app/profile/chrome/Makefile
xulrunner/app/profile/extensions/Makefile
xulrunner/examples/Makefile
xulrunner/examples/simple/Makefile
xulrunner/examples/simple/components/Makefile
@ -24,6 +25,12 @@ if [ "$MAKENSISU" ]; then
"
fi
if [ "$OS_ARCH" = "Darwin" ]; then
add_makefiles "
xulrunner/installer/mac/Makefile
"
fi
if [ "$OS_ARCH" = "WINNT" ]; then
add_makefiles "
xulrunner/tools/redit/Makefile