[PATCH] configure: Don't prepend folder name for SDL.h.

Gijs Vermeulen gijsvrm at gmail.com
Wed Dec 2 14:31:15 CST 2020


From: Dean M Greer <gcenx83 at gmail.com>

This fixes pkgconfig SDL2 detection when SDL2 is installed in a non-standard location.

Signed-off-by: Dean M Greer <gcenx83 at gmail.com>
Signed-off-by: Gijs Vermeulen <gijsvrm at gmail.com>
---
 configure.ac               | 2 +-
 dlls/winebus.sys/bus_sdl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index e823543f1cd..168df52f791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1712,7 +1712,7 @@ dnl **** Check for libSDL2 ****
 if test "x$with_sdl" != "xno"
 then
     WINE_PACKAGE_FLAGS(SDL2,[sdl2],[-lSDL2],,,
-        [AC_CHECK_HEADERS([SDL2/SDL.h],
+        [AC_CHECK_HEADERS([SDL.h],
             [WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])])])
 fi
 WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"],
diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index 19c6f23e071..06fdaa4dc62 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -28,7 +28,7 @@
 # include <unistd.h>
 #endif
 #ifdef HAVE_SDL2_SDL_H
-# include <SDL2/SDL.h>
+# include <SDL.h>
 #endif
 
 #define NONAMELESSUNION
-- 
2.29.2




More information about the wine-devel mailing list