$FreeBSD$

--- configure.orig	Mon Sep 24 12:40:19 2001
+++ configure	Mon Sep 24 12:44:38 2001
@@ -980,13 +980,13 @@
 # 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
+#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
+#fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
 echo "configure:993: checking for working autoconf" >&5
@@ -1006,13 +1006,13 @@
 # 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
+#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
+#fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
 echo "configure:1019: checking for working autoheader" >&5
@@ -4736,7 +4736,7 @@
     else
             echo $ac_n "checking version of bison""... $ac_c" 1>&6
 echo "configure:4739: checking version of bison" >&5
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
         1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
@@ -4855,7 +4855,7 @@
   ;;
 esac
 fi
-EMACS="$ac_cv_path_EMACS"
+EMACS=no
 if test -n "$EMACS"; then
   echo "$ac_t""$EMACS" 1>&6
 else
@@ -5157,10 +5157,10 @@
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@PACKAGE@%$PACKAGE%g
 s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
+s%@ACLOCAL@%/usr/bin/true%g
+s%@AUTOCONF@%/usr/bin/true%g
+s%@AUTOMAKE@%/usr/bin/true%g
+s%@AUTOHEADER@%/usr/bin/true%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g