Browse Source

Make sdl2-config interpreter configurable

Anonymous Maarten 10 months ago
parent
commit
b9f005505b
4 changed files with 30 additions and 1 deletions
  1. 4 0
      CMakeLists.txt
  2. 13 0
      configure
  3. 12 0
      configure.ac
  4. 1 1
      sdl2-config.in

+ 4 - 0
CMakeLists.txt

@@ -3176,6 +3176,10 @@ 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}")
 

+ 13 - 0
configure

@@ -727,6 +727,7 @@ ALSA_LIBS
 ALSA_CFLAGS
 ALLOCA
 CPP
+SDL2_CONFIG_INTERPRETER
 LIBTOOLLINKERTAG
 LINKER
 SORT
@@ -18337,6 +18338,18 @@ 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

+ 12 - 0
configure.ac

@@ -113,6 +113,18 @@ 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 @@
-#!/bin/sh
+#!@SDL2_CONFIG_INTERPRETER@
 
 # Get the canonical path of the folder containing this script
 bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")