./autogen.sh update

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2741 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 1 insertions, 826 deletions

diff --git a/mediaplugin/configure b/mediaplugin/configure
index da6cfca7..330ba165 100755
--- a/mediaplugin/configure
+++ b/mediaplugin/configure
@@ -585,28 +585,6 @@ libprojectM_VERSION_RELEASE
 libprojectM_VERSION_MINOR
 libprojectM_VERSION_MAJOR
 libprojectM_VERSION
-DEFINE_HAVE_SWSCALE
-libswscale_VERSION_INT
-libswscale_VERSION_RELEASE
-libswscale_VERSION_MINOR
-libswscale_VERSION_MAJOR
-libswscale_VERSION
-DEFINE_HAVE_FFMPEG
-libavutil_VERSION_INT
-libavutil_VERSION_RELEASE
-libavutil_VERSION_MINOR
-libavutil_VERSION_MAJOR
-libavutil_VERSION
-libavformat_VERSION_INT
-libavformat_VERSION_RELEASE
-libavformat_VERSION_MINOR
-libavformat_VERSION_MAJOR
-libavformat_VERSION
-libavcodec_VERSION_INT
-libavcodec_VERSION_RELEASE
-libavcodec_VERSION_MINOR
-libavcodec_VERSION_MAJOR
-libavcodec_VERSION
 lua_LIB_NAME
 libpng_VERSION_INT
 libpng_VERSION_RELEASE
@@ -718,8 +696,6 @@ with_cfg_dummy1
 with_portmixer
 with_libprojectM
 with_cfg_dummy2
-enable_global
-enable_local
 enable_debug
 enable_dummy_fpc1
 with_fpc
@@ -750,10 +726,6 @@ PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 libpng_VERSION
-libavcodec_VERSION
-libavformat_VERSION
-libavutil_VERSION
-libswscale_VERSION
 libprojectM_VERSION
 libprojectM_INCLUDEDIR
 libprojectM_DATADIR
@@ -1383,8 +1355,6 @@ External Libraries:
   --with-libprojectM      enable projectM visualization support [default=no]
 
 Development options:
-  --enable-global         (DEPRECATED, DO NOT USE)
-  --enable-local          (DEPRECATED, DO NOT USE)
   --enable-debug          Enable debug build [default=no]
 
 Free Pascal Compiler specific options:
@@ -1422,14 +1392,6 @@ Some influential environment variables:
               path overriding pkg-config's built-in search path
   libpng_VERSION
               version of libpng, overriding pkg-config
-  libavcodec_VERSION
-              version of libavcodec, overriding pkg-config
-  libavformat_VERSION
-              version of libavformat, overriding pkg-config
-  libavutil_VERSION
-              version of libavutil, overriding pkg-config
-  libswscale_VERSION
-              version of libswscale, overriding pkg-config
   libprojectM_VERSION
               version of libprojectM, overriding pkg-config
   libprojectM_INCLUDEDIR
@@ -1599,52 +1561,6 @@ fi
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -2417,34 +2333,6 @@ if test "${with_cfg_dummy2+set}" = set; then :
 fi
 
 
-# add DEPRECATED global and local options
-# Check whether --enable-global was given.
-if test "${enable_global+set}" = set; then :
-  enableval=$enable_global;
-fi
-
-# Check whether --enable-local was given.
-if test "${enable_local+set}" = set; then :
-  enableval=$enable_local;
-fi
-
-
-if [ x$enable_global != x -o x$enable_local != x ]; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}:
-
-!!! NOTE: --enable-global and --enable-local are deprecated:
-!!! - global build: just type \"make\" and \"make install\"
-!!! - local  build: just type \"make\" and start \"game/ultrastardx\"
-" >&5
-$as_echo "$as_me:
-
-!!! NOTE: --enable-global and --enable-local are deprecated:
-!!! - global build: just type \"make\" and \"make install\"
-!!! - local  build: just type \"make\" and start \"game/ultrastardx\"
-" >&6;}
-   sleep 2
-fi
-
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; test $enableval = "yes" && ENABLE_DEBUG="yes"
@@ -4276,6 +4164,7 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
+
 fi
 if [ x$PKG_CONFIG = x ]; then
    as_fn_error $? "
@@ -4954,720 +4843,6 @@ See the pkg-config man page for more details.
 fi
 
 
-# find FFMpeg
-# Note: do not use the min/max version parameters with ffmpeg
-# otherwise it might fail in ubuntu due to a wrong version number
-# format in ffmpeg's .pc-files.
-# For example: 0d.51.1.2 instead of the correct 51.1.2.
-#   A check for version >=52.0.0 will return version 0d.51.1.2
-#   although it is lower because pkg-config is confused by the 0d.
-# Use [mylib]_VERSION_INT for version-checking instead
-
-    have_lib="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavcodec" >&5
-$as_echo_n "checking for libavcodec... " >&6; }
-    if test x"$with_libavcodec" = xnocheck; then
-        # do not call pkg-config, use user settings
-        have_lib="yes"
-    elif test x"$with_libavcodec" != xno; then
-        # check if package exists
-	if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavcodec") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-
-            have_lib="yes"
-            libavcodec_LIBS=`$PKG_CONFIG --libs --silence-errors "libavcodec"`
-            libavcodec_LIBDIRS=`$PKG_CONFIG --libs-only-L --silence-errors "libavcodec"`
-            libavcodec_LIBDIRS=`
-    echo "$libavcodec_LIBDIRS" | $SED 's/^[ \t]*//' | $SED 's/[ \t]*$//'
-`
-            # add library directories to LIBS (ignore *_LIBS for now)
-	    if test -n "$libavcodec_LIBDIRS"; then
-                LIBS="$LIBS $libavcodec_LIBDIRS"
-            fi
-
-fi
-    fi
-    if test x$have_lib = xyes; then
-        libavcodec_HAVE="yes"
-        if test -n "$libavcodec_LIBDIRS"; then
-            # show additional lib-dirs
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libavcodec_LIBDIRS)" >&5
-$as_echo "yes ($libavcodec_LIBDIRS)" >&6; }
-        else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        fi
-    else
-        libavcodec_HAVE="no"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-        # check if package is required
-        if test xyes = xyes -o x"$with_libavcodec" = xyes ; then
-            # print error message and quit
-            err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "libavcodec"`
-            as_fn_error $? "
-
-$err_msg
-
-Alternatively, you may set --with-libavcodec=nocheck and the environment
-variables libavcodec_[...] (see configure --help)
-to appropriate values to avoid the need to call pkg-config.
-
-See the pkg-config man page for more details.
-" "$LINENO" 5
-        fi
-    fi
-
-
-    if test x$libavcodec_HAVE = xyes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of libavcodec" >&5
-$as_echo_n "checking version of libavcodec... " >&6; }
-
-
-    # check if variable was defined by the user
-    if test -z "$libavcodec_VERSION"; then
-        # if not, get it from pkg-config
-        if test x$libavcodec_HAVE = xyes; then
-            if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavcodec") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  libavcodec_VERSION=`$PKG_CONFIG --modversion --silence-errors "libavcodec"`
-else
-  # print error message and quit
-                 err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "libavcodec"`
-                 as_fn_error $? "
-
-$err_msg
-
-If --with-libavcodec=nocheck is defined the environment variable
-libavcodec_VERSION
-must be set to avoid the need to call pkg-config.
-
-See the pkg-config man page for more details.
-" "$LINENO" 5
-
-
-fi
-        fi
-    fi
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: [$libavcodec_VERSION]" >&5
-$as_echo "[$libavcodec_VERSION]" >&6; }
-    else
-        libavcodec_VERSION="0.0.0"
-    fi
-
-    version=$libavcodec_VERSION
-
-    # strip leading non-numeric tokens
-    # (necessary for some ffmpeg-packages in ubuntu)
-    # example: 0d.51.1.0 -> 51.1.0
-    version=`echo $version | sed 's/^[^.]*[^0-9.][^.]*\.//'`
-
-    # replace "." and "-" with " " and ignore trailing tokens.
-    # 1.23.4-r2 will be splitted to [maj=1, min=23, rel=4].
-    # In addition we delete everything after the first character
-    # which is not 0-9.
-    # 1.3a4-r32 will be [maj=1, min=3, rel=0].
-    read major minor release ignore <<eof
-        `echo $version | tr '.-' ' ' | sed 's/[^0-9\ ].*//'`
-eof
-    # Note: Do NOT indent the eof-delimiter
-    # We use a here-document (<<< here-strings not POSIX compatible)
-
-    test -z $major && major=0
-    test -z $minor && minor=0
-    test -z $release && release=0
-
-    # strip preceding 0s and set unset version-parts to 0
-    libavcodec_VERSION_MAJOR=$(($major))
-    libavcodec_VERSION_MINOR=$(($minor))
-    libavcodec_VERSION_RELEASE=$(($release))
-    # integer representation: MMMmmmrrr (M:major,m:minor,r:release)
-    # can be used if pkg-config's comparison fails
-    libavcodec_VERSION_INT=$(($libavcodec_VERSION_MAJOR*1000000+$libavcodec_VERSION_MINOR*1000+$libavcodec_VERSION_RELEASE))
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_decode_audio in -lavcodec" >&5
-$as_echo_n "checking for avcodec_decode_audio in -lavcodec... " >&6; }
-if test "${ac_cv_lib_avcodec_avcodec_decode_audio+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lavcodec  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char avcodec_decode_audio ();
-int
-main ()
-{
-return avcodec_decode_audio ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_avcodec_avcodec_decode_audio=yes
-else
-  ac_cv_lib_avcodec_avcodec_decode_audio=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_decode_audio" >&5
-$as_echo "$ac_cv_lib_avcodec_avcodec_decode_audio" >&6; }
-if test "x$ac_cv_lib_avcodec_avcodec_decode_audio" = x""yes; then :
-  HAVE_AVCODEC_DECODE_AUDIO="yes"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_decode_audio2 in -lavcodec" >&5
-$as_echo_n "checking for avcodec_decode_audio2 in -lavcodec... " >&6; }
-if test "${ac_cv_lib_avcodec_avcodec_decode_audio2+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lavcodec  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char avcodec_decode_audio2 ();
-int
-main ()
-{
-return avcodec_decode_audio2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_avcodec_avcodec_decode_audio2=yes
-else
-  ac_cv_lib_avcodec_avcodec_decode_audio2=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_decode_audio2" >&5
-$as_echo "$ac_cv_lib_avcodec_avcodec_decode_audio2" >&6; }
-if test "x$ac_cv_lib_avcodec_avcodec_decode_audio2" = x""yes; then :
-  HAVE_AVCODEC_DECODE_AUDIO2="yes"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for img_convert in -lavcodec" >&5
-$as_echo_n "checking for img_convert in -lavcodec... " >&6; }
-if test "${ac_cv_lib_avcodec_img_convert+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lavcodec  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char img_convert ();
-int
-main ()
-{
-return img_convert ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_avcodec_img_convert=yes
-else
-  ac_cv_lib_avcodec_img_convert=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_img_convert" >&5
-$as_echo "$ac_cv_lib_avcodec_img_convert" >&6; }
-if test "x$ac_cv_lib_avcodec_img_convert" = x""yes; then :
-  HAVE_IMG_CONVERT="yes"
-fi
-
-
-    have_lib="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavformat" >&5
-$as_echo_n "checking for libavformat... " >&6; }
-    if test x"$with_libavformat" = xnocheck; then
-        # do not call pkg-config, use user settings
-        have_lib="yes"
-    elif test x"$with_libavformat" != xno; then
-        # check if package exists
-	if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavformat") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-
-            have_lib="yes"
-            libavformat_LIBS=`$PKG_CONFIG --libs --silence-errors "libavformat"`
-            libavformat_LIBDIRS=`$PKG_CONFIG --libs-only-L --silence-errors "libavformat"`
-            libavformat_LIBDIRS=`
-    echo "$libavformat_LIBDIRS" | $SED 's/^[ \t]*//' | $SED 's/[ \t]*$//'
-`
-            # add library directories to LIBS (ignore *_LIBS for now)
-	    if test -n "$libavformat_LIBDIRS"; then
-                LIBS="$LIBS $libavformat_LIBDIRS"
-            fi
-
-fi
-    fi
-    if test x$have_lib = xyes; then
-        libavformat_HAVE="yes"
-        if test -n "$libavformat_LIBDIRS"; then
-            # show additional lib-dirs
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libavformat_LIBDIRS)" >&5
-$as_echo "yes ($libavformat_LIBDIRS)" >&6; }
-        else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        fi
-    else
-        libavformat_HAVE="no"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-        # check if package is required
-        if test xyes = xyes -o x"$with_libavformat" = xyes ; then
-            # print error message and quit
-            err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "libavformat"`
-            as_fn_error $? "
-
-$err_msg
-
-Alternatively, you may set --with-libavformat=nocheck and the environment
-variables libavformat_[...] (see configure --help)
-to appropriate values to avoid the need to call pkg-config.
-
-See the pkg-config man page for more details.
-" "$LINENO" 5
-        fi
-    fi
-
-
-    if test x$libavformat_HAVE = xyes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of libavformat" >&5
-$as_echo_n "checking version of libavformat... " >&6; }
-
-
-    # check if variable was defined by the user
-    if test -z "$libavformat_VERSION"; then
-        # if not, get it from pkg-config
-        if test x$libavformat_HAVE = xyes; then
-            if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavformat") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  libavformat_VERSION=`$PKG_CONFIG --modversion --silence-errors "libavformat"`
-else
-  # print error message and quit
-                 err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "libavformat"`
-                 as_fn_error $? "
-
-$err_msg
-
-If --with-libavformat=nocheck is defined the environment variable
-libavformat_VERSION
-must be set to avoid the need to call pkg-config.
-
-See the pkg-config man page for more details.
-" "$LINENO" 5
-
-
-fi
-        fi
-    fi
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: [$libavformat_VERSION]" >&5
-$as_echo "[$libavformat_VERSION]" >&6; }
-    else
-        libavformat_VERSION="0.0.0"
-    fi
-
-    version=$libavformat_VERSION
-
-    # strip leading non-numeric tokens
-    # (necessary for some ffmpeg-packages in ubuntu)
-    # example: 0d.51.1.0 -> 51.1.0
-    version=`echo $version | sed 's/^[^.]*[^0-9.][^.]*\.//'`
-
-    # replace "." and "-" with " " and ignore trailing tokens.
-    # 1.23.4-r2 will be splitted to [maj=1, min=23, rel=4].
-    # In addition we delete everything after the first character
-    # which is not 0-9.
-    # 1.3a4-r32 will be [maj=1, min=3, rel=0].
-    read major minor release ignore <<eof
-        `echo $version | tr '.-' ' ' | sed 's/[^0-9\ ].*//'`
-eof
-    # Note: Do NOT indent the eof-delimiter
-    # We use a here-document (<<< here-strings not POSIX compatible)
-
-    test -z $major && major=0
-    test -z $minor && minor=0
-    test -z $release && release=0
-
-    # strip preceding 0s and set unset version-parts to 0
-    libavformat_VERSION_MAJOR=$(($major))
-    libavformat_VERSION_MINOR=$(($minor))
-    libavformat_VERSION_RELEASE=$(($release))
-    # integer representation: MMMmmmrrr (M:major,m:minor,r:release)
-    # can be used if pkg-config's comparison fails
-    libavformat_VERSION_INT=$(($libavformat_VERSION_MAJOR*1000000+$libavformat_VERSION_MINOR*1000+$libavformat_VERSION_RELEASE))
-
-
-
-
-
-
-
-
-    have_lib="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavutil" >&5
-$as_echo_n "checking for libavutil... " >&6; }
-    if test x"$with_libavutil" = xnocheck; then
-        # do not call pkg-config, use user settings
-        have_lib="yes"
-    elif test x"$with_libavutil" != xno; then
-        # check if package exists
-	if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-
-            have_lib="yes"
-            libavutil_LIBS=`$PKG_CONFIG --libs --silence-errors "libavutil"`
-            libavutil_LIBDIRS=`$PKG_CONFIG --libs-only-L --silence-errors "libavutil"`
-            libavutil_LIBDIRS=`
-    echo "$libavutil_LIBDIRS" | $SED 's/^[ \t]*//' | $SED 's/[ \t]*$//'
-`
-            # add library directories to LIBS (ignore *_LIBS for now)
-	    if test -n "$libavutil_LIBDIRS"; then
-                LIBS="$LIBS $libavutil_LIBDIRS"
-            fi
-
-fi
-    fi
-    if test x$have_lib = xyes; then
-        libavutil_HAVE="yes"
-        if test -n "$libavutil_LIBDIRS"; then
-            # show additional lib-dirs
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libavutil_LIBDIRS)" >&5
-$as_echo "yes ($libavutil_LIBDIRS)" >&6; }
-        else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        fi
-    else
-        libavutil_HAVE="no"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-        # check if package is required
-        if test xyes = xyes -o x"$with_libavutil" = xyes ; then
-            # print error message and quit
-            err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "libavutil"`
-            as_fn_error $? "
-
-$err_msg
-
-Alternatively, you may set --with-libavutil=nocheck and the environment
-variables libavutil_[...] (see configure --help)
-to appropriate values to avoid the need to call pkg-config.
-
-See the pkg-config man page for more details.
-" "$LINENO" 5
-        fi
-    fi
-
-
-    if test x$libavutil_HAVE = xyes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of libavutil" >&5
-$as_echo_n "checking version of libavutil... " >&6; }
-
-
-    # check if variable was defined by the user
-    if test -z "$libavutil_VERSION"; then
-        # if not, get it from pkg-config
-        if test x$libavutil_HAVE = xyes; then
-            if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  libavutil_VERSION=`$PKG_CONFIG --modversion --silence-errors "libavutil"`
-else
-  # print error message and quit
-                 err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "libavutil"`
-                 as_fn_error $? "
-
-$err_msg
-
-If --with-libavutil=nocheck is defined the environment variable
-libavutil_VERSION
-must be set to avoid the need to call pkg-config.
-
-See the pkg-config man page for more details.
-" "$LINENO" 5
-
-
-fi
-        fi
-    fi
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: [$libavutil_VERSION]" >&5
-$as_echo "[$libavutil_VERSION]" >&6; }
-    else
-        libavutil_VERSION="0.0.0"
-    fi
-
-    version=$libavutil_VERSION
-
-    # strip leading non-numeric tokens
-    # (necessary for some ffmpeg-packages in ubuntu)
-    # example: 0d.51.1.0 -> 51.1.0
-    version=`echo $version | sed 's/^[^.]*[^0-9.][^.]*\.//'`
-
-    # replace "." and "-" with " " and ignore trailing tokens.
-    # 1.23.4-r2 will be splitted to [maj=1, min=23, rel=4].
-    # In addition we delete everything after the first character
-    # which is not 0-9.
-    # 1.3a4-r32 will be [maj=1, min=3, rel=0].
-    read major minor release ignore <<eof
-        `echo $version | tr '.-' ' ' | sed 's/[^0-9\ ].*//'`
-eof
-    # Note: Do NOT indent the eof-delimiter
-    # We use a here-document (<<< here-strings not POSIX compatible)
-
-    test -z $major && major=0
-    test -z $minor && minor=0
-    test -z $release && release=0
-
-    # strip preceding 0s and set unset version-parts to 0
-    libavutil_VERSION_MAJOR=$(($major))
-    libavutil_VERSION_MINOR=$(($minor))
-    libavutil_VERSION_RELEASE=$(($release))
-    # integer representation: MMMmmmrrr (M:major,m:minor,r:release)
-    # can be used if pkg-config's comparison fails
-    libavutil_VERSION_INT=$(($libavutil_VERSION_MAJOR*1000000+$libavutil_VERSION_MINOR*1000+$libavutil_VERSION_RELEASE))
-
-
-
-
-
-
-
-if [ x$libavcodec_HAVE = xyes -a x$libavformat_HAVE = xyes -a x$libavutil_HAVE = xyes ]; then
-    ffmpeg_HAVE=yes
-else
-    ffmpeg_HAVE=no
-fi
-
-    if [ x$ffmpeg_HAVE = xyes ]; then
-        DEFINE_HAVE_FFMPEG=DEFINE
-    else
-	DEFINE_HAVE_FFMPEG=UNDEF
-    fi
-
-
-
-# find FFMpeg's swscale lib (just if FFMpeg is compiled in GPL mode)
-
-    have_lib="no"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libswscale" >&5
-$as_echo_n "checking for libswscale... " >&6; }
-    if test x"$with_libswscale" = xnocheck; then
-        # do not call pkg-config, use user settings
-        have_lib="yes"
-    elif test x"$with_libswscale" != xno; then
-        # check if package exists
-	if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libswscale") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-
-            have_lib="yes"
-            libswscale_LIBS=`$PKG_CONFIG --libs --silence-errors "libswscale"`
-            libswscale_LIBDIRS=`$PKG_CONFIG --libs-only-L --silence-errors "libswscale"`
-            libswscale_LIBDIRS=`
-    echo "$libswscale_LIBDIRS" | $SED 's/^[ \t]*//' | $SED 's/[ \t]*$//'
-`
-            # add library directories to LIBS (ignore *_LIBS for now)
-	    if test -n "$libswscale_LIBDIRS"; then
-                LIBS="$LIBS $libswscale_LIBDIRS"
-            fi
-
-fi
-    fi
-    if test x$have_lib = xyes; then
-        libswscale_HAVE="yes"
-        if test -n "$libswscale_LIBDIRS"; then
-            # show additional lib-dirs
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libswscale_LIBDIRS)" >&5
-$as_echo "yes ($libswscale_LIBDIRS)" >&6; }
-        else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        fi
-    else
-        libswscale_HAVE="no"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-        # check if package is required
-        if test xno = xyes -o x"$with_libswscale" = xyes ; then
-            # print error message and quit
-            err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "libswscale"`
-            as_fn_error $? "
-
-$err_msg
-
-Alternatively, you may set --with-libswscale=nocheck and the environment
-variables libswscale_[...] (see configure --help)
-to appropriate values to avoid the need to call pkg-config.
-
-See the pkg-config man page for more details.
-" "$LINENO" 5
-        fi
-    fi
-
-
-    if test x$libswscale_HAVE = xyes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of libswscale" >&5
-$as_echo_n "checking version of libswscale... " >&6; }
-
-
-    # check if variable was defined by the user
-    if test -z "$libswscale_VERSION"; then
-        # if not, get it from pkg-config
-        if test x$libswscale_HAVE = xyes; then
-            if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libswscale") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  libswscale_VERSION=`$PKG_CONFIG --modversion --silence-errors "libswscale"`
-else
-  # print error message and quit
-                 err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "libswscale"`
-                 as_fn_error $? "
-
-$err_msg
-
-If --with-libswscale=nocheck is defined the environment variable
-libswscale_VERSION
-must be set to avoid the need to call pkg-config.
-
-See the pkg-config man page for more details.
-" "$LINENO" 5
-
-
-fi
-        fi
-    fi
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: [$libswscale_VERSION]" >&5
-$as_echo "[$libswscale_VERSION]" >&6; }
-    else
-        libswscale_VERSION="0.0.0"
-    fi
-
-    version=$libswscale_VERSION
-
-    # strip leading non-numeric tokens
-    # (necessary for some ffmpeg-packages in ubuntu)
-    # example: 0d.51.1.0 -> 51.1.0
-    version=`echo $version | sed 's/^[^.]*[^0-9.][^.]*\.//'`
-
-    # replace "." and "-" with " " and ignore trailing tokens.
-    # 1.23.4-r2 will be splitted to [maj=1, min=23, rel=4].
-    # In addition we delete everything after the first character
-    # which is not 0-9.
-    # 1.3a4-r32 will be [maj=1, min=3, rel=0].
-    read major minor release ignore <<eof
-        `echo $version | tr '.-' ' ' | sed 's/[^0-9\ ].*//'`
-eof
-    # Note: Do NOT indent the eof-delimiter
-    # We use a here-document (<<< here-strings not POSIX compatible)
-
-    test -z $major && major=0
-    test -z $minor && minor=0
-    test -z $release && release=0
-
-    # strip preceding 0s and set unset version-parts to 0
-    libswscale_VERSION_MAJOR=$(($major))
-    libswscale_VERSION_MINOR=$(($minor))
-    libswscale_VERSION_RELEASE=$(($release))
-    # integer representation: MMMmmmrrr (M:major,m:minor,r:release)
-    # can be used if pkg-config's comparison fails
-    libswscale_VERSION_INT=$(($libswscale_VERSION_MAJOR*1000000+$libswscale_VERSION_MINOR*1000+$libswscale_VERSION_RELEASE))
-
-
-
-
-
-
-
-
-    if [ x$libswscale_HAVE = xyes ]; then
-        DEFINE_HAVE_SWSCALE=DEFINE
-    else
-	DEFINE_HAVE_SWSCALE=UNDEF
-    fi
-
-
-
-
 # find projectM version
 libprojectM_PKG="libprojectM >= 0.98"