diff -uNr xc.orig/config/cf/lnxLib.tmpl xc/config/cf/lnxLib.tmpl
--- xc.orig/config/cf/lnxLib.tmpl	2004-04-08 11:15:44.000000000 +0000
+++ xc/config/cf/lnxLib.tmpl	2004-04-10 14:10:32.000000000 +0000
@@ -35,6 +35,7 @@
 #define SharedXvReqs	  $(LDPRELIB) $(XLIB)
 #define SharedSMReqs	  $(LDPRELIB) $(ICELIB)
 #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedFontencReqs $(LDPRELIB) GzipLibrary
 
 #if GlxUseBuiltInDRIDriver
 #define ExtraSharedGLReqs /**/
diff -uNr xc.orig/programs/Xserver/include/servermd.h xc/programs/Xserver/include/servermd.h
--- xc.orig/programs/Xserver/include/servermd.h	2004-04-08 11:18:55.000000000 +0000
+++ xc/programs/Xserver/include/servermd.h	2004-04-08 11:26:20.000000000 +0000
@@ -153,7 +153,7 @@
 
 #endif /* __arm32__ */
 
-#if defined (hpux)
+#if defined __hppa__
 
 #define IMAGE_BYTE_ORDER	MSBFirst
 #define BITMAP_BIT_ORDER	MSBFirst
@@ -165,7 +165,7 @@
 #define LARGE_INSTRUCTION_CACHE
 #define PLENTIFUL_REGISTERS
 
-#endif /* hpux */
+#endif /* __hppa__ */
 
 #if defined(__powerpc__)