[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r9816: Look for LIBAVCODEC_VERSION_T
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r9816: Look for LIBAVCODEC_VERSION_TRIPLET before LIBAVCODEC_VERSION as the |
Date: |
Mon, 22 Sep 2008 19:41:45 +0200 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 9816
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2008-09-22 19:41:45 +0200
message:
Look for LIBAVCODEC_VERSION_TRIPLET before LIBAVCODEC_VERSION as the
latter is defined in terms of the former when available.
Fixes configuration on fedora9.
modified:
macros/ffmpeg.m4
=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4 2008-09-22 11:29:59 +0000
+++ b/macros/ffmpeg.m4 2008-09-22 17:41:45 +0000
@@ -211,14 +211,16 @@
else
- dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk
'{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"`
+ dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h}
| awk '{print $'3'}' | sed -e "s%,%.%g"`
if test x"${ffmpeg_version}" = x ; then
- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk
'{print $3}'`
+
+ dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk
'{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"`
if test x"${ffmpeg_version}" = x ; then
- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET "
${avcodec_h} | awk '{print $3}'`
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk
'{print $'3'}'`
fi
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r9816: Look for LIBAVCODEC_VERSION_TRIPLET before LIBAVCODEC_VERSION as the,
Sandro Santilli <=