--- aclocal.m4.orig	2007-04-30 20:12:23.000000000 +0200
+++ aclocal.m4	2007-05-01 09:52:33.000000000 +0200
@@ -2927,6 +2927,16 @@
 
 # AM_PATH_LISPDIR
 # ---------------
+echo 'EMACS TEST'
+AC_ARG_WITH([emacs],[AS_HELP_STRING([--with-emacs],[Enables emacs
+support]),[MY_EMACS=emacs],[MY_EMACS=no])
+echo 'EMACS=$MY_EMACS'
+if test "$MY_EMACS"="no"; theni
+echo 'XEMACS TEST'
+AC_ARG_WITH([xemacs],[AS_HELP_STRING([--with-xemacs],[Enables xemacs
+support]),[MY_EMACS=xemacs],[MY_EMACS=no])
+echo 'XEMACS=$MY_EMACS'
+
 AC_DEFUN([AM_PATH_LISPDIR],
 [AC_ARG_WITH(lispdir,
  [  --with-lispdir          Override the default lisp directory ],
@@ -2937,7 +2947,7 @@
  # If set to t, that means we are running in a shell under Emacs.
  # If you have an Emacs named "t", then use the full path.
  test x"$EMACS" = xt && EMACS=
- AC_CHECK_PROGS(EMACS, emacs xemacs, no)
+ EMACS="$MY_EMACS"
  if test $EMACS != "no"; then
    if test x${lispdir+set} != xset; then
      AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir],