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

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/05/10 12:14:14

Modified files:
        macros         : ffmpeg.m4 
        .              : ChangeLog 

Log message:
                * macros/ffmpeg.m4: Avoid spurious syntax errors when avcodec 
not found

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3152&r2=1.3153

Patches:
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- macros/ffmpeg.m4    8 May 2007 07:10:19 -0000       1.37
+++ macros/ffmpeg.m4    10 May 2007 12:14:14 -0000      1.38
@@ -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.37 2007/05/08 07:10:19 strk Exp $
+dnl $Id: ffmpeg.m4,v 1.38 2007/05/10 12:14:14 martinwguy Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -45,9 +45,12 @@
          CFLAGS="$ac_cv_path_ffmpeg_incl $CFLAGS"
       fi
       topdir=`$PKG_CONFIG --cflags-only-I libavcodec | sed -e 's:-I::g' | sed 
-e 's:.* /:/:' -e 's: ::g'`
+      # Gets "" if not installed
+      if test x"$topdir" != x; then
       avcodec_h="$topdir/avcodec.h"
     fi
   fi
+  fi
 
   dnl incllist is inherited from configure.ac.
   if test x"${ac_cv_path_ffmpeg_incl}" = x ; then

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3152
retrieving revision 1.3153
diff -u -b -r1.3152 -r1.3153
--- ChangeLog   10 May 2007 11:36:15 -0000      1.3152
+++ ChangeLog   10 May 2007 12:14:14 -0000      1.3153
@@ -34,6 +34,7 @@
        * configure.ac: Don't warn about ffmpeg/mad absence during tests;
          they are checked and nogoed at the end.
        * configure.ac: Don't report SDL FLAGS and help message twice.
+       * macros/ffmpeg.m4: Avoid spurious syntax errors when avcodec not found
 
 2007-05-09 Sandro Santilli <address@hidden>