1.1 --- a/common/autoconf/generated-configure.sh Wed Dec 05 10:12:14 2012 +0100
1.2 +++ b/common/autoconf/generated-configure.sh Wed Dec 05 16:35:25 2012 +0100
1.3 @@ -3672,7 +3672,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1354696609
1.8 +DATE_WHEN_GENERATED=1354721616
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -15839,7 +15839,14 @@
1.13 fi
1.14
1.15 if test -d "$WIN_SDK_BASE"; then
1.16 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.17 + # There have been cases of partial or broken SDK installations. A missing
1.18 + # lib dir is not going to work.
1.19 + if test ! -d "$WIN_SDK_BASE/../lib"; then
1.20 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.21 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.22 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
1.23 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
1.24 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.25 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.26 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.27 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
1.28 @@ -15874,7 +15881,14 @@
1.29 fi
1.30
1.31 if test -d "$WIN_SDK_BASE"; then
1.32 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.33 + # There have been cases of partial or broken SDK installations. A missing
1.34 + # lib dir is not going to work.
1.35 + if test ! -d "$WIN_SDK_BASE/../lib"; then
1.36 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.37 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.38 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
1.39 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
1.40 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.41 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.42 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.43 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
1.44 @@ -15909,7 +15923,14 @@
1.45 fi
1.46
1.47 if test -d "$WIN_SDK_BASE"; then
1.48 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.49 + # There have been cases of partial or broken SDK installations. A missing
1.50 + # lib dir is not going to work.
1.51 + if test ! -d "$WIN_SDK_BASE/../lib"; then
1.52 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.53 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.54 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
1.55 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
1.56 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.57 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.58 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.59 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
1.60 @@ -15943,7 +15964,14 @@
1.61 fi
1.62
1.63 if test -d "$WIN_SDK_BASE"; then
1.64 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.65 + # There have been cases of partial or broken SDK installations. A missing
1.66 + # lib dir is not going to work.
1.67 + if test ! -d "$WIN_SDK_BASE/../lib"; then
1.68 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.69 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.70 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
1.71 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
1.72 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.73 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.74 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.75 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
1.76 @@ -15976,7 +16004,14 @@
1.77 fi
1.78
1.79 if test -d "$WIN_SDK_BASE"; then
1.80 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.81 + # There have been cases of partial or broken SDK installations. A missing
1.82 + # lib dir is not going to work.
1.83 + if test ! -d "$WIN_SDK_BASE/../lib"; then
1.84 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.85 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.86 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
1.87 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
1.88 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
1.89 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
1.90 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
1.91 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
