avformat/configure: fix detect shared install of libavformat due to link to versioned...

[melted] / src / modules / avformat / configure

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 210be53..8a72d9e 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -7,6 +7,7 @@ then
 FFMPEG/avformat options:
 
   --avformat-svn          - Obtain ffmpeg from Subversion
+  --avformat-svn-extra    - Add extra configure options for --avformat-svn
   --avformat-shared=path  - Link against a shared installation of ffmpeg (default)
   --avformat-static=path  - Link against a static ffmpeg dev tree
   --avformat-ldextra=libs - Provide additional libs to link with
@@ -44,6 +45,7 @@ else
        export shared_ffmpeg=`which ffmpeg`
        export extra_libs=
        export svn_ffmpeg=
+       export svn_ffmpeg_extra=
        export avformat_suffix=
        export swscale=
 
@@ -62,27 +64,40 @@ else
                        --avformat-shared=* )   shared_ffmpeg="${i#--avformat-shared=}" ;;
                        --avformat-ldextra=* )  extra_libs="${i#--avformat-ldextra=}" ;;
                        --avformat-svn )                svn_ffmpeg=true ;;
+                       --avformat-svn-extra=* ) svn_ffmpeg_extra="${i#--avformat-svn-extra=}" ;;
                        --avformat-cvs )                svn_ffmpeg=true ;;
                        --avformat-suffix=* )   avformat_suffix="${i#--avformat-suffix=}" ;;
                        --avformat-swscale )    swscale=true ;;
+                       --avformat-swscaler )   swscale=true ;;
                esac
        done
 
        if [ "$svn_ffmpeg" != "" ]
        then
-               [ ! -d "ffmpeg" ] && ( 
+               if [ "$gpl" = "true" ]
+               then
+                       enable_gpl="--enable-gpl"
+                       if [ "$swscale" != "" ]
+                       then
+                                       enable_swscale="--enable-swscaler"
+                                       echo "SWSCALE=1" >> config.mak
+                       fi
+               elif [ "$swscale" != "" ]
+               then
+                       echo
+                       echo "ERROR        ERROR        ERROR        ERROR        ERROR        ERROR"
+                       echo "--enable-gpl is required to use --avformat-swscale with --avformat-svn!"
+                       echo
+                       exit
+               fi
+               if [ ! -d "ffmpeg" ]
+               then
                        echo
                        echo "Checking out ffmpeg/avformat - no password required"
                        echo
                        svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
-               )
-               enable_gpl=`[ "$gpl" = "true" ] && echo "--enable-gpl"`
-               if [ "$swscale" != "" ]
-               then
-                               enable_swscale="--enable-swscaler"
-                               echo "SWSCALE=1" >> config.mak
                fi
-               [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale )
+               [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale $svn_ffmpeg_extra )
                #[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
                echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil -I`pwd`/ffmpeg/libswscale" >> config.mak
                echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec -L`pwd`/ffmpeg/libavutil -L`pwd`/ffmpeg/libswscale" >> config.mak
@@ -110,7 +125,7 @@ else
                        echo 0
                fi
        else 
-               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
+               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -e "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
                then
                        echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
                        echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak