--- aclocal.m4	Sat Aug 29 10:55:03 1998
+++ aclocal.m4.new	Fri Dec 11 00:41:45 1998
@@ -4,27 +4,31 @@
  [# 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 "$EMACS" = t && EMACS=
-  AC_PATH_PROG(EMACS, emacs xemacs, no)
+  AC_PATH_PROGS(EMACS, emacs xemacs, no)
   if test $EMACS != "no"; then
     AC_MSG_CHECKING([where .elc files should go])
     dnl Set default value
-    lispdir="\$(datadir)/emacs/site-lisp"
-    if test "x$prefix" = "xNONE"; then
-      if test -d $ac_default_prefix/share/emacs/site-lisp; then
-        lispdir="\$(prefix)/share/emacs/site-lisp"
+    if test "x$with_lispdir" = "x"; then
+      lispdir="\$(datadir)/emacs/site-lisp"
+      if test "x$prefix" = "xNONE"; then
+        if test -d $ac_default_prefix/share/emacs/site-lisp; then
+          lispdir="\$(prefix)/share/emacs/site-lisp"
+        else
+          if test -d $ac_default_prefix/lib/emacs/site-lisp; then
+            lispdir="\$(prefix)/lib/emacs/site-lisp"
+          fi
+        fi
       else
-        if test -d $ac_default_prefix/lib/emacs/site-lisp; then
-          lispdir="\$(prefix)/lib/emacs/site-lisp"
-        fi
+        if test -d $prefix/share/emacs/site-lisp; then
+          lispdir="\$(prefix)/share/emacs/site-lisp"
+        else
+         if test -d $prefix/lib/emacs/site-lisp; then
+            lispdir="\$(prefix)/lib/emacs/site-lisp"
+          fi
+        fi
       fi
     else
-      if test -d $prefix/share/emacs/site-lisp; then
-        lispdir="\$(prefix)/share/emacs/site-lisp"
-      else
-        if test -d $prefix/lib/emacs/site-lisp; then
-          lispdir="\$(prefix)/lib/emacs/site-lisp"
-        fi
-      fi
+      lispdir="$with_lispdir"
     fi
     AC_MSG_RESULT($lispdir)
   fi