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

@@ -78,7 +78,9 @@ init()
     patch -p1 < ../xserver15.patch
     popd
 
-    autoreconf -fiv
+    if [ ! -f ./configure ]; then
+        autoreconf -fiv
+    fi
 }
 
 

win/winvnc/winvnc.rc

@@ -9,6 +9,10 @@
 //
 #include "windows.h"
 
+#ifndef IDC_STATIC
+#define IDC_STATIC -1
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS