diff --git a/vs2015/sdl2/configure b/vs2015/sdl2/configure index aee0cb6ec..3e1f8e8c6 100755 --- a/vs2015/sdl2/configure +++ b/vs2015/sdl2/configure @@ -18283,7 +18283,7 @@ if ac_fn_c_try_link "$LINENO"; then : echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means ESD was incorrectly installed" + echo "*** exact error that occurred. This usually means ESD was incorrectly installed" echo "*** or that you have moved ESD since it was installed. In the latter case, you" echo "*** may want to edit the esd-config script: $ESD_CONFIG" fi @@ -24520,7 +24520,9 @@ else fi ;; - arm*-apple-darwin*|*-ios-*) + *-ios-*) + # NTS: DOSBox-X specific modification: This used to match ANY ARM-based Darwin, but the new ARM-based Macbooks are not iOS + # so the Darwin match here was deleted. ARCH=ios CheckVisibilityHidden @@ -24809,7 +24811,7 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h ;; *) as_fn_error $? " -*** Unsupported host: Please add to configure.in +*** Unsupported host: Please add to configure.ac " "$LINENO" 5 ;; esac diff --git a/vs2015/sdl2/configure.ac b/vs2015/sdl2/configure.ac index a8c63d234..01cc4ed65 100644 --- a/vs2015/sdl2/configure.ac +++ b/vs2015/sdl2/configure.ac @@ -3764,7 +3764,9 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau # other spins, like x86-64, use a more standard "libstdc++.so.*" AC_CHECK_FILE("/boot/system/lib/libstdc++.r4.so", EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lstdc++.r4", EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lstdc++") ;; - arm*-apple-darwin*|*-ios-*) + *-ios-*) + # NTS: DOSBox-X specific modification: This used to match ANY ARM-based Darwin, but the new ARM-based Macbooks are not iOS + # so the Darwin match here was deleted. ARCH=ios CheckVisibilityHidden diff --git a/vs2015/sdl2/test/aclocal.m4 b/vs2015/sdl2/test/aclocal.m4 index 2c8d31490..13ca1a74b 100644 --- a/vs2015/sdl2/test/aclocal.m4 +++ b/vs2015/sdl2/test/aclocal.m4 @@ -184,7 +184,7 @@ int main(int argc, char *argv[]) echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occurred. This usually means SDL was incorrectly installed" + echo "*** exact error that occured. This usually means SDL was incorrectly installed" echo "*** or that you have moved SDL since it was installed. In the latter case, you" echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" ]) CFLAGS="$ac_save_CFLAGS" diff --git a/vs2015/sdl2/test/configure b/vs2015/sdl2/test/configure index f8a91d94c..61c32fba1 100755 --- a/vs2015/sdl2/test/configure +++ b/vs2015/sdl2/test/configure @@ -3437,7 +3437,7 @@ if ac_fn_c_try_link "$LINENO"; then : echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occurred. This usually means SDL was incorrectly installed" + echo "*** exact error that occured. This usually means SDL was incorrectly installed" echo "*** or that you have moved SDL since it was installed. In the latter case, you" echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" fi