From 6caf25739ab9257cd0c3abb6d78bbc448073ff52 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 28 Sep 2017 17:07:20 +0100 Subject: [PATCH 3/3] Windows: Check for $RC, not $WINDRES That's what is checked for by LT_LANG([Windows Resource]) further up, and is what we now use during the build. Its value is typically i686-w64-mingw32-windres. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103015 Signed-off-by: Simon McVittie --- configure.ac | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e7ce59ba..8ab159b4 100644 --- a/configure.ac +++ b/configure.ac @@ -151,10 +151,8 @@ if test "$dbus_win" = yes; then # Assume DBUS_VERSION is always three numbers BUILD_FILEVERSION=`echo "$DBUS_VERSION" | sed -e 's/\./,/g'`,0 AC_SUBST(BUILD_FILEVERSION) - AC_CHECK_TOOL(WINDRES, windres, no) - if test "$WINDRES" = no; then - AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.]) - fi + AS_IF([test -z "$RC"], + [AC_MSG_ERROR([An implementation of windres is required])]) if test "$dbus_wince" = yes; then AC_DEFINE(DBUS_WINCE,1,[Defined if we run on a W32 CE API based system]) AC_DEFINE(_WIN32_WCE, 0x0502, [Defined to get newer W32 CE APIs]) -- 2.14.2