diff -Naur xc.orig/lib/font/stubs/Imakefile xc/lib/font/stubs/Imakefile

--- xc.orig/lib/font/stubs/Imakefile	2004-04-23 22:44:23 +0400

+++ xc/lib/font/stubs/Imakefile	2004-12-17 00:37:32 +0300

@@ -15,7 +15,11 @@

 #undef _LinkBuildLibrary

 #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)

-NormalLibraryObjectRule()

+#define DoNormalLib NormalLibFont

+#define DoSharedLib SharedLibFont

+#include <Library.tmpl>

+LibraryObjectRule()

+

 NormalLibraryTarget(fntstubs,$(OBJS))

 LintLibraryTarget(fntstubs,$(SRCS))

 InstallLibrary(fntstubs,$(USRLIBDIR))

diff -Naur xc.orig/programs/Xserver/hw/xfree86/parser/cpconfig.c xc/programs/Xserver/hw/xfree86/parser/cpconfig.c

--- xc.orig/programs/Xserver/hw/xfree86/parser/cpconfig.c	2004-04-23 23:54:13 +0400

+++ xc/programs/Xserver/hw/xfree86/parser/cpconfig.c	2005-02-01 02:25:03 +0300

@@ -99,21 +99,3 @@

 	}

 	exit(0);

 }

-

-/* Functions that the parser requires */

-

-void

-VErrorF(const char *f, va_list args)

-{

-	vfprintf(stderr, f, args);

-}

-

-void

-ErrorF(const char *f, ...)

-{

-	va_list args;

-

-	va_start(args, f);

-	vfprintf(stderr, f, args);

-	va_end(args);

-}

diff -Naur xc.orig/programs/Xserver/hw/xfree86/parser/error.c xc/programs/Xserver/hw/xfree86/parser/error.c

--- xc.orig/programs/Xserver/hw/xfree86/parser/error.c	1970-01-01 03:00:00 +0300

+++ xc/programs/Xserver/hw/xfree86/parser/error.c	2005-02-01 02:18:34 +0300

@@ -0,0 +1,20 @@

+#include <stdio.h>

+#include <stdarg.h>

+#include "xf86Parser.h"

+

+/* Functions that the parser requires */

+

+void

+VErrorF(const char *f, va_list args)

+{

+        vfprintf(stderr, f, args);

+}

+	

+void

+ErrorF(const char *f, ...)

+{

+        va_list args;

+        va_start(args, f);

+        vfprintf(stderr, f, args);

+        va_end(args);

+}

diff -Naur xc.orig/programs/Xserver/hw/xfree86/parser/Imakefile xc/programs/Xserver/hw/xfree86/parser/Imakefile

--- xc.orig/programs/Xserver/hw/xfree86/parser/Imakefile	2004-07-31 13:14:06 +0400

+++ xc/programs/Xserver/hw/xfree86/parser/Imakefile	2005-02-01 02:38:11 +0300

@@ -2,8 +2,8 @@

-#define DoNormalLib     YES

-#define DoSharedLib     NO

+#define DoNormalLib     NO

+#define DoSharedLib     YES

 #define DoDebugLib      NO

 #define DoProfileLib    NO

 #define HasSharedData   NO

@@ -26,26 +26,29 @@

 XVERS = XorgVersion

 #endif

+LIBNAME = xf86config

+SoRev = 6.8

+

 INCLUDES = -I. -I$(XF86OSSRC)

 HEADERS = xf86Parser.h xf86Optrec.h

+DEFINES = -DXCONFIGDIR=\"$(XCONFIGDIR)\" \

+	  -DXCONFIGFILE=\"$(XCONFIGFILE)\" \

+	  -DXVERSION="$(XVERS)"

+

 SRCS = Device.c Files.c Flags.c Input.c Keyboard.c Layout.c Module.c \

 	Video.c Monitor.c Pointer.c Screen.c Vendor.c read.c scan.c write.c \

-	DRI.c Extensions.c

+	DRI.c Extensions.c error.c

 OBJS = Device.o Files.o Flags.o Input.o Keyboard.o Layout.o Module.o \

 	Video.o Monitor.o Pointer.o Screen.o Vendor.o read.o scan.o write.o \

-	DRI.o Extensions.o

-

-CONFIG_DEFINES = -DXCONFIGDIR=\"$(XCONFIGDIR)\" \

-		 -DXCONFIGFILE=\"$(XCONFIGFILE)\" \

-		 -DXVERSION="$(XVERS)"

+	DRI.o Extensions.o error.o

 #include <Library.tmpl>

-SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES))

+NormalProgramTarget(cpconfig,cpconfig.o,NullParameter,$(LOCAL_LIBRARIES) -l$(LIBNAME),NullParameter)

-NormalProgramTarget(cpconfig,cpconfig.o $(OBJS),NullParameter,$(LOCAL_LIBRARIES),NullParameter)

+InstallSharedLibrary($(LIBNAME),$(SoRev),$(SHLIBDIR))

 AllTarget(ProgramTargetName(cpconfig))

 DependTarget()

diff -Naur xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile

--- xc.orig/programs/Xserver/Imakefile	2004-12-27 15:18:41 +0300

+++ xc/programs/Xserver/Imakefile	2005-02-01 02:30:23 +0300

@@ -565,7 +565,7 @@

 		    $(MIDAMAGEDIR)

 XF86INIT   = $(XF86COMSRC)/xf86Init.o $(XF86COMSRC)/xf86IniExt.o

 XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86)

-XF86PARSLIB= $(XF86PARSERSRC)/LibraryTargetName(xf86config)

+XF86PARSLIB= -L$(XF86PARSERSRC) -lxf86config

 XF86OSLIB  = $(XF86OSSRC)/LibraryTargetName(xf86_os)

 #if XF86XAA

 XF86XAALIB = $(XF86SRC)/xaa/LibraryTargetName(xaa)

@@ -702,7 +702,7 @@

 		    $(MIDAMAGEDIR)

 XF86INIT   = $(XF86COMSRC)/xf86Init.o $(XF86COMSRC)/xf86IniExt.o

 XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86)

-XF86PARSLIB= $(XF86PARSERSRC)/LibraryTargetName(xf86config)

+XF86PARSLIB= -L$(XF86PARSERSRC) -lxf86config

 XF86OSLIB  = $(XF86OSSRC)/LibraryTargetName(xf86_os)

 #if XF86XAA

 XF86XAALIB = $(XF86SRC)/xaa/LibraryTargetName(xaa)

@@ -1002,7 +1002,7 @@

 XWINDDXDIR = hw/xwin

 #if BuildXWinXF86Config

 XWINPARSERDIR = hw/xfree86/parser

-XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config)

+XWINPARSERLIB = -L$(XWINPARSERDIR) -lxf86config

 #else

 XWINPARSERDIR = 

 XWINPARSERLIB =