Disable sox when unavailable

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@705 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index 9e6974167344b9c968482203e7a6364e7c046303..e80928c9fc9aec23b7f9dc33ccb45d2ff92bc02b 100644 (file)
--- a/src/modules/sox/Makefile
+++ b/src/modules/sox/Makefile
@@ -5,11 +5,9 @@ TARGET = ../libmltsox$(LIBSUF)
 OBJS = factory.o \
           filter_sox.o 
 
-CFLAGS += -I../../ -I/usr/include/sox
-
-LDFLAGS += -lst -lpopt -lvorbis -logg -lvorbisfile -lvorbisenc
-
-LDFLAGS+=-L../../framework -lmlt -lmp3lame
+CFLAGS += `libst-config --cflags` -I../../ 
+LDFLAGS += -lst `libst-config --libs`
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/sox/configure b/src/modules/sox/configure
index 987f47e23d6e40402a4b02713ff4bc6298b1c45c..d56abb671e72e47f54989557dfbf94453532ad2f 100755 (executable)
--- a/src/modules/sox/configure
+++ b/src/modules/sox/configure
@@ -3,8 +3,15 @@
 if [ "$help" != "1" ]
 then
 
-cat << EOF >> ../filters.dat
-sox            libmltsox$LIBSUF
-EOF
+       which libst-config > /dev/null 2>&1
+       disable_sox=$?
+
+       if [ "$disable_sox" == "0" ]
+       then
+               echo "sox               libmltsox$LIBSUF" >> ../filters.dat
+       else
+               echo "- sox not found: disabling"
+               touch ../disable-sox
+       fi
 
 fi