commit e4170a7597488317112809874051d7ac82ac987e
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Fri Mar 17 18:36:50 2006 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Fri Mar 17 18:36:50 2006 +0000

    Fix windres detection

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 423
---
 configure.in    | 4 +++-
 src/Makefile.am | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 5c1b04d7..1d19deae 100644
--- a/configure.in
+++ b/configure.in
@@ -28,7 +28,9 @@ AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[
 ],echo "*** Compiling without SDL_net installed probably won't work"
 ,$SDL_LIBS $SDLNET_LIBS)

-AM_CONDITIONAL(HAVE_WINDRES, windres > /dev/null)
+AC_CHECK_TOOL(WINDRES, windres, )
+
+AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")

 AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME,AC_PACKAGE_VERSION)

diff --git a/src/Makefile.am b/src/Makefile.am
index 53aad1b6..c9c3619b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,9 +117,9 @@ endif
 EXTRA_DIST = convert-icon chocolate_doom_icon.c

 .rc.o:
-	windres $^ -o $@
+	$(WINDRES) $^ -o $@
 %.o : %.rc
-	windres $^ -o $@
+	$(WINDRES) $^ -o $@

 chocolate_doom_icon.c : ../data/chocolate-doom.png
 	./convert-icon $^ $@