configure.ac | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-)
New commits: commit 9def779821324c73f81344b2b2d59f1e875903db Author: Tor Lillqvist <t...@collabora.com> Date: Thu Mar 9 01:49:06 2017 +0200 More AC_MSG_* usage cleanup Output just one AC_MSG_RESULT for each AC_MSG_CHECKING. Change-Id: I2ff1458a8b4abbe1804e33a39a9f4cc795cb28a1 diff --git a/configure.ac b/configure.ac index 131cfcd..1748ed8 100644 --- a/configure.ac +++ b/configure.ac @@ -3356,10 +3356,7 @@ find_msvc() vs_versions_to_check "$1" - AC_MSG_CHECKING([whether vs inst is $vsversions]) - for ver in $vsversions; do - AC_MSG_CHECKING([ver is now: $ver]) reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir if test -n "$regvalue"; then vctest=$regvalue @@ -3551,7 +3548,6 @@ if test "$_os" = "WINNT"; then dnl Save the true MSVC cl.exe for use when CC/CXX is actually clang-cl, dnl needed when building CLR code: if test -z "$MSVC_CXX"; then - AC_MSG_CHECKING([real MSVC]) if test "$BITNESS_OVERRIDE" = ""; then if test -f "$VC_PRODUCT_DIR/$CL_DIR/cl.exe"; then MSVC_CXX="$VC_PRODUCT_DIR/$CL_DIR/cl.exe" @@ -3568,7 +3564,6 @@ if test "$_os" = "WINNT"; then fi fi - AC_MSG_RESULT([$MSVC_CXX]) # This gives us a posix path with 8.3 filename restrictions MSVC_CXX=`win_short_path_for_make "$MSVC_CXX"` fi @@ -3605,7 +3600,6 @@ if test "$_os" = "WINNT"; then fi export INCLUDE=`cygpath -d "$COMPATH\Include"` - AC_MSG_RESULT([INCLUDE is: ($INCLUDE)]) PathFormat "$COMPATH" COMPATH="$formatted_path" commit 78ad9c3eb378c72e3cb1258f313b4b8c3023069c Author: Tor Lillqvist <t...@collabora.com> Date: Thu Mar 9 01:40:48 2017 +0200 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 diff --git a/configure.ac b/configure.ac index 6125f82..131cfcd 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) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits