[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/ffmpeg.m4 [release-0-8-0]
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog macros/ffmpeg.m4 [release-0-8-0] |
Date: |
Thu, 07 Jun 2007 18:22:24 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release-0-8-0
Changes by: Sandro Santilli <strk> 07/06/07 18:22:24
Modified files:
. : ChangeLog
macros : ffmpeg.m4
Log message:
* macros/ffmpeg.m4: check for libgsm and add to FFMPEG_LIBS if
available.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451.2.44&r2=1.3451.2.45
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.43&r2=1.43.4.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451.2.44
retrieving revision 1.3451.2.45
diff -u -b -r1.3451.2.44 -r1.3451.2.45
--- ChangeLog 7 Jun 2007 16:38:38 -0000 1.3451.2.44
+++ ChangeLog 7 Jun 2007 18:22:22 -0000 1.3451.2.45
@@ -1,5 +1,7 @@
2007-06-07 Sandro Santilli <address@hidden>
+ * macros/ffmpeg.m4: check for libgsm and add to FFMPEG_LIBS if
+ available.
* testsuite/anaylse-results.sh: don't forget to initialize
total_untested.
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.43
retrieving revision 1.43.4.1
diff -u -b -r1.43 -r1.43.4.1
--- macros/ffmpeg.m4 1 Jun 2007 17:50:07 -0000 1.43
+++ macros/ffmpeg.m4 7 Jun 2007 18:22:24 -0000 1.43.4.1
@@ -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.43 2007/06/01 17:50:07 bjacques Exp $
+dnl $Id: ffmpeg.m4,v 1.43.4.1 2007/06/07 18:22:24 strk Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -302,6 +302,28 @@
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libtheora}"
fi
+ dnl Look for the GSM library, which is required on some systems.
+ AC_MSG_CHECKING([for libgsm library])
+ if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
+ $PKG_CONFIG --exists gsm && libgsm=`$PKG_CONFIG --libs gsm`
+ else
+ libgsm=""
+ fi
+ if test x"${libgsm}" = x; then
+ if test -f ${topdir}/libgsm.a -o -f ${topdir}/libgsm.${shlibext}; then
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
+ AC_MSG_RESULT(${topdir}/libgsm)
+ else
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_LIB(gsm, gsm_destroy,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"])
+ fi
+ fi
+ else
+ AC_MSG_RESULT(${libgsm})
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libgsm}"
+ fi
+
dnl Look for the DC1394 library, which is required on some systems.
AC_MSG_CHECKING([for libdc1394 library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog macros/ffmpeg.m4 [release-0-8-0],
Sandro Santilli <=