diff --git a/CMakeLists.txt b/CMakeLists.txt index c763c132e3..c927ae7df0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3176,10 +3176,6 @@ if(SDL_STATIC AND SDL_SHARED AND NOT sdl_static_libname STREQUAL "SDL2") message(STATUS "\"pkg-config --static --libs sdl2\" will return invalid information") endif() -set(SDL2_CONFIG_INTERPRETER "/bin/sh") -if(SOLARIS) - set(SDL2_CONFIG_INTERPRETER "/bin/bash") -endif() # MESSAGE(STATUS "SDL_LIBS: ${SDL_LIBS}") # MESSAGE(STATUS "SDL_STATIC_LIBS: ${SDL_STATIC_LIBS}") diff --git a/configure b/configure index 0ac2e85b2d..7e559cbb45 100755 --- a/configure +++ b/configure @@ -727,7 +727,6 @@ ALSA_LIBS ALSA_CFLAGS ALLOCA CPP -SDL2_CONFIG_INTERPRETER LIBTOOLLINKERTAG LINKER SORT @@ -18338,18 +18337,6 @@ esac -case "$host" in - # On Solaris, jack must be linked deferred explicitly - # to prevent undefined symbol failures. - *-*-solaris*) - SDL2_CONFIG_INTERPRETER=/bin/bash - ;; - *) - SDL2_CONFIG_INTERPRETER=/bin/sh - ;; -esac - - if test x$srcdir != x.; then INCLUDE="-Iinclude $INCLUDE" elif test -d .git; then diff --git a/configure.ac b/configure.ac index 280db2980c..46c17dc3b5 100644 --- a/configure.ac +++ b/configure.ac @@ -113,18 +113,6 @@ esac AC_SUBST(LINKER) AC_SUBST(LIBTOOLLINKERTAG) -case "$host" in - # On Solaris, jack must be linked deferred explicitly - # to prevent undefined symbol failures. - *-*-solaris*) - SDL2_CONFIG_INTERPRETER=/bin/bash - ;; - *) - SDL2_CONFIG_INTERPRETER=/bin/sh - ;; -esac -AC_SUBST(SDL2_CONFIG_INTERPRETER) - if test x$srcdir != x.; then INCLUDE="-Iinclude $INCLUDE" elif test -d .git; then diff --git a/sdl2-config.in b/sdl2-config.in index 7708c294e4..f6eca7668c 100644 --- a/sdl2-config.in +++ b/sdl2-config.in @@ -1,4 +1,4 @@ -#!@SDL2_CONFIG_INTERPRETER@ +#!/bin/sh # Get the canonical path of the folder containing this script bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")