From: Tony Kelman <tony@kelman.net>
Date: Wed, 8 Apr 2015 06:29:59 +0000 (-0700)
Subject: Also check for windres with a host prefix
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~25^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f6de53f635bbf34ed9aafbb3264611b7ba32ddf;p=graphviz

Also check for windres with a host prefix

for cross-compiling, and use result variable $(RC) to account for the possibly different name

refer to includes and .rc path using $(top_srcdir) for out-of-tree builds
---

diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index a98d96487..abc2bf413 100644
--- a/cmd/lefty/Makefile.am
+++ b/cmd/lefty/Makefile.am
@@ -81,7 +81,7 @@ lefty.res : ws/mswin32/lefty.rc
 	rc -l 0x409 -Iws/mswin32 '-IC:\\progra~1\\microsoft visual studio 8\\vc\\PlatformSDK\\include' -DNDEBUG -fo lefty.res ws/mswin32/lefty.rc
 else
 lefty.res : ws/mswin32/lefty.rc
-	windres -l 0x409 -Iws/mswin32 -DNDEBUG -Ocoff -o lefty.res ws/mswin32/lefty.rc
+	$(RC) -l 0x409 -I$(top_srcdir)/cmd/lefty/ws/mswin32 -DNDEBUG -Ocoff -o lefty.res $(top_srcdir)/cmd/lefty/ws/mswin32/lefty.rc
 endif
 
 else
diff --git a/configure.ac b/configure.ac
index b9ad708cb..04fa405ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,7 +332,7 @@ if test "${GCC}" != "yes" ; then
 	    ;;
     esac
 else
-    AC_CHECK_PROGS(RC,windres,false)
+    AC_CHECK_PROGS(RC,[windres ${host}-windres],false)
     case "${CC}" in
 	*icc* )
 	    # -Wall causes relocation errors with icc