[FFmpeg-devel] [PATCH]Silence a warning if pkg_config is not available

[Michael Niedermayer]

On Wed, May 04, 2011 at 08:25:40AM -0700, Baptiste Coudurier wrote:
> On 05/04/2011 06:27 AM, Michael Niedermayer wrote:
> > On Mon, May 02, 2011 at 04:07:32PM -0700, Baptiste Coudurier wrote:
> >> On 05/02/2011 03:57 PM, Carl Eugen Hoyos wrote:
> >>> Hi!
> >>>
> >>> Attached patch silences a warning if configure is run on a system where 
> >>> pkg_config is not installed.
> >>>
> >>
> >> Thanks !
> >> FYI SDL detection is broken on OSX because of the change to pkg-config.
> > 
> > could you elaborate? i dont have osx and am not sure what "the change"
> > is, do you mean the
> > configure: use pkg-config helpers
> > or
> > configure: improve pkg-config support
> > or both or something else?
> 
> The commit that change SDL detection to use pkg-config instead of
> sdl-config.

I guess its the hunk below then:

@@ -2906,7 +2909,11 @@ if enabled libdc1394; then
     die "ERROR: No version of libdc1394 found "
 fi

-if check_pkg_config sdl SDL.h SDL_Init; then
+SDL_CONFIG="${cross_prefix}sdl-config"
+if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+    sdl_cflags=$("${SDL_CONFIG}" --cflags)
+    sdl_libs=$("${SDL_CONFIG}" --libs)
+    check_func_headers SDL.h SDL_Init $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

-------------
can someone confirm reverting this fixes the issue?

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 3
"Rare item" - "Common item with rare defect or maybe just a lie"
"Professional" - "'Toy' made in china, not functional except as doorstop"
"Experts will know" - "The seller hopes you are not an expert"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20110504/fb15c69e/attachment.asc>