* aclocal.m4 (AC_CHECK_EMACS_FLAVOR): Don't check for Mule 2.

diff --git a/ChangeLog b/ChangeLog
index 87e5a59..9a9e3a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2004-01-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * aclocal.m4 (AC_CHECK_EMACS_FLAVOR): Don't check for Mule 2.
        * sample.lpath.el: Remove.
        * contrib/cus-dep.el: Remove.
        * contrib/gnus-idna.el: Remove.

diff --git a/aclocal.m4 b/aclocal.m4
index 047cd6b..38bfc16 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, [

diff --git a/configure b/configure
index f9209ed..36fd3cf 100755 (executable)
--- a/configure
+++ b/configure
@@ -1598,9 +1598,9 @@ echo $ECHO_N "checking what a flavor does $EMACS have... $ECHO_C" >&6
     unset EMACS_cv_SYS_flavor;
 
 
-elisp="(cond ((featurep (quote xemacs)) \"XEmacs\")\
-          ((boundp (quote MULE)) \"MULE\")\
-          (t \"FSF Emacs\"))"
+elisp="(if (featurep (quote xemacs))\
+        \"XEmacs\"\
+      \"Emacs\")"
 if test -z ""noecho""; then
        echo "$as_me:$LINENO: checking for flavor" >&5
 echo $ECHO_N "checking for flavor... $ECHO_C" >&6
@@ -1625,14 +1625,11 @@ if test -z ""noecho""; then
 echo "${ECHO_T}$flavor" >&6
 fi
 
-  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
   echo "$as_me:$LINENO: result: $EMACS_cv_SYS_flavor" >&5
 echo "${ECHO_T}$EMACS_cv_SYS_flavor" >&6
   if test "$prefix" = NONE; then