From 3085bc3c0b00d3ab06d26d1d997a6660aedf0b5e Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 6 Jul 2001 00:07:33 +0000
Subject: [PATCH] * lisp/Makefile.in (clever): Change the quoting style for
 the elisp  form to check for XEmacs-p.

* lisp/dgnushack.el: Require `path-util' first, and then search for
 the path if it is not found.
---
 ChangeLog         |    8 ++++++++
 lisp/Makefile.in  |    4 ++--
 lisp/dgnushack.el |   30 ++++++++++++++++--------------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd6541e..833bdf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-06  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/Makefile.in (clever): Change the quoting style for the
+	elisp form to check for XEmacs-p.
+
+	* lisp/dgnushack.el: Require `path-util' first, and then search
+	for the path if it is not found.
+
 2001-06-28  Akitada Koyama  <cx2@kh.rim.or.jp>
 
 	* texi/gnus-ja.texi (Web Newspaper): Add a description how to show
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 6e7da4c..424ad15 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -32,10 +32,10 @@ warn: clean-some gnus-load.elc
 clever some: gnus-load.elc
 	@if test -f $(srcdir)/gnus.elc; then \
 	  echo \
-	    "checking for whether the all elc files should be recompiled..."; \
+	    "checking whether the all elc files should be recompiled..."; \
 	  RM_ELC=nil; \
 	  if test `$(EMACS) -batch -q -no-site-file \
-		-eval "(princ (format \"%s\" (featurep (quote xemacs))))" \
+		-eval '(prin1 (featurep (quote xemacs)))' \
 		2>/dev/null` = t; then \
 	    test ! -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \
 	  else \
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index c1aa474..d10d7ff 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -169,29 +169,31 @@ to the specified name LIBRARY (a la calling `load' instead of `load-library')."
 ;; Don't load path-util until `char-after' and `char-before' have been
 ;; optimized because it requires `poe' and then modify the functions.
 
-;; If the APEL modules have been installed under the directory
+;; If the APEL modules are installed under the directory
 ;; "/usr/local/share/mule/site-lisp/apel/", the parent directory
 ;; "/usr/local/share/mule/site-lisp/" should be included in the
 ;; standard `load-path' or added by the configure option
 ;; "--with-addpath=".  And also the directory where the EMU modules
-;; have been installed (e.g. "/usr/local/share/mule/19.34/site-lisp/")
+;; are installed (e.g. "/usr/local/share/mule/19.34/site-lisp/")
 ;; should be included in the standard `load-path' or added by the
 ;; configure option "--with-addpath=".
-(unless (featurep 'path-util)
-  (let ((path (locate-library "apel/path-util")))
-    (if path
-	(progn
-	  (when (string-match "/$" (setq path (file-name-directory path)))
-	    (setq path (substring path 0 (match-beginning 0))))
-	  (unless (or (member path load-path)
-		      (member (file-name-as-directory path) load-path))
-	    (push path load-path))
-	  (require 'path-util))
-      (error "
+(condition-case nil
+    (require 'path-util)
+  (error
+   (let ((path (locate-library "apel/path-util")))
+     (if path
+	 (progn
+	   (when (string-match "/$" (setq path (file-name-directory path)))
+	     (setq path (substring path 0 (match-beginning 0))))
+	   (unless (or (member path load-path)
+		       (member (file-name-as-directory path) load-path))
+	     (push path load-path))
+	   (require 'path-util))
+       (error "
 APEL modules does not found in %s.
 Try to re-configure with --with-addpath=APEL_PATH and run make again.
 "
-	     load-path))))
+	      load-path)))))
 (unless (locate-library "mel")
   (add-path "flim"))
 (unless (module-installed-p 'mel)
-- 
1.7.10.4