diff --git a/BasiliskII/src/AmigaOS/extfs_amiga.cpp b/BasiliskII/src/AmigaOS/extfs_amiga.cpp index f3469bf0..07eabb30 100644 --- a/BasiliskII/src/AmigaOS/extfs_amiga.cpp +++ b/BasiliskII/src/AmigaOS/extfs_amiga.cpp @@ -156,6 +156,7 @@ static const ext2type e2t_translation[] = { {".z", FOURCC('Z','I','V','M'), FOURCC('L','Z','I','V')}, {".gz", FOURCC('G','z','i','p'), FOURCC('G','z','i','p')}, {".hqx", FOURCC('T','E','X','T'), FOURCC('S','I','T','x')}, + {".bin", FOURCC('T','E','X','T'), FOURCC('S','I','T','x')}, {".pdf", FOURCC('P','D','F',' '), FOURCC('C','A','R','O')}, {".ps", FOURCC('T','E','X','T'), FOURCC('t','t','x','t')}, {".sit", FOURCC('S','I','T','!'), FOURCC('S','I','T','x')}, 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 #include @@ -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/configure.in b/BasiliskII/src/Unix/configure.in index 42fdbbe9..a0d7e190 100644 --- a/BasiliskII/src/Unix/configure.in +++ b/BasiliskII/src/Unix/configure.in @@ -71,7 +71,7 @@ if [[ "x$WANT_MON" = "xyes" ]]; then if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then AC_MSG_RESULT(yes) AC_DEFINE(ENABLE_MON) - MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_8080.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c" + MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c" CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass" AC_CHECK_LIB(readline, readline) AC_CHECK_LIB(termcap, tputs)