Ver Fonte

Revert "Make sdl2-config interpreter configurable"

This reverts commit b9f005505b194f498494eec6631c38c3e219fa74.

Making the interpreter configurable is a band-aid fix.
So revert the workaround until we know the actual cause.
Anonymous Maarten há 9 meses atrás
pai
commit
8ae7841d91
4 ficheiros alterados com 1 adições e 30 exclusões
  1. 0 4
      CMakeLists.txt
  2. 0 13
      configure
  3. 0 12
      configure.ac
  4. 1 1
      sdl2-config.in

+ 0 - 4
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}")
 

+ 0 - 13
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

+ 0 - 12
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

+ 1 - 1
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)")