]> granicus.if.org Git - graphviz/commitdiff
Also check for windres with a host prefix
authorTony Kelman <tony@kelman.net>
Wed, 8 Apr 2015 06:29:59 +0000 (23:29 -0700)
committerTony Kelman <tony@kelman.net>
Wed, 8 Apr 2015 06:29:59 +0000 (23:29 -0700)
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

cmd/lefty/Makefile.am
configure.ac

index a98d96487c5cebe6f448bd09e54d765952f3435d..abc2bf413ce994dcaa78d42140a33ed1c0078b04 100644 (file)
@@ -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
index b9ad708cb8da320359c563f1342788c2cd414c9a..04fa405ba56edb9f05a7fbefdd3f544a4b5cb73f 100644 (file)
@@ -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