[Gnash-commit] gnash ChangeLog macros/ffmpeg.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/09 13:51:08

Modified files:
        .              : ChangeLog 
        macros         : ffmpeg.m4 

Log message:
        Applied patch by Bernhard Rosenkraenzer <address@hidden>
                * macros/ffmpeg.m4: don't assume FFMPEG CFLAGS only contain a 
single
                  -I switch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3691&r2=1.3692
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3691
retrieving revision 1.3692
diff -u -b -r1.3691 -r1.3692
--- ChangeLog   9 Jul 2007 13:33:29 -0000       1.3691
+++ ChangeLog   9 Jul 2007 13:51:07 -0000       1.3692
@@ -1,3 +1,8 @@
+2007-07-09 Bernhard Rosenkraenzer <address@hidden>
+
+       * macros/ffmpeg.m4: don't assume FFMPEG CFLAGS only contain a single
+         -I switch.
+
 2007-07-09 Sandro Santilli <address@hidden>
 
        * server/parser/video_stream_def.{h,cpp}: drop the m_width and m_height

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- macros/ffmpeg.m4    8 Jul 2007 20:49:38 -0000       1.48
+++ macros/ffmpeg.m4    9 Jul 2007 13:51:08 -0000       1.49
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.48 2007/07/08 20:49:38 martinwguy Exp $
+dnl $Id: ffmpeg.m4,v 1.49 2007/07/09 13:51:08 strk Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -47,8 +47,23 @@
        # Here pkg-config outputs two spaces on the end, so match those too!
        ac_cv_path_ffmpeg_incl=`$PKG_CONFIG --cflags libavcodec | sed 
's:/ffmpeg *$::'`
         CFLAGS="$ac_cv_path_ffmpeg_incl $CFLAGS"
+        # ac_cv_path_ffmpeg_incl might include several paths (e.g. pointers to
+        # external libraries used by ffmpeg). Let's find the right one.
+        for i in `$PKG_CONFIG --cflags-only-I libavcodec |sed -e 's:-I::g'`; do
+          if test -e "$i"/avcodec.h -o -e "$i"/ffmpeg/avcodec.h; then
+            topdir="$i"
+            break
+          fi
+        done
+      else
+        # Let's see if ffmpeg is installed without using pkgconfig...
+        for i in /usr/include /usr/local/include /opt/ffmpeg/include; do
+          if test -e "$i"/ffmpeg/avcodec.h; then
+            topdir="$i"
+            break
+          fi
+        done
       fi
-      topdir=`$PKG_CONFIG --cflags-only-I libavcodec | sed -e 's:-I::g' -e 
's:.* /:/:' -e 's: ::g'`
       # Again adjust for ffmpeg/ foolery
       topdir=`echo "$topdir" | sed 's:/ffmpeg *$::'`
       # Gets "" if not installed