From c41bcda78960ce4520a8d0e537857a892184cc6b Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Sun, 17 Apr 2011 20:56:57 +0200 Subject: [PATCH] Bug 605701 - Make WIN32_REDIST_DIR support stricter and more explicit; (Bv1-CC) Remove useless WIN32_REDIST_DIR support. r=Callek. --- config/autoconf.mk.in | 1 - configure.in | 5 ----- 2 files changed, 6 deletions(-) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index ffe6e3a825..d11a781a20 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -508,7 +508,6 @@ MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@ MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@ MOZ_QUANTIFY = @MOZ_QUANTIFY@ MSMANIFEST_TOOL = @MSMANIFEST_TOOL@ -WIN32_REDIST_DIR = @WIN32_REDIST_DIR@ WIN32_CRT_SRC_DIR = @WIN32_CRT_SRC_DIR@ MOZ_MEMORY_LDFLAGS = @MOZ_MEMORY_LDFLAGS@ MOZ_CRT_CPU_ARCH = @MOZ_CRT_CPU_ARCH@ diff --git a/configure.in b/configure.in index b95cb451a5..c73c4a80eb 100644 --- a/configure.in +++ b/configure.in @@ -619,10 +619,6 @@ case "$target" in _MOZ_EXCEPTIONS_FLAGS_ON='-EHsc' _MOZ_EXCEPTIONS_FLAGS_OFF='' - if test -n "$WIN32_REDIST_DIR"; then - WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd` - fi - dnl Ensure that mt.exe is 'Microsoft (R) Manifest Tool', dnl not something else like "magnetic tape manipulation utility". MSMT_TOOL=`mt 2>&1|grep 'Microsoft (R) Manifest Tool'` @@ -7034,7 +7030,6 @@ AC_SUBST(MOZ_BROWSE_INFO) AC_SUBST(MOZ_TOOLS_DIR) AC_SUBST(CYGWIN_WRAPPER) AC_SUBST(AS_PERL) -AC_SUBST(WIN32_REDIST_DIR) AC_SUBST(PYTHON) AC_SUBST(MAKENSISU)