From a3fb9e60284a1969a77747f3ffc3e7a80a079ea9 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 23 Nov 2010 22:42:02 +0000
Subject: remove deprecated AM_PROG_LIBTOOL (replaced by LT_INIT)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2750 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 mediaplugin/src/plugins/media/ffmpeg/configure    | 13 ++++++-------
 mediaplugin/src/plugins/media/ffmpeg/configure.ac |  1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/mediaplugin/src/plugins/media/ffmpeg/configure b/mediaplugin/src/plugins/media/ffmpeg/configure
index e33ea9ce..091fe80b 100755
--- a/mediaplugin/src/plugins/media/ffmpeg/configure
+++ b/mediaplugin/src/plugins/media/ffmpeg/configure
@@ -10660,7 +10660,6 @@ $as_echo "no" >&6; }
 fi
 
 
-
 # -----------------------------------------
 # functions
 # -----------------------------------------
@@ -13754,11 +13753,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13757: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13756: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13761: \$? = $ac_status" >&5
+   echo "$as_me:13760: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13853,11 +13852,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13856: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13855: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13860: \$? = $ac_status" >&5
+   echo "$as_me:13859: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13905,11 +13904,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13908: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13907: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13912: \$? = $ac_status" >&5
+   echo "$as_me:13911: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
diff --git a/mediaplugin/src/plugins/media/ffmpeg/configure.ac b/mediaplugin/src/plugins/media/ffmpeg/configure.ac
index ae43731c..99ee770f 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/configure.ac
+++ b/mediaplugin/src/plugins/media/ffmpeg/configure.ac
@@ -34,7 +34,6 @@ AM_INIT_AUTOMAKE([foreign])
 
 # options for make command
 AC_PROG_MAKE_SET
-AM_PROG_LIBTOOL
 
 # -----------------------------------------
 # functions
-- 
cgit v1.2.3