View | Details | Raw Unified | Return to issue 51250
Collapse All | Expand All

(-)config_office/configure.in (-2 / +2 lines)
Lines 3176-3189 Link Here
3176
        # But there might be also an April 2005 PSDK, unfortunately MS changed
3176
        # But there might be also an April 2005 PSDK, unfortunately MS changed
3177
        # the registry entry. (we prefer the old version!?)
3177
        # the registry entry. (we prefer the old version!?)
3178
        if test -z "$PSDK_HOME"; then
3178
        if test -z "$PSDK_HOME"; then
3179
          PSDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | head -n 1`
3179
          PSDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1`
3180
        fi
3180
        fi
3181
        # normalize if found
3181
        # normalize if found
3182
        if test -n "$PSDK_HOME"; then
3182
        if test -n "$PSDK_HOME"; then
3183
          PSDK_HOME=`cygpath -d "$PSDK_HOME"`
3183
          PSDK_HOME=`cygpath -d "$PSDK_HOME"`
3184
          PSDK_HOME=`cygpath -u "$PSDK_HOME"`
3184
          PSDK_HOME=`cygpath -u "$PSDK_HOME"`
3185
          # The 2005 PSDK has a trailing backslash
3185
          # The 2005 PSDK has a trailing backslash
3186
          PSDK_HOME=`echo $PSDK_HOME | $SED -n "s/\/$//p"`
3186
          PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//p'`
3187
        fi
3187
        fi
3188
	else
3188
	else
3189
		PSDK_HOME="$with_psdk_home"
3189
		PSDK_HOME="$with_psdk_home"

Return to issue 51250