From 92a1ee212859f1c5aae086bf225acd15ba22effa Mon Sep 17 00:00:00 2001 From: rakslice Date: Fri, 28 Aug 2020 03:09:37 -0700 Subject: [PATCH] Windows configure.ac: fix broken SDL check with macro intended for configure script contents context being used in shell variable contents context --- BasiliskII/src/Windows/configure.ac | 3 ++- SheepShaver/src/Windows/configure.ac | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BasiliskII/src/Windows/configure.ac b/BasiliskII/src/Windows/configure.ac index bb8e1a22..88adb1bd 100755 --- a/BasiliskII/src/Windows/configure.ac +++ b/BasiliskII/src/Windows/configure.ac @@ -543,7 +543,8 @@ CPUINCLUDES="-I../uae_cpu" CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp $FPUSRCS cpustbl.cpp cpudefs.cpp $CPUSRCS $JITSRCS" dnl We really want SDL for now -AC_CHECK_TOOL(sdl_config, sdl2-config, [AC_MSG_ERROR([Sorry, you currently need SDL for this port])]) +AC_CHECK_TOOL(sdl_config, sdl2-config, no) +AS_IF([test "x$sdl_config" = xno], [AC_MSG_ERROR([Sorry, you currently need SDL for this port])]) SDL_CFLAGS=`$sdl_config --cflags` AC_SUBST(SDL_CFLAGS) #if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then diff --git a/SheepShaver/src/Windows/configure.ac b/SheepShaver/src/Windows/configure.ac index f646bb6e..b5347be2 100644 --- a/SheepShaver/src/Windows/configure.ac +++ b/SheepShaver/src/Windows/configure.ac @@ -275,7 +275,8 @@ dnl Use the dummy prefs file. CPUSRCS="$CPUSRCS ../dummy/prefs_dummy.cpp" dnl We really want SDL for now -AC_CHECK_TOOL(sdl_config, sdl2-config, [AC_MSG_ERROR([Sorry, you currently need SDL for this port])]) +AC_CHECK_TOOL(sdl_config, sdl2-config, no) +AS_IF([test "x$sdl_config" = xno], [AC_MSG_ERROR([Sorry, you currently need SDL for this port])]) SDL_CFLAGS=`$sdl_config --cflags` AC_SUBST(SDL_CFLAGS) SDL_LIBS=`$sdl_config --static-libs`