Bug 669953 - don't pass "--enable-optimize --enable-debug --disable-optimize" to sub configure. r=khuey.

This patch makes us always pass
--(enable|disable)-(optimizations|debug) to the nspr configure. That
way we don't have to worry about defaults in two configures being in
sync.

It also removes the hack for trace malloc from the top level
configure. If there are nspr only restrictions on tracing and
optimizations, the nspr configure should handle them.
This commit is contained in:
Rafael Ávila de Espíndola 2011-10-10 10:54:49 -04:00
parent 4ec398c3d2
commit e58e0cde34

View File

@ -8789,12 +8789,13 @@ if test -z "$MOZ_NATIVE_NSPR"; then
ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
if test -z "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --disable-debug"
else
ac_configure_args="$ac_configure_args --enable-debug"
fi
if test "$MOZ_OPTIMIZE" = "1"; then
ac_configure_args="$ac_configure_args --enable-optimize"
fi
if test "$OS_ARCH" = "WINNT" -a "$NS_TRACE_MALLOC"; then
ac_configure_args="$ac_configure_args --enable-debug --disable-optimize"
else
ac_configure_args="$ac_configure_args --disable-optimize"
fi
if test -n "$HAVE_64BIT_OS"; then
ac_configure_args="$ac_configure_args --enable-64bit"