Revert.

diff --git a/ChangeLog b/ChangeLog
index ab1429c..fe34af6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-2006-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * acinclude.m4 (AC_EXAMINE_PACKAGEDIR): Check for
-       (early|late|last)-package-hierarchies and configure-package-path
-       as well as (early|late|last)-packages.
-
 2006-09-29  Daiki Ueno  <ueno@unixuser.org>
 
        * Riece: Version 3.1.1 released.

diff --git a/acinclude.m4 b/acinclude.m4
index 3557023..ad09542 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -308,43 +308,19 @@ AC_SUBST(USE_FONTS)
 AC_DEFUN([AC_EXAMINE_PACKAGEDIR],
  [dnl Examine PACKAGEDIR.
   AC_EMACS_LISP(PACKAGEDIR,
-    (let ((prefix \"${prefix}\")\
-         (dirs (append\
-                (cond ((boundp (quote early-package-hierarchies))\
-                       (append (if early-package-load-path\
-                                   early-package-hierarchies)\
-                               (if late-package-load-path\
-                                   late-package-hierarchies)\
-                               (if last-package-load-path\
-                                   last-package-hierarchies)))\
-                      ((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))))\
-                (if (and (boundp (quote configure-package-path))\
-                         (listp configure-package-path))\
-                    (delete \"\" configure-package-path))))\
-         package-dir)\
-      (while (and dirs (not package-dir))\
-       (if (file-directory-p (car dirs))\
-           (setq package-dir (car dirs)\
-                 dirs (cdr dirs))))\
-      (if package-dir\
-         (progn\
-           (if (string-match \"/\$\" package-dir)\
-               (setq package-dir (substring package-dir 0\
-                                            (match-beginning 0))))\
-           (if (and prefix\
-                    (progn\
-                      (setq prefix (file-name-as-directory prefix))\
-                      (eq 0 (string-match (regexp-quote prefix)\
-                                          package-dir))))\
-               (replace-match \"\$(prefix)/\" nil nil package-dir)\
-             package-dir))\
-       \"\")),
+    (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))))))\
+      (or package-dir \"\")),
     "noecho")])
 
 AC_DEFUN([AC_PATH_PACKAGEDIR],