Index: xorg-server-1.3.0.0/configure.ac
===================================================================
--- xorg-server-1.3.0.0.orig/configure.ac	2007-11-22 17:40:34.000000000 +0800
+++ xorg-server-1.3.0.0/configure.ac	2007-11-22 17:59:56.000000000 +0800
@@ -1576,6 +1576,7 @@
 AM_CONDITIONAL(H3600_TS, false)
 AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
 AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
+AM_CONDITIONAL(KDRIVEGLAMO, [test x"$ac_cv_header_sys_vm86_h" = xyes -o x"$ac_cv_header_linux_fb_h" = xyes])
 
 # Xephyr needs nanosleep() which is in librt on Solaris
 AC_CHECK_FUNC([nanosleep], [],
@@ -1824,6 +1825,7 @@
 hw/kdrive/chips/Makefile
 hw/kdrive/ephyr/Makefile
 hw/kdrive/epson/Makefile
+hw/kdrive/glamo/Makefile
 hw/kdrive/fake/Makefile
 hw/kdrive/fbdev/Makefile
 hw/kdrive/w100/Makefile
Index: xorg-server-1.3.0.0/hw/kdrive/Makefile.am
===================================================================
--- xorg-server-1.3.0.0.orig/hw/kdrive/Makefile.am	2007-11-22 17:40:34.000000000 +0800
+++ xorg-server-1.3.0.0/hw/kdrive/Makefile.am	2007-11-22 17:54:54.000000000 +0800
@@ -7,6 +7,10 @@
 FBDEV_SUBDIRS = fbdev epson
 endif
 
+if KDRIVEGLAMO
+GLAMO_SUBDIRS = glamo
+endif
+
 if KDRIVEW100
 W100_SUBDIRS = w100
 endif
@@ -30,8 +34,9 @@
 	$(FBDEV_SUBDIRS)	\
 	$(W100_SUBDIRS)		\
 	$(VESA_SUBDIRS)		\
+	$(GLAMO_SUBDIRS)	\
 	$(XEPHYR_SUBDIRS)       \
 	fake
 
 DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
-               smi via fbdev sdl ephyr src linux fake sis300
+               smi via fbdev sdl ephyr src linux fake sis300 glamo
Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am
===================================================================
--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am	2007-11-22 17:40:34.000000000 +0800
+++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am	2007-11-22 17:40:35.000000000 +0800
@@ -41,11 +41,14 @@
 
 Xglamo_LDADD = \
 	$(GLAMO_LIBS)			\
-	@KDRIVE_LIBS@
+	@KDRIVE_LIBS@			\
+	@XSERVER_LIBS@
 
 Xglamo_DEPENDENCIES =	\
 	libglamo.a 			\
-	@KDRIVE_LOCAL_LIBS@
+        $(FBDEV_LIBS)                   \
+        $(VESA_LIBS)                    \
+        $(DRI_LIBS)
 
 relink:
 	rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c
===================================================================
--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_stub.c	2007-11-22 17:40:34.000000000 +0800
+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c	2007-11-22 17:40:35.000000000 +0800
@@ -49,16 +49,10 @@
 void
 InitInput(int argc, char **argv)
 {
-	KdKeyboardInfo *ki;
-
-	KdAddKeyboardDriver(&LinuxKeyboardDriver);
-	KdAddPointerDriver(&LinuxMouseDriver);
-#ifdef TSLIB
-	KdAddPointerDriver(&TsDriver);
+	KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs);
+#ifdef TOUCHSCREEN
+	KdAddMouseDriver (&TsFuncs);
 #endif
-
-	ki = KdParseKeyboard("keybd");
-	KdAddKeyboard(ki);
 }
 
 void