]> git.sesse.net Git - mlt/commitdiff
Do not try to build sox without sox.pc or libst-config (SF-196).
authorDan Dennedy <dan@dennedy.org>
Sat, 7 Sep 2013 20:32:36 +0000 (13:32 -0700)
committerDan Dennedy <dan@dennedy.org>
Sat, 7 Sep 2013 20:32:36 +0000 (13:32 -0700)
src/modules/sox/configure

index c6962322ed71a155c7592437fa3d8f31a0182d12..1c401130a4f12d38bce676197b0a5b2c186a8fbd 100755 (executable)
@@ -39,46 +39,10 @@ then
                        echo "CFLAGS += $(libst-config --cflags) -I../.." > config.mak
                        echo "LDFLAGS += -lst $(libst-config --libs) $libsndfile $libsamplerate" >> config.mak
                else
-                       sox --version 2> /dev/null | grep 'v14.' > /dev/null
-                       disable_sox=$?
-                       if [ $disable_sox -eq 0 ]
-                       then
-                               LIBDIR=lib
-                               bits=$(uname -m)
-                               case $bits in
-                               x86_64)
-                                       [ -d /usr/lib/lib64 ] && export LIBDIR=lib64 || export LIBDIR=lib
-                                       ;;
-                               *)
-                                       export LIBDIR=lib
-                                       ;;
-                               esac
-
-                               sox=$(which sox)
-                               # chop sox
-                               soxdir=$(dirname $sox)
-                               # chop bin
-                               soxdir=$(dirname $soxdir)
-
-                               # determine if we need libsamplerate
-                               $LDD "$sox" | grep libsamplerate > /dev/null
-                               [ $? -eq 0 ] && libsamplerate="-lsamplerate"
-
-                               # determine if we need libsfx
-                               $LDD $(which sox) | grep libsfx  > /dev/null
-                               [ $? -eq 0 ] && libsfx="-lsfx"
-
-                               echo "CFLAGS += -DSOX14 -I$soxdir/include" > config.mak
-                               echo "LDFLAGS += -L$soxdir/$LIBDIR -lsox $libsfx $libsamplerate" >> config.mak
-                       fi
+                       echo "- sox not found: disabling"
+                       touch ../disable-sox
                fi
        fi
 
-       if [ "$disable_sox" != "0" ]
-       then
-               echo "- sox not found: disabling"
-               touch ../disable-sox
-       fi
-
        exit 0
 fi