X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=aclocal.m4;h=bdcf934bfdb4d474404d8cbeb97a15fe52dff756;hb=28190cffc1aeaf7e29de90c3b611e6c423afd175;hp=38bfc1690ed5750d6069ddd980aea3e6aa91468f;hpb=d9a2d4797241ce9f86c6889a6fd2e8593ba350a7;p=elisp%2Fgnus.git-

diff --git a/aclocal.m4 b/aclocal.m4
index 38bfc16..bdcf934 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -127,7 +127,7 @@ AC_DEFUN(AC_PATH_ETCDIR, [
     if test "$EMACS_FLAVOR" = "xemacs"; then
       etcdir="\$(lispdir)/../../etc"
     else
-    etcdir="\$(lispdir)/../etc"
+      etcdir="\$(lispdir)/../../etc"
     fi
   fi
   AC_MSG_RESULT($etcdir)
@@ -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")])