diff --git a/BasiliskII/src/Unix/aclocal.m4 b/BasiliskII/src/Unix/aclocal.m4
index 7d10bf23..3243d88f 100644
--- a/BasiliskII/src/Unix/aclocal.m4
+++ b/BasiliskII/src/Unix/aclocal.m4
@@ -245,8 +245,6 @@ AC_ARG_ENABLE(esdtest, [  --disable-esdtest       Do not try to compile and run
   if test "$ESD_CONFIG" = "no" ; then
     no_esd=yes
   else
-    AC_LANG_SAVE
-    AC_LANG_C
     ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
     ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
 
@@ -323,7 +321,6 @@ int main ()
 ],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
-       AC_LANG_RESTORE
      fi
   fi
   if test "x$no_esd" = x ; then
@@ -343,8 +340,6 @@ int main ()
           echo "*** Could not run ESD test program, checking why..."
           CFLAGS="$CFLAGS $ESD_CFLAGS"
           LIBS="$LIBS $ESD_LIBS"
-          AC_LANG_SAVE
-          AC_LANG_C
           AC_TRY_LINK([
 #include <stdio.h>
 #include <esd.h>
@@ -364,7 +359,6 @@ int main ()
           echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
-          AC_LANG_RESTORE
        fi
      fi
      ESD_CFLAGS=""
diff --git a/BasiliskII/src/Unix/autogen.sh b/BasiliskII/src/Unix/autogen.sh
index 34bfdd50..c5f6a83c 100755
--- a/BasiliskII/src/Unix/autogen.sh
+++ b/BasiliskII/src/Unix/autogen.sh
@@ -1,5 +1,36 @@
 #! /bin/sh
-aclocal
-autoheader
-autoconf
-./configure $*
+# Run this to generate all the initial makefiles, etc.
+# This was lifted from the Gimp, and adapted slightly by
+# Christian Bauer.
+
+DIE=0
+
+PROG="Basilisk II"
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+        echo
+        echo "You must have autoconf installed to compile $PROG."
+        echo "Download the appropriate package for your distribution,"
+        echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+        DIE=1
+}
+
+if test "$DIE" -eq 1; then
+        exit 1
+fi
+
+if test -z "$*"; then
+        echo "I am going to run ./configure with no arguments - if you wish "
+        echo "to pass any to it, please specify them on the $0 command line."
+fi
+
+for dir in .
+do 
+  echo processing $dir
+  (cd $dir; \
+  aclocalinclude="$ACLOCAL_FLAGS"; \
+  aclocal $aclocalinclude; \
+  autoheader; autoconf)
+done
+
+./configure "$@"