--- gnuserv-3.12.5/Makefile.in~	2002-09-13 14:18:44 +0000
+++ gnuserv-3.12.5/Makefile.in	2003-02-06 03:04:37 +0000
@@ -248,7 +248,7 @@
 gnuserv.elc: gnuserv.el
 	$(EMACS) --no-site-file -batch \
 	--eval "(add-to-list 'load-path \".\")" \
-	-l gnuserv-compat -f batch-byte-compile $<
+	-l cl -l gnuserv-compat -f batch-byte-compile $<
 devices.elc: devices.el
 
 info: gnuserv.info
--- gnuserv-3.12.5/devices.el~	2000-01-31 23:12:32 +0000
+++ gnuserv-3.12.5/devices.el	2003-02-06 03:04:37 +0000
@@ -31,7 +31,9 @@
 ;; XEmacs 19.14.  A 'device' for Emacs 19 is just a frame, from which we can
 ;; determine the connection to an X display, etc.
 
-(require 'cl)
+(eval-when-compile
+  (require 'cl))
+
 (eval-when-compile
   (if (string-match "XEmacs" (emacs-version))
       (set 'byte-optimize nil)))
--- gnuserv-3.12.5/gnuserv-compat.el~	2001-02-12 00:13:19 +0000
+++ gnuserv-3.12.5/gnuserv-compat.el	2003-02-06 03:04:37 +0000
@@ -49,7 +49,28 @@
 ;; 20.3.  Also, XEmacs preloads the common lisp stuff, and we might as
 ;; well use it here.
 
-(require 'cl)
+(eval-when-compile
+  (require 'cl))
+
+(define-compiler-macro mapc (&whole form function sequence &rest args)
+  (if (string-equal "gnuserv.elc"
+		    (file-name-nondirectory byte-compile-dest-file))
+      `(let ((fn ,function)
+	     (seq ,sequence))
+	 (dolist (elem seq)
+	   (funcall fn elem)))
+    form))
+
+(define-compiler-macro some (&whole form predicate sequence &rest args)
+  (if (string-equal "gnuserv.elc"
+		    (file-name-nondirectory byte-compile-dest-file))
+      `(let ((pred ,predicate)
+	     (seq ,sequence)
+	     x)
+	 (while (and seq
+		     (not (setq x (funcall pred (pop seq))))))
+	 x)
+    form))
 
 (unless (fboundp 'define-obsolete-variable-alias)
   (defalias 'define-obsolete-variable-alias 'make-obsolete-variable))
--- gnuserv-3.12.5/gnuserv.el~	2002-09-13 12:20:00 +0000
+++ gnuserv-3.12.5/gnuserv.el	2003-02-06 03:04:37 +0000
@@ -270,9 +270,15 @@
 ;; identification, so we'll make a "minor mode".
 (defvar gnuserv-minor-mode nil)
 (make-variable-buffer-local 'gnuserv-minor-mode)
-;;(pushnew '(gnuserv-minor-mode "Server") minor-mode-alist
-;;	 :test 'equal)
-(add-minor-mode 'gnuserv-minor-mode 'gnuserv-mode-line-string)
+(eval-when-compile
+  (if (fboundp 'add-minor-mode)
+      nil
+    (defalias 'add-minor-mode 'ignore)
+    (require 'cl)))
+(if (fboundp 'add-minor-mode)
+    (add-minor-mode 'gnuserv-minor-mode 'gnuserv-mode-line-string)
+  (pushnew (list 'gnuserv-minor-mode gnuserv-mode-line-string)
+	   minor-mode-alist ':test 'equal))
 
 
 ;; Sample gnuserv-frame functions