From: Simon McVittie <smcv@collabora.com>
Date: Thu, 28 Sep 2017 16:07:20 +0000 (+0100)
Subject: Windows: Check for $RC, not $WINDRES
X-Git-Tag: dbus-1.12.0~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f84d2d250f3ee41e0672118f6c8b3f15041b09d;p=platform%2Fupstream%2Fdbus.git

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 <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/configure.ac b/configure.ac
index 542d141..fed2ba0 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])