diff options
| author | Adam Tkac <atkac@redhat.com> | 2009-04-07 17:45:47 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2009-04-07 17:45:47 +0000 |
| commit | fe036ec1c863a2bb24884bd8d00f7a3d744b2b4b (patch) | |
| tree | 071cde8becdc08fa65bb7d6398517cf57191a0fb | |
| parent | 089a758d69c4918076dfa1a6630eeb3d65f589bb (diff) | |
| download | tigervnc-fe036ec1c863a2bb24884bd8d00f7a3d744b2b4b.tar.gz tigervnc-fe036ec1c863a2bb24884bd8d00f7a3d744b2b4b.zip | |
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
| -rw-r--r-- | win/Makefile.am | 2 | ||||
| -rw-r--r-- | win/configure.ac | 3 | ||||
| -rw-r--r-- | win/vncviewer/Makefile.am | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/win/Makefile.am b/win/Makefile.am index 5ab34c9b..d81086d4 100644 --- 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 02ac6091..e80f3473 100644 --- 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 448729f6..dddef27b 100644 --- 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 $@ |