@@ -44,12 +44,13 @@
 		;;
 	m68k-*-amigaos*)
 		AS_IF([test x"$OBJCFLAGS" = x""], [
 			OBJCFLAGS="-O0"
 		])
-		OBJCFLAGS="$OBJCFLAGS -noixemul -D__NO_NET_API"
+		OBJCFLAGS="$OBJCFLAGS -noixemul"
 		OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -noixemul"
+		CPPFLAGS="$CPPFLAGS -D__NO_NET_API"
 		LDFLAGS="$LDFLAGS -noixemul"
 
 		enable_shared="no"
 		enable_threads="no"
 		enable_files="yes"	# Required for reading ENV:
@@ -66,15 +67,21 @@
 			AC_SUBST(AMIGA_LIB_CFLAGS,
 				"-mcpu=68020 -fbaserel -ffreestanding")
 			AC_SUBST(AMIGA_LIB_LDFLAGS,
 				"-mcpu=68020 -fbaserel -resident -nostartfiles")
 		])
+
+		AC_SUBST(LIBBASES_M, libbases.m)
 		;;
 	powerpc-*-amigaos*)
+		CPPFLAGS="$CPPFLAGS -D__USE_INLINE__"
+
 		enable_shared="no"
 		enable_threads="no"
 		enable_files="yes"	# Required for reading ENV:
+
+		AC_SUBST(LIBBASES_M, libbases.m)
 		;;
 	*-morphos*)
 		AS_IF([test x"$with_ixemul" != x"yes"], [
 			AS_IF([test x"$OBJCFLAGS" = x""], [
 				OBJCFLAGS="-O2 -g"
@@ -93,10 +100,12 @@
 				AC_SUBST(AMIGA_LIB_CFLAGS, $t)
 				t="-mresident32 -nostartfiles -nodefaultlibs"
 				t="$t -lc"
 				AC_SUBST(AMIGA_LIB_LDFLAGS, $t)
 			])
+
+			AC_SUBST(LIBBASES_M, libbases.m)
 		])
 
 		enable_shared="no"
 		enable_threads="no"
 		;;