[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash configure.ac macros/ffmpeg.m4
From: |
Martin Guy |
Subject: |
[Gnash-commit] gnash configure.ac macros/ffmpeg.m4 |
Date: |
Wed, 02 May 2007 19:33:07 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Martin Guy <martinwguy> 07/05/02 19:33:06
Modified files:
. : configure.ac
macros : ffmpeg.m4
Log message:
* configure.ac,macros/ffmpeg.m4: Fix quotation in ffmpeg
detection and
skip version checking to avoid syntax errors during
"configure"
if the library is not found.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.299&r2=1.300
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.35&r2=1.36
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -b -r1.299 -r1.300
--- configure.ac 2 May 2007 18:31:51 -0000 1.299
+++ configure.ac 2 May 2007 19:33:06 -0000 1.300
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.299 2007/05/02 18:31:51 martinwguy Exp $
+dnl $Id: configure.ac,v 1.300 2007/05/02 19:33:06 martinwguy Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -652,7 +652,7 @@
dnl currently unused
dnl GNASH_PKG_FIND(ogg, [ogg.h], [decode ogg streams], ogg_stream_init)
-if test x$gui = xsdl -o x$media_handler = xffmpeg -o x$media_handler = xmad;
then
+if test x"$gui" = xsdl -o x"$media_handler" = xffmpeg -o x"$media_handler" =
xmad; then
GNASH_PATH_SDL
fi
@@ -792,7 +792,7 @@
if test x"$media_handler" = x"ffmpeg"; then
GNASH_PATH_FFMPEG
- if test x"${ac_cv_path_ffmpeg_lib}" = x -o x${ffmpeg_version} != xok; then
+ if test x"${ac_cv_path_ffmpeg_lib}" = x -o x"${ffmpeg_version}" != xok; then
AC_MSG_WARN([ffmpeg specified as decoder, but it's not present or it's
version is too old, disabling media handling])
media_handler=none
fi
@@ -808,12 +808,12 @@
fi
fi
dnl I'm kinda lazy, get rid of this later... //Markus
-AM_CONDITIONAL(HAVE_MAD, test x$media_handler = xmad)
+AM_CONDITIONAL(HAVE_MAD, test x"$media_handler" = xmad)
AM_CONDITIONAL(USE_SOUND_GST, test x$media_handler = xgst)
-AM_CONDITIONAL(USE_SOUND_SDL, test x$media_handler = xmad -o x$media_handler =
xffmpeg)
-AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x$media_handler = xffmpeg)
-AM_CONDITIONAL(USE_MAD_ENGINE, test x$media_handler = xmad)
+AM_CONDITIONAL(USE_SOUND_SDL, test x"$media_handler" = xmad -o
x"$media_handler" = xffmpeg)
+AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x"$media_handler" = xffmpeg)
+AM_CONDITIONAL(USE_MAD_ENGINE, test x"$media_handler" = xmad)
dnl AM_CONDITIONAL(HAVE_FFMPEG, [test x"${FFMPEG_LIBS}" != x])
@@ -1122,7 +1122,7 @@
echo " Renderer engine: "$renderer
echo " GUI: "$gui
echo " Media handler: "$media_handler
-if test x"$_handler" = xffmpeg -o x"$_handler" = xmad; then
+if test x"$media_handler" = xffmpeg -o x"$media_handler" = xmad; then
echo " Using SDL for sound handling"
fi
@@ -1359,8 +1359,8 @@
echo " ERROR: gstreamer media handling requested, but no gstreamer
0.10+ found"
echo " You need to have the gstreamer development package
installed"
echo " to compile this project. You can either reconfigure
using"
- echo " --media-handler=ffmpeg or install
libgstreamer0.10-dev"
- echo " (using apt-get) or <something similar> (using yum)."
+ echo " --media-handler=ffmpeg or =mad or install
libgstreamer0.10-dev"
+ echo " (using apt-get) or gstreamer-devel (using yum)."
nogo=true
fi
fi
@@ -1384,7 +1384,7 @@
fi
else
if test x"$media_handler" = x"ffmpeg"; then
- if test x${ffmpeg_version} != xok; then
+ if test x"${ffmpeg_version}" != xok; then
echo " ERROR: You have version ${ffmpeg_version} of ffmpeg
installed."
echo " This version of ffmpeg may not work!"
echo " Version 51.27.0 or newer is highly recommended."
@@ -1393,13 +1393,13 @@
if test x"$FFMPEG_LIBS" != x; then
echo " MP3 and video support enabled through ffmpeg"
if test x"$FFMPEG_CFLAGS" != x; then
- echo " ffmpeg flags are: $FFMPEG_CFLAGS"
+ echo " FFMPEG flags are: $FFMPEG_CFLAGS"
else
- echo " ffmpeg flags are: default include path"
+ echo " FFMPEG flags are: default include path"
fi
- echo " ffmpeg libs are: $FFMPEG_LIBS"
+ echo " FFMPEG libs are: $FFMPEG_LIBS"
else
- echo " ERROR: No ffmpeg development package installed!"
+ echo " ERROR: No FFMPEG development package installed!"
echo " You need to have the ffmpeg development package
installed"
echo " to enable mp3 decoding. You can either
reconfigure using"
echo " --media-handler=mad to use libmad or install
libavcodec-dev"
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- macros/ffmpeg.m4 10 Apr 2007 09:14:48 -0000 1.35
+++ macros/ffmpeg.m4 2 May 2007 19:33:06 -0000 1.36
@@ -14,11 +14,11 @@
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.35 2007/04/10 09:14:48 strk Exp $
+dnl $Id: ffmpeg.m4,v 1.36 2007/05/02 19:33:06 martinwguy Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
- dnl Lool for the header
+ dnl Look for the header
AC_ARG_WITH(ffmpeg_incl, AC_HELP_STRING([--with-ffmpeg-incl], [directory
where ffmpeg headers are]), with_ffmpeg_incl=${withval})
AC_CACHE_VAL(ac_cv_path_ffmpeg_incl,[
if test x"${with_ffmpeg_incl}" != x ; then
@@ -62,15 +62,17 @@
fi
fi
- dnl We need LIBAVCODEC VERSION of at least 51.29.0 to get
avcodec_decode_audio2
+dnl We need LIBAVCODEC VERSION of at least 51.29.0 to get avcodec_decode_audio2
dnl AC_PATH_PROG(FFMPEG, ffmpeg, ,[${pathlist}])
dnl if test "x$FFMPEG" = "x" ; then
dnl ffmpeg_version=`$FFMPEG uglyhack 2>&1 | grep "libavcodec version" |
cut -d ' ' -f 5 | tr -d '.'`
-dnl if test $ffmpeg -lt 51290; then
+dnl if test "$ffmpeg_version" -lt 51290; then
dnl AC_MSG_ERROR([])
dnl fi
dnl fi
+ # Check avcodec version number, if it was found
+ if test x"${topdir}" != x; then
ffmpeg_num_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h
| sed -e "s%[[^0-9]]%%g"`
ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h |
sed -e "s%[[^0-9.]]%%g"`
@@ -80,22 +82,24 @@
fi
dnl AC_EGREP_HEADER(avcodec_decode_audio2, ${topdir}/avcodec.h,
[avfound=yes], [avfound=no])
- if test $ffmpeg_num_version -lt 51110; then
+
+ if test "$ffmpeg_num_version" -lt 51110; then
AC_MSG_WARN([Wrong ffmpeg/libavcodec version! 51.11.0 or greater required])
ffmpeg_version=
else
ffmpeg_version=ok
fi
- if test $ffmpeg_num_version -gt 51280; then
+ if test "$ffmpeg_num_version" -gt 51280; then
AC_DEFINE(FFMPEG_AUDIO2, 1, [Define if avcodec_decode_audio2 can be used.])
fi
- if test $ffmpeg_num_version -lt 51270; then
+ if test "$ffmpeg_num_version" -lt 51270; then
AC_MSG_WARN([This version of ffmpeg/libavcodec is not able to play VP6
encoded video!])
else
AC_DEFINE(FFMPEG_VP6, 1, [Define if ffmpeg can play VP6.])
fi
+ fi
if test x"${ac_cv_path_ffmpeg_incl}" != x ; then
FFMPEG_CFLAGS="${ac_cv_path_ffmpeg_incl}"
@@ -116,7 +120,7 @@
])
dnl Try with pkg-config
- if test x${cross_compiling} = xno; then
+ if test x"${cross_compiling}" = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_lib}" = x; then
$PKG_CONFIG --exists libavcodec && libavcodec=`$PKG_CONFIG --libs
libavcodec`
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash configure.ac macros/ffmpeg.m4,
Martin Guy <=