aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2012-11-13 15:01:49 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2012-11-13 15:01:49 +0000
commit83845c004860aadc59eb7bdf9743cfc253c41858 (patch)
tree93ba294fa9dcf1f4ddd0c1455dc9f2e633245c55 /config.nmake
parent7d39afa6f8a46a23186c781369a1923e2a7fc645 (diff)
vcredist_*.exe is, AFAICT, still optional yet config.nmake always defines the
variable for it. Since it's always defined but it's optional, don't check for its existence. svn path=/trunk/; revision=46022
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake
index 7e5005bfca..ed1ae6469e 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1042,10 +1042,12 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 11.0\VC\redist\$(TARGET_MACHI
!ERROR MSVC_VARIANT unknown
!ENDIF
-!IF DEFINED(VCREDIST_EXE) && ! EXIST("$(VCREDIST_EXE)")
-!ERROR Can't find $(VCREDIST_EXE). Have you downloaded it from Microsoft? \
-See the developer's guide section "C-Runtime "Redistributable" files" for details how to get it
-!ENDIF
+# This is still optional yet we define it above for all users.
+# So, don't check if it exists...
+#!IF DEFINED(VCREDIST_EXE) && ! EXIST("$(VCREDIST_EXE)")
+#!ERROR Can't find $(VCREDIST_EXE). Have you downloaded it from Microsoft? \
+#See the developer's guide section "C-Runtime "Redistributable" files" for details how to get it
+#!ENDIF
##### Advanced: Docbook/XML documentation generation #####
# If you want to generate the Docbook/XML based docs (User's and Developer's