Windows configure.ac: fix broken SDL check with macro intended for configure script contents context being used in shell variable contents context

This commit is contained in:
rakslice 2020-08-28 03:09:37 -07:00
parent 4b93738773
commit 92a1ee2128
2 changed files with 4 additions and 2 deletions

View File

@ -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" 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 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` SDL_CFLAGS=`$sdl_config --cflags`
AC_SUBST(SDL_CFLAGS) AC_SUBST(SDL_CFLAGS)
#if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then #if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then

View File

@ -275,7 +275,8 @@ dnl Use the dummy prefs file.
CPUSRCS="$CPUSRCS ../dummy/prefs_dummy.cpp" CPUSRCS="$CPUSRCS ../dummy/prefs_dummy.cpp"
dnl We really want SDL for now 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` SDL_CFLAGS=`$sdl_config --cflags`
AC_SUBST(SDL_CFLAGS) AC_SUBST(SDL_CFLAGS)
SDL_LIBS=`$sdl_config --static-libs` SDL_LIBS=`$sdl_config --static-libs`