diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-03-09 20:44:23 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-03-09 20:44:23 +0200 |
commit | 8458530312344198d7c63817831efa9223a09660 (patch) | |
tree | 8110bc727888471359d68ff0696a1d6d7e67a7b0 /configure.ac | |
parent | 3a639085a43b886828c49a86cf761bc92f26e6e1 (diff) |
One AC_MSG_RESULT per AC_MSG_CHECKING please
Change-Id: Iffbfc75772219cc27b28013c35c20e98cd3cacc7
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c970c3990507..fb4441c06267 100644 --- a/configure.ac +++ b/configure.ac @@ -5446,21 +5446,18 @@ if test "$build_os" = "cygwin"; then AL_PATH=`win_short_path_for_make "$AL_PATH"` dnl Check mscoree.lib / .NET Framework dir - AC_MSG_CHECKING(.NET Framework find_dotnetsdk) + AC_MSG_CHECKING(.NET Framework) find_dotnetsdk if test -f "$frametest/lib/mscoree.lib"; then DOTNET_FRAMEWORK_HOME="$frametest" else - AC_MSG_CHECKING(.NET Framework find_winsdk) find_winsdk if test -f "$winsdktest/lib/mscoree.lib" -o -f "$winsdktest/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/mscoree.lib"; then DOTNET_FRAMEWORK_HOME="$winsdktest" else - AC_MSG_CHECKING(.NET Framework find_dotnetsdk46) find_dotnetsdk46 PathFormat "$frametest" frametest="$formatted_path" - AC_MSG_CHECKING(found: $frametest/um/$WINDOWS_SDK_ARCH/mscoree.lib) if test -f "$frametest/Lib/um/$WINDOWS_SDK_ARCH/mscoree.lib"; then DOTNET_FRAMEWORK_HOME="$frametest" fi @@ -5470,7 +5467,7 @@ if test "$build_os" = "cygwin"; then if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib" -a ! -f "$DOTNET_FRAMEWORK_HOME/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/mscoree.lib" -a ! -f "$DOTNET_FRAMEWORK_HOME/Lib/um/$WINDOWS_SDK_ARCH/mscoree.lib"; then AC_MSG_ERROR([mscoree.lib not found]) fi - AC_MSG_RESULT(found) + AC_MSG_RESULT([found: $DOTNET_FRAMEWORK_HOME]) PathFormat "$MIDL_PATH" MIDL_PATH="$formatted_path" |