[Bugfix] Fixed building with new libtool (2.2.6)

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

diff --git a/unix/xserver.patch b/unix/xserver.patch
index dbcc589ca863dca61f9efd2520919f32b68a084c..15b3beef3be981b086ff807773f428a2b8a0e325 100644 (file)
--- a/unix/xserver.patch
+++ b/unix/xserver.patch
@@ -1,15 +1,23 @@
 diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc   2008-10-15 17:22:22.000000000 +0200
-+++ xserver/configure.ac       2008-10-15 17:22:23.000000000 +0200
-@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.5.2, [https://b
- RELEASE_DATE="10 October 2008"
+--- xserver/configure.ac.vnc   2008-11-20 14:21:34.000000000 +0100
++++ xserver/configure.ac       2008-11-20 14:22:17.000000000 +0100
+@@ -31,7 +31,6 @@ RELEASE_DATE="5 November 2008"
+ REMEMBER_REMEMBER="The Fifth of November"
  AC_CONFIG_SRCDIR([Makefile.am])
  AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 -AM_MAINTAINER_MODE
  
  dnl this gets generated by autoheader, and thus contains all the defines.  we
  dnl don't ever actually use it, internally.
-@@ -1214,6 +1213,9 @@ if test "x$XVFB" = xyes; then
+@@ -54,6 +53,7 @@ dnl kdrive-config.h covers the kdrive DD
+ AC_CONFIG_HEADERS(include/kdrive-config.h)
+ 
+ AC_PROG_CC
++AC_PROG_CXX
+ AM_PROG_AS
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+@@ -1215,6 +1215,9 @@ if test "x$XVFB" = xyes; then
        AC_SUBST([XVFB_SYS_LIBS])
  fi
  
@@ -19,7 +27,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac
  
  dnl Xnest DDX
  
-@@ -2178,6 +2180,7 @@ hw/dmx/input/Makefile
+@@ -2179,6 +2182,7 @@ hw/dmx/input/Makefile
  hw/dmx/glxProxy/Makefile
  hw/dmx/Makefile
  hw/vfb/Makefile
@@ -28,8 +36,8 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac
  hw/xgl/egl/Makefile
  hw/xgl/egl/module/Makefile
 diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc 2008-10-15 17:22:23.000000000 +0200
-+++ xserver/hw/Makefile.am     2008-10-15 17:22:23.000000000 +0200
+--- xserver/hw/Makefile.am.vnc 2008-11-20 14:21:34.000000000 +0100
++++ xserver/hw/Makefile.am     2008-11-20 14:21:38.000000000 +0100
 @@ -43,7 +43,8 @@ SUBDIRS =                    \
        $(DMX_SUBDIRS)          \
        $(KDRIVE_SUBDIRS)       \
@@ -41,8 +49,8 @@ diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
  
 diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.vnc 2008-10-15 17:22:23.000000000 +0200
-+++ xserver/mi/miinitext.c     2008-10-15 17:22:23.000000000 +0200
+--- xserver/mi/miinitext.c.vnc 2008-11-20 14:21:37.000000000 +0100
++++ xserver/mi/miinitext.c     2008-11-20 14:21:38.000000000 +0100
 @@ -292,6 +292,7 @@ extern void BigReqExtensionInit(INITARGS
  #ifdef MITMISC
  extern void MITMiscExtensionInit(INITARGS);