Fix translations.

[elisp/gnus.git-] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 047cd6b..bdcf934 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -62,18 +62,15 @@ AC_DEFUN(AC_CHECK_EMACS_FLAVOR,
   unset EMACS_cv_SYS_flavor;
 
   AC_EMACS_LISP(flavor,
-    (cond ((featurep (quote xemacs)) \"XEmacs\")\
-          ((boundp (quote MULE)) \"MULE\")\
-          (t \"FSF Emacs\")),
+    (if (featurep (quote xemacs))\
+        \"XEmacs\"\
+      \"Emacs\"),
     "noecho")
-  case $EMACS_cv_SYS_flavor in
-  XEmacs)
-    EMACS_FLAVOR=xemacs;;
-  MULE)
-    EMACS_FLAVOR=mule;;
-  *)
-    EMACS_FLAVOR=emacs;;
-  esac
+  if test $EMACS_cv_SYS_flavor = XEmacs; then
+    EMACS_FLAVOR=xemacs
+  else
+    EMACS_FLAVOR=emacs
+  fi
   AC_MSG_RESULT($EMACS_cv_SYS_flavor)])
 
 AC_DEFUN(AC_PATH_LISPDIR, [
@@ -130,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)
@@ -363,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")])