Bug 557958 - Get rid of MOZ_DISABLE_VISTA_SDK_REQUIREMENTS, which was deprecated in m-1.9.2; (Av1) Just get rid of it.

r=ted.mielczarek.
This commit is contained in:
Serge Gautherie 2010-05-04 17:30:31 +02:00
Родитель 846c3f9275
Коммит 694e1fb7e7
2 изменённых файлов: 0 добавлений и 18 удалений

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

@ -137,7 +137,6 @@ MOZ_UPDATER = @MOZ_UPDATER@
MOZ_UPDATE_PACKAGING = @MOZ_UPDATE_PACKAGING@
MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
MOZ_DISABLE_VISTA_SDK_REQUIREMENTS = @MOZ_DISABLE_VISTA_SDK_REQUIREMENTS@
MOZ_DISABLE_PARENTAL_CONTROLS = @MOZ_DISABLE_PARENTAL_CONTROLS@
XPC_IDISPATCH_SUPPORT = @XPC_IDISPATCH_SUPPORT@
NS_ENABLE_TSF = @NS_ENABLE_TSF@

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

@ -480,7 +480,6 @@ case "$target" in
;;
esac
MOZ_ARG_WITH_STRING(windows-version,
[ --with-windows-version=WINSDK_TARGETVER
Highest Windows version to target using this SDK
@ -500,28 +499,13 @@ case "$WINSDK_TARGETVER" in
esac
dnl Vista SDK specific api (deprecated)
MOZ_ARG_DISABLE_BOOL(vista-sdk-requirements,
[ --disable-vista-sdk-requirements
Do not build Vista SDK specific code],
MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=1,
MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=$_PLATFORM_MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
if test -n "$COMPILE_ENVIRONMENT"; then
if test -n "$MOZ_DISABLE_VISTA_SDK_REQUIREMENTS"; then
AC_MSG_WARN([--disable-vista-sdk-requirements is deprecated, use --with-windows-version=502 instead])
MOZ_WINSDK_TARGETVER=05020000
fi
if test "$MOZ_WINSDK_TARGETVER" -lt "06000000"; then
MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=1
AC_DEFINE(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
# We can't build parental controls either
MOZ_DISABLE_PARENTAL_CONTROLS=1
fi
fi
AC_SUBST(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
case "$target" in
*-cygwin*|*-mingw*|*-msvc*|*-mks*|*-wince|*-winmo)
if test "$GCC" != "yes"; then
@ -2141,7 +2125,6 @@ ia64*-hpux*)
*-wince*|*-winmo*)
TARGET_COMPILER_ABI=msvc
_PLATFORM_DEFAULT_TOOLKIT=cairo-windows
_PLATFORM_MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=1
MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd -W`
MOZ_BUILD_ROOT=`cd $MOZ_BUILD_ROOT && pwd -W`
AR_LIST="$AR -list"