[elpa] externals/mmm-mode f5974d4894 06/14: Remove emacs/xemacs handling from configure.ac

[ELPA Syncer]

branch: externals/mmm-mode
commit f5974d489430a93980a3af3b518c98e1375c4d80
Author: Ola Nilsson <ola.nilsson@gmail.com>
Commit: Ola Nilsson <ola.nilsson@gmail.com>

    Remove emacs/xemacs handling from configure.ac
    
    This makes configure prefer emacs over xemacs, it used to be the other
    way around.
    
    Verify that something that looks like Emacs is found by
    AM_PATH_LISPDIR and notify the user with an error otherwise.
    
    AC_SUBST(EMACS) is not needed, already done by AC_CHECK_PROG.
    The --with-emacs and --with-xemacs options are not mutually exclusive,
     and "configure EMACS=xemacs" works better anyway.
    AM_PATH_LISPDIR already does the equivalent of the AC_CHECK_PROG
     statement (except it prefers emacs over xemacs), so that can go too.
    AM_PATH_LISPDIR also handles EMACS=t, so that test can also be removed.
---
 configure.ac | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 02d6c80046..e1a552ed56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,23 +3,11 @@ AC_INIT([mmm-mode], [0.5.8])
 AC_CONFIG_SRCDIR([mmm-mode.el])
 AM_INIT_AUTOMAKE([info-in-builddir])
 
-dnl
-dnl Apparently, if you run a shell window in Emacs, it sets the EMACS
-dnl environment variable to 't'.  Lets undo the damage.
-dnl
-if test "${EMACS}" = "t"; then
-   EMACS=""
-fi
-
-AC_ARG_WITH(xemacs,           --with-xemacs             Use XEmacs to build, [ 
if test "${withval}" = "yes"; then EMACS=xemacs; else EMACS=${withval}; fi ])
-AC_ARG_WITH(emacs,            --with-emacs              Use Emacs to build, [ 
if test "${withval}" = "yes"; then EMACS=emacs; else EMACS=${withval}; fi ])
-
-AC_CHECK_PROG(EMACS, xemacs, xemacs, emacs)
-
 AM_PATH_LISPDIR
 
-AC_EMACS_VERSION
+AS_IF([test "$EMACS" = no],[AC_MSG_ERROR([no Emacs program found])])
 
+AC_EMACS_VERSION
 
 dnl Checks for programs.
 
@@ -31,6 +19,4 @@ dnl Checks for typedefs, structures, and compiler 
characteristics.
 
 dnl Checks for library functions.
 
-AC_SUBST(EMACS)
-
 AC_OUTPUT(Makefile)