From 3b82fc8711d7d4d57459147c30918c628c3dad97 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 25 Feb 2009 15:35:06 +0100 Subject: [PATCH] Let configure find the windres tool The windres tool used for cross-compiled mingw builds should be detected by configure. Until now it was assumed that it was simply called "windres" and not prefixed like the other compiler components (e.g. i386-mingw32msvc-gcc). --- Makefile.in | 3 ++- ac/initialization.m4 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 2da945e59..7f0e4fdc6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,6 +57,7 @@ PROFILING_LIBS = @PROFILING_LIBS@ RANLIB = @RANLIB@ STRIP = @STRIP@ UIC = @UIC@ +WINDRES = @WINDRES@ # Variable stuff as set by configure BZ2_LIBS = @BZ2_LIBS@ @@ -178,7 +179,7 @@ LINKSHARED = $(CXX) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS) \ -shared -Wl,--export-all CXXCOMPILE = $(CXX) $(CXXFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES) CCOMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES) -RCCOMPILE = windres $(WXWIDGETS_INCLUDES) -Isrc/mmg +RCCOMPILE = $(WINDRES) $(WXWIDGETS_INCLUDES) -Isrc/mmg ALL_SOURCES=$(wildcard avilib-0.6.10/*.c) $(wildcard avilib-0.6.10/*.cpp) \ $(wildcard librmff/*.c) \ diff --git a/ac/initialization.m4 b/ac/initialization.m4 index 8aee5efd4..13ae298a6 100644 --- a/ac/initialization.m4 +++ b/ac/initialization.m4 @@ -13,6 +13,7 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(AR, ar, :) AC_CHECK_TOOL(LD, ld, :) +AC_CHECK_TOOL(WINDRES, windres, :) dnl Check for headers AC_HEADER_STDC()