Aric Stewart : configure: Use SDL2_LIBS if set.

Alexandre Julliard julliard at winehq.org
Fri Feb 15 14:37:02 CST 2019


Module: wine
Branch: master
Commit: 967e2622fbcb830f88b636c613afa95c5cecd97e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=967e2622fbcb830f88b636c613afa95c5cecd97e

Author: Aric Stewart <aric at codeweavers.com>
Date:   Fri Feb 15 10:53:51 2019 -0600

configure: Use SDL2_LIBS if set.

Fix by Andrew Eikum.

Signed-off-by: Aric Stewart <aric at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 configure    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 7f89b1e..87ebf3c 100755
--- a/configure
+++ b/configure
@@ -13925,7 +13925,7 @@ if ${ac_cv_lib_soname_SDL2+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_soname_save_LIBS=$LIBS
-LIBS="-lSDL2  $LIBS"
+LIBS="-lSDL2 $SDL2_LIBS $LIBS"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/configure.ac b/configure.ac
index 36add65..60f8acc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1629,7 +1629,7 @@ if test "x$with_sdl" != "xno"
 then
     WINE_PACKAGE_FLAGS(SDL2,[sdl2],[-lSDL2],,,
         [AC_CHECK_HEADERS([SDL2/SDL.h],
-            [WINE_CHECK_SONAME(SDL2,SDL_Init,,,,[[libSDL2-2.0*]])])])
+            [WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])])])
 fi
 WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"],
                  [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.])




More information about the wine-cvs mailing list