Check for full *-windres name in configure instead of hardcode it.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3762 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/win/Makefile.am b/win/Makefile.am
index 5ab34c9bc01d896e461c7193c5467f05729cb610..d81086d42d1d3f76ce4d910529b8944078b0edac 100644 (file)
--- a/win/Makefile.am
+++ b/win/Makefile.am
@@ -1,4 +1,2 @@
 SUBDIRS = ../common rfb_win32 vncviewer
 
-ACLOCAL_AMFLAGS = -I m4
-

diff --git a/win/configure.ac b/win/configure.ac
index 02ac60919c34cc076b33ff7dbcf5e41e14236e5d..e80f3473dcbc8cfdcd92df085c2c0aa3965baace 100644 (file)
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.61])
+AC_PREREQ([2.57])
 AC_INIT([tigervnc], [0.0.90], [http://www.tigervnc.org])
 AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
 
@@ -11,6 +11,7 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_LIBTOOL
+AC_CHECK_TOOL([WINDRES], windres, [AC_MSG_ERROR(windres not found)])
 AC_LANG([C++])
 
 if test "$GCC" = yes; then

diff --git a/win/vncviewer/Makefile.am b/win/vncviewer/Makefile.am
index 448729f6cc29f1714c92eadb0a3ffb83e8836530..dddef27b082ff2d4fbfcf25ace873ddbda6a1a3b 100644 (file)
--- a/win/vncviewer/Makefile.am
+++ b/win/vncviewer/Makefile.am
@@ -42,4 +42,4 @@ vncviewer_LDADD = $(COMMON_DIR)/rfb/librfb.la \
 vncviewer_LDFLAGS = -I$(top_srcdir)/win -mwindows
 
 resources.o: vncviewer.rc
-       i386-mingw32msvc-windres $^ -o $@
+       $(WINDRES) $^ -o $@