[GRASS-SVN] r53885 - grass/branches/releasebranch_6_4

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-11-18 02:33:05 -0800 (Sun, 18 Nov 2012)
New Revision: 53885

Modified:
   grass/branches/releasebranch_6_4/configure
   grass/branches/releasebranch_6_4/configure.in
Log:
configure: ffmpeg don't use new and deprecated fns for LOC_CHECK_LIB


Modified: grass/branches/releasebranch_6_4/configure
===================================================================
--- grass/branches/releasebranch_6_4/configure	2012-11-18 10:31:27 UTC (rev 53884)
+++ grass/branches/releasebranch_6_4/configure	2012-11-18 10:33:05 UTC (rev 53885)
@@ -10558,9 +10558,9 @@
 
 
 
-echo $ac_n "checking for avformat_write_header in -lavformat""... $ac_c" 1>&6
-echo "configure:10563: checking for avformat_write_header in -lavformat" >&5
-ac_lib_var=`echo avformat'_'avformat_write_header | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for avformat_alloc_context in -lavformat""... $ac_c" 1>&6
+echo "configure:10563: checking for avformat_alloc_context in -lavformat" >&5
+ac_lib_var=`echo avformat'_'avformat_alloc_context | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavformat $FFMPEGLIB  $LIBS"
@@ -10570,10 +10570,10 @@
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char avformat_write_header();
+char avformat_alloc_context();
 
 int main() {
-avformat_write_header()
+avformat_alloc_context()
 ; return 0; }
 EOF
 if { (eval echo configure:10580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -10594,9 +10594,9 @@
 else
   echo "$ac_t""no" 1>&6
 
-echo $ac_n "checking for avformat_write_header in -lavformat""... $ac_c" 1>&6
-echo "configure:10599: checking for avformat_write_header in -lavformat" >&5
-ac_lib_var=`echo avformat'_'avformat_write_header | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for avformat_alloc_context in -lavformat""... $ac_c" 1>&6
+echo "configure:10599: checking for avformat_alloc_context in -lavformat" >&5
+ac_lib_var=`echo avformat'_'avformat_alloc_context | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavformat $FFMPEGLIB $MATHLIB $LIBS"
@@ -10606,10 +10606,10 @@
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char avformat_write_header();
+char avformat_alloc_context();
 
 int main() {
-avformat_write_header()
+avformat_alloc_context()
 ; return 0; }
 EOF
 if { (eval echo configure:10616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

Modified: grass/branches/releasebranch_6_4/configure.in
===================================================================
--- grass/branches/releasebranch_6_4/configure.in	2012-11-18 10:31:27 UTC (rev 53884)
+++ grass/branches/releasebranch_6_4/configure.in	2012-11-18 10:33:05 UTC (rev 53885)
@@ -1092,7 +1092,7 @@
 
 LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB)
 LOC_CHECK_LIBS(avcodec, avcodec_register, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
-LOC_CHECK_LIBS(avformat, avformat_write_header, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
+LOC_CHECK_LIBS(avformat, avformat_alloc_context, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
 
 fi # $USE_FFMPEG