diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-03-04 14:10:41 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-03-05 15:36:44 +0100 |
| commit | d6cd5de3211a344d7f6fa8585f21dfb8be0a06f3 (patch) | |
| tree | 443bf5717e3cd0b2f45dc7a98f7f4f292b2c72d6 /configure.ac | |
| parent | 710d034467a96270175d6a1edf8d655a8345a4c3 (diff) | |
configure: Windows SDKs < 7.1 are not supported, do not check for them
Change-Id: I3558ca7fa3d2a2c47d1066e3bd24aeb7619452e0
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 6c3dbfca3b61..dadc82f6804a 100644 --- a/configure.ac +++ b/configure.ac @@ -9567,13 +9567,7 @@ the Windows SDK are installed.]) if test -z "$WINDOWS_SDK_HOME"; then AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway!?]) - elif echo $WINDOWS_SDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then - WINDOWS_SDK_VERSION=60 - AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)]) - elif echo $WINDOWS_SDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then - WINDOWS_SDK_VERSION=61 - AC_MSG_RESULT([found Windows SDK 6.1 ($WINDOWS_SDK_HOME)]) - elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then + elif echo $WINDOWS_SDK_HOME | grep "v7.1" >/dev/null 2>/dev/null; then WINDOWS_SDK_VERSION=70 AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then @@ -9582,9 +9576,9 @@ the Windows SDK are installed.]) dnl compatibility warning if not explicitly choosing the 80 SDK: if test -z "$with_windows_sdk"; then AC_MSG_WARN([If a build should run on Windows XP,]) - AC_MSG_WARN([use --with-windows-sdk=7.1A (requires VS 2012 Update 1 or newer)]) + AC_MSG_WARN([use --with-windows-sdk=7.1A]) add_warning "If a build should run on Windows XP," - add_warning "use --with-windows-sdk=7.1A (requires VS 2012 Update 1 or newer)" + add_warning "use --with-windows-sdk=7.1A" fi elif echo $WINDOWS_SDK_HOME | grep "8.1" >/dev/null 2>/dev/null; then WINDOWS_SDK_VERSION=81 |