[GRASS-SVN] r53883 - grass/branches/develbranch_6

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-11-18 02:30:02 -0800 (Sun, 18 Nov 2012)
New Revision: 53883

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


Modified: grass/branches/develbranch_6/configure
===================================================================
--- grass/branches/develbranch_6/configure	2012-11-18 10:27:40 UTC (rev 53882)
+++ grass/branches/develbranch_6/configure	2012-11-18 10:30:02 UTC (rev 53883)
@@ -10557,9 +10557,9 @@
 
 
 
-echo $ac_n "checking for avformat_write_header in -lavformat""... $ac_c" 1>&6
-echo "configure:10562: 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:10562: 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"
@@ -10569,10 +10569,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:10579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -10593,9 +10593,9 @@
 else
   echo "$ac_t""no" 1>&6
 
-echo $ac_n "checking for avformat_write_header in -lavformat""... $ac_c" 1>&6
-echo "configure:10598: 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:10598: 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"
@@ -10605,10 +10605,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:10615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

Modified: grass/branches/develbranch_6/configure.in
===================================================================
--- grass/branches/develbranch_6/configure.in	2012-11-18 10:27:40 UTC (rev 53882)
+++ grass/branches/develbranch_6/configure.in	2012-11-18 10:30:02 UTC (rev 53883)
@@ -1091,7 +1091,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