Bug 734125 - Fail configure when acoutputfast.pl fails to find one of the input files. r=ted

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

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

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

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

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

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

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

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

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

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

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

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

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