diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-03-09 01:40:48 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-03-09 01:40:48 +0200 |
| commit | 78ad9c3eb378c72e3cb1258f313b4b8c3023069c (patch) | |
| tree | 970dc5779346cb86e9b0a073cb96fd40d6c821ac | |
| parent | 3c5463bed36407b1915d6dce9c9173ba9009ab65 (diff) | |
Fix AC_MSG_* usage for find_ucrt
You are supposed to output just one AC_MSG_RESULT for each AC_MSG_CHECKING
find_ucrt already errors out if it doesn't.
Change-Id: I63f58996f60577301631b11dd51728fdee324095
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 6125f82a69b6..131cfcd76bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -3327,7 +3327,6 @@ find_ucrt() # Rest if not exist if ! test -d "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt"; then UCRTSDKDIR= - AC_MSG_RESULT([UCRT: give up registry detection and retrieve from IDE env file]) fi fi if test -z "$UCRTSDKDIR"; then @@ -3453,20 +3452,18 @@ if test "$_os" = "WINNT"; then AC_MSG_CHECKING([for UCRT location]) find_ucrt - if test -n "$UCRTSDKDIR"; then - AC_MSG_RESULT([found]) - PathFormat "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt" - ucrtincpath_formatted=$formatted_path - # SOLARINC is used for external modules and must be set too. - # And no, it's not sufficient to set SOLARINC only, as configure - # itself doesn't honour it. - SOLARINC="$SOLARINC -I$ucrtincpath_formatted" - CFLAGS="$CFLAGS -I$ucrtincpath_formatted" - CXXFLAGS="$CXXFLAGS -I$ucrtincpath_formatted" - CPPFLAGS="$CPPFLAGS -I$ucrtincpath_formatted" - else - AC_MSG_ERROR([not found]) - fi + # find_ucrt errors out if it doesn't find it + AC_MSG_RESULT([found]) + PathFormat "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt" + ucrtincpath_formatted=$formatted_path + # SOLARINC is used for external modules and must be set too. + # And no, it's not sufficient to set SOLARINC only, as configure + # itself doesn't honour it. + SOLARINC="$SOLARINC -I$ucrtincpath_formatted" + CFLAGS="$CFLAGS -I$ucrtincpath_formatted" + CXXFLAGS="$CXXFLAGS -I$ucrtincpath_formatted" + CPPFLAGS="$CPPFLAGS -I$ucrtincpath_formatted" + AC_SUBST(UCRTSDKDIR) AC_SUBST(UCRTVERSION) |