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

This fixes pkgconfig SDL2 detection when SDL2 is installed in a non-standard location. Signed-off-by: Dean M Greer <gcenx83@gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

configure: Don't prepend folder name for SDL.h.
e4fbae83 · Dean M Greer · Alexandre Julliard · 574ced0d · e4fbae83 · e4fbae83
Commit e4fbae83 authored Dec 02, 2020 by Dean M Greer Committed by Alexandre Julliard Dec 02, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

configure configure +4 -4

configure.ac configure.ac +1 -1

bus_sdl.c dlls/winebus.sys/bus_sdl.c +2 -2

config.h.in include/config.h.in +2 -2

No files found.
--- a/configure
+++ b/configure
@@ -14966,12 +14966,12 @@ $as_echo "$as_me:${as_lineno-$LINENO}: sdl2 cflags: $SDL2_CFLAGS" >&5
 $as_echo "$as_me:${as_lineno-$LINENO}: sdl2 libs: $SDL2_LIBS" >&5
 ac_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $SDL2_CFLAGS"
-for ac_header in SDL2/SDL.h
+for ac_header in SDL.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "SDL2/SDL.h" "ac_cv_header_SDL2_SDL_h" "$ac_includes_default"
-if test "x$ac_cv_header_SDL2_SDL_h" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "SDL.h" "ac_cv_header_SDL_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_h" = xyes; then :
  cat >>confdefs.h <<_ACEOF
-#define HAVE_SDL2_SDL_H 1
+#define HAVE_SDL_H 1
 _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lSDL2" >&5
 $as_echo_n "checking for -lSDL2... " >&6; }

--- 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"],

--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -27,8 +27,8 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#ifdef HAVE_SDL2_SDL_H
-# include <SDL2/SDL.h>
+#ifdef HAVE_SDL_H
+# include <SDL.h>
 #endif

 #define NONAMELESSUNION

--- a/include/config.h.in
+++ b/include/config.h.in
@@ -738,8 +738,8 @@
 /* Define to 1 if you have the <scsi/sg.h> header file. */
 #undef HAVE_SCSI_SG_H

-/* Define to 1 if you have the <SDL2/SDL.h> header file. */
-#undef HAVE_SDL2_SDL_H
+/* Define to 1 if you have the <SDL.h> header file. */
+#undef HAVE_SDL_H

 /* Define to 1 if you have the <Security/Security.h> header file. */
 #undef HAVE_SECURITY_SECURITY_H