From 082e8aae6c903099af0a270b184ee643a853482f Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Fri, 19 Mar 2010 13:30:48 +0000
Subject: Add r3952 and r3955 changes to 1_0_1 tag because they are needed for
 successful build of 1.0.1 release.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/tags/1_0_1@4006 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 unix/build-xorg-7.4  | 4 +++-
 win/winvnc/winvnc.rc | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/unix/build-xorg-7.4 b/unix/build-xorg-7.4
index f5ad53c9..190fd871 100755
--- a/unix/build-xorg-7.4
+++ b/unix/build-xorg-7.4
@@ -78,7 +78,9 @@ init()
     patch -p1 < ../xserver15.patch
     popd
 
-    autoreconf -fiv
+    if [ ! -f ./configure ]; then
+        autoreconf -fiv
+    fi
 }
 
 
diff --git a/win/winvnc/winvnc.rc b/win/winvnc/winvnc.rc
index c443b6b5..f217aeac 100644
--- a/win/winvnc/winvnc.rc
+++ b/win/winvnc/winvnc.rc
@@ -9,6 +9,10 @@
 //
 #include "windows.h"
 
+#ifndef IDC_STATIC
+#define IDC_STATIC -1
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
-- 
cgit v1.2.3