ref: e4170a7597488317112809874051d7ac82ac987e
parent: 9f1245d39e792a9c37d0b7e06184dfff54394154
author: Simon Howard <[email protected]>
date: Fri Mar 17 13:36:50 EST 2006
Fix windres detection Subversion-branch: /trunk/chocolate-doom Subversion-revision: 423
--- a/configure.in
+++ b/configure.in
@@ -28,7 +28,9 @@
],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)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,9 +117,9 @@
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 $^ $@