[FFmpeg-cvslog] configure: favor pkg_config over sdl_config
Michael Niedermayer
git at videolan.org
Wed May 18 17:18:24 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 18 16:36:08 2011 +0200| [e3ff6e8d0fb222a8fce7c747781258e6f5e47a70] | committer: Michael Niedermayer
configure: favor pkg_config over sdl_config
This fixes linking issues on ubuntu.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3ff6e8d0fb222a8fce7c747781258e6f5e47a70
---
configure | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 0e7e94c..41a66d7 100755
--- a/configure
+++ b/configure
@@ -2943,19 +2943,19 @@ if enabled libdc1394; then
fi
SDL_CONFIG="${cross_prefix}sdl-config"
-if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
+ check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
+ enable sdl &&
+ check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
+else
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
sdl_cflags=$("${SDL_CONFIG}" --cflags)
sdl_libs=$("${SDL_CONFIG}" --libs)
check_func_headers SDL_version.h SDL_Linked_Version $sdl_cflags $sdl_libs &&
check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
enable sdl &&
check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
-else
- if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
- check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
- enable sdl &&
- check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
- fi
+ fi
fi
texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
More information about the ffmpeg-cvslog
mailing list