diff options
| -rw-r--r-- | unix/configure.ac | 2 | ||||
| -rw-r--r-- | unix/xserver15.patch | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/unix/configure.ac b/unix/configure.ac index dd2b6333..62cc3f80 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -13,7 +13,7 @@ AC_PROG_CXX AC_PROG_LIBTOOL AC_LANG([C++]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.14.6]) +AM_GNU_GETTEXT_VERSION([0.14.1]) case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) diff --git a/unix/xserver15.patch b/unix/xserver15.patch index ee482153..a6e4c151 100644 --- a/unix/xserver15.patch +++ b/unix/xserver15.patch @@ -1,15 +1,16 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac --- xserver/configure.ac.vnc 2009-04-02 16:53:29.489569338 +0200 +++ xserver/configure.ac 2009-04-02 16:53:52.967782502 +0200 -@@ -31,7 +31,6 @@ RELEASE_DATE="5 November 2008" +@@ -31,7 +31,7 @@ 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 ++m4_pattern_allow([AC_DEFINE]) dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. -@@ -54,6 +53,7 @@ dnl kdrive-config.h covers the kdrive DD +@@ -54,6 +54,7 @@ dnl kdrive-config.h covers the kdrive DD AC_CONFIG_HEADERS(include/kdrive-config.h) AC_PROG_CC @@ -17,7 +18,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac AM_PROG_AS AC_PROG_INSTALL AC_PROG_LN_S -@@ -1010,7 +1010,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten +@@ -1010,7 +1011,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten AC_DEFINE(XKB, 1, [Build XKB]) AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) @@ -26,7 +27,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" XKB_LIB='$(top_builddir)/xkb/libxkb.la' XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -@@ -1220,6 +1220,9 @@ if test "x$XVFB" = xyes; then +@@ -1220,6 +1221,9 @@ if test "x$XVFB" = xyes; then AC_SUBST([XVFB_SYS_LIBS]) fi @@ -36,7 +37,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac dnl Xnest DDX -@@ -1314,6 +1317,8 @@ xorg_bus_ppcpci=no +@@ -1314,6 +1318,8 @@ xorg_bus_ppcpci=no xorg_bus_sparcpci=no xorg_bus_sparc=no @@ -45,7 +46,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac if test "x$XORG" = xyes -o "x$XGL" = xyes; then XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -@@ -1521,7 +1526,6 @@ if test "x$XORG" = xyes -o "x$XGL" = xye +@@ -1521,7 +1527,6 @@ if test "x$XORG" = xyes -o "x$XGL" = xye AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) @@ -53,7 +54,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) -@@ -2184,6 +2188,7 @@ hw/dmx/input/Makefile +@@ -2184,6 +2189,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile |