* Makefile.in (EXAMINE_PACKAGEDIR): Use configure-package-path.

* aclocal.m4 (AC_EXAMINE_PACKAGEDIR): Ditto.

diff --git a/Makefile.in b/Makefile.in
index d831bbe..fbc5432 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,18 +19,20 @@ PWD=
 # It will be used to look for the XEmacs package path if this file is
 # mis-configured (e.g. configured for FSFmacs).
 EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \
-       "(let (package-dir) \
-          (if (boundp (quote early-packages)) \
-              (let ((dirs (delq nil (append (if early-package-load-path \
-                                                early-packages) \
-                                            (if late-package-load-path \
-                                                late-packages) \
-                                            (if last-package-load-path \
-                                                last-packages))))) \
-                (while (and dirs (not package-dir)) \
-                  (if (file-directory-p (car dirs)) \
-                      (setq package-dir (car dirs) \
-                            dirs (cdr dirs)))))) \
+       "(let ((dirs (append \
+                     (if (and (boundp (quote configure-package-path)) \
+                              (listp configure-package-path)) \
+                         (delete \"\" configure-package-path)) \
+                     (if (boundp (quote early-packages)) \
+                         (append \
+                          (if early-package-load-path early-packages) \
+                          (if late-package-load-path late-packages) \
+                          (if last-package-load-path last-packages))))) \
+              package-dir) \
+          (while (and dirs (not package-dir)) \
+            (if (file-directory-p (car dirs)) \
+                (setq package-dir (car dirs) \
+                      dirs (cdr dirs)))) \
           (princ (or package-dir \"\")))" 2>/dev/null
 
 all: lick info

diff --git a/aclocal.m4 b/aclocal.m4
index 38bfc16..c32d886 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -360,18 +360,20 @@ AC_SUBST(USE_FONTS)
 AC_DEFUN(AC_EXAMINE_PACKAGEDIR,
  [dnl Examine PACKAGEDIR.
   AC_EMACS_LISP(PACKAGEDIR,
-    (let (package-dir)\
-      (if (boundp (quote early-packages))\
-         (let ((dirs (delq nil (append (if early-package-load-path\
-                                           early-packages)\
-                                       (if late-package-load-path\
-                                           late-packages)\
-                                       (if last-package-load-path\
-                                           last-packages)))))\
-           (while (and dirs (not package-dir))\
-             (if (file-directory-p (car dirs))\
-                 (setq package-dir (car dirs)\
-                       dirs (cdr dirs))))))\
+    (let ((dirs (append\
+                (if (and (boundp (quote configure-package-path))\
+                         (listp configure-package-path))\
+                    (delete \"\" configure-package-path))\
+                (if (boundp (quote early-packages))\
+                    (append\
+                     (if early-package-load-path early-packages)\
+                     (if late-package-load-path late-packages)\
+                     (if last-package-load-path last-packages)))))\
+         package-dir)\
+      (while (and dirs (not package-dir))\
+       (if (file-directory-p (car dirs))\
+           (setq package-dir (car dirs)\
+                 dirs (cdr dirs))))\
       (or package-dir \"\")),
     "noecho")])