[Gnash-commit] gnash/macros ffmpeg.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/07 21:30:13

Modified files:
        macros         : ffmpeg.m4 

Log message:
        Run AM_CONDITIONAL rather than AC_DEFINE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ffmpeg.m4   7 Oct 2006 21:10:20 -0000       1.5
+++ ffmpeg.m4   7 Oct 2006 21:30:13 -0000       1.6
@@ -39,7 +39,7 @@
 dnl date-time, filesystem. graph. iostreams, program options, python,
 dnl regex, serialization, signals, unit test, thead, and wave.
 
-dnl $Id: ffmpeg.m4,v 1.5 2006/10/07 21:10:20 nihilus Exp $
+dnl $Id: ffmpeg.m4,v 1.6 2006/10/07 21:30:13 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -133,13 +133,13 @@
 
   if test x"${ac_cv_path_ffmpeg_lib}" != x ; then
     FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib} -lavcodec -lavutil"
-    AC_DEFINE([USE_FFMPEG],  [1], [Use FFMPEG for MP3 decoding])
     AC_MSG_RESULT(yes)
   else
     FFMPEG_LIBS=""
     AC_MSG_RESULT(no)
   fi
 
+  AM_CONDITIONAL(USE_FFMPEG, [test x$pkg = xyes])
   AC_SUBST(FFMPEG_CFLAGS)  
   AC_SUBST(FFMPEG_LIBS)
 ])