use WINDRES instead of RC to compile rc file

This is the way used by GTK+ and other packages. I don't know much about "RC" though.
(cherry picked from commit d5b993ebc1411b15e4563d05fbd92cf8b29cbb4c)

diff --git a/configure.in b/configure.in
index fabb6d3..0fd11ec 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -89,6 +89,10 @@ if test "$dbus_win" = yes; then
       *-rc*)  BUILD_FILEVERSION="${BUILD_FILEVERSION}1" ;;
       *)      BUILD_FILEVERSION="${BUILD_FILEVERSION}2" ;;
     esac
+    AC_CHECK_TOOL(WINDRES, windres, no)
+    if test "$WINDRES" = no; then
+      AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
+    fi
 else
     AC_DEFINE(DBUS_UNIX,1,[Defined if we run on a Unix-based system])
 fi

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 4dc53e3..5f8d703 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -15,14 +15,10 @@ lib_LTLIBRARIES=libdbus-1.la
 # Deal with W32 .def and version-info.rc stuff
 #
 if DBUS_WIN
-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
-     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
-     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
-
 SUFFIXES = rc
 
 .rc.o:
-       $(LTRCCOMPILE) -i $< -o $@
+       $(WINDRES) $< -o $@
 
 dbus_res = versioninfo.o
 dbus_res_ldflag = -Wl,$(dbus_res)