Only pull the SDL cflags, libs if sdl is enabled

MythTV · May 9, 2012 · 84b6d93 · 84b6d93
1 parent 6149533
commit 84b6d93
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/mythtv/configure b/mythtv/configure
@@ -4012,22 +4012,24 @@ enabled freetype2 ||
 
 
 ##########################################
-SDL_CONFIG="${cross_prefix}sdl-config"
+if enabled sdl ; then
-if check_pkg_config sdl SDL_events.h SDL_PollEvent; then
+    SDL_CONFIG="${cross_prefix}sdl-config"
-    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
+    if check_pkg_config sdl SDL_events.h SDL_PollEvent; then
-    enable sdl &&
+        check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
-    check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
+        enable sdl &&
-else
+        check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
-  if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+    else
-    sdl_cflags=$("${SDL_CONFIG}" --cflags)
+      if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
-    sdl_libs=$("${SDL_CONFIG}" --libs)
+        sdl_cflags=$("${SDL_CONFIG}" --cflags)
-    check_func_headers SDL_version.h SDL_Linked_Version $sdl_cflags $sdl_libs &&
+        sdl_libs=$("${SDL_CONFIG}" --libs)
-    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
+        check_func_headers SDL_version.h SDL_Linked_Version $sdl_cflags $sdl_libs &&
-    enable sdl &&
+        check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
-    check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
+        enable sdl &&
-  fi
+        check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
+      fi
+    fi
+    enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
 fi
-enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
 
 texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html