--- configure.orig	Fri May  1 01:48:25 1998
+++ configure	Sun Feb  6 01:46:33 2000
@@ -837,13 +837,8 @@
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
    ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
-fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
 echo "configure:850: checking for working autoconf" >&5
@@ -863,13 +858,8 @@
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
    AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
-fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
 echo "configure:876: checking for working autoheader" >&5
@@ -3958,7 +3948,7 @@
    fi
    
 
-      l=
+      l=l
    
 
          test -d po || mkdir po
@@ -4004,7 +3994,7 @@
   ;;
 esac
 fi
-EMACS="$ac_cv_path_EMACS"
+EMACS=no
 if test -n "$EMACS"; then
   echo "$ac_t""$EMACS" 1>&6
 else