From 0d5c9e75b2c89bcaf012f31fbf3e29caa7860c71 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Wed, 13 Apr 2005 16:38:40 +0000 Subject: [PATCH] Disable sox when unavailable git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@705 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/sox/Makefile | 8 +++----- src/modules/sox/configure | 13 ++++++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile index 9e69741..e80928c 100644 --- 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 987f47e..d56abb6 100755 --- 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 -- 1.7.4.4