X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsox%2Fconfigure;h=df57eeed25ed004ac9a0dfecd6605c2d6f8cf46d;hb=bb52b9f3ce843820aca77ca7bc18adf1dcd61122;hp=5336c6906149c422f1f12479fe9c5186852b5cd8;hpb=79bca3394b546f7a0cc87d6ac3e1ef4e080956ab;p=melted

diff --git a/src/modules/sox/configure b/src/modules/sox/configure
index 5336c69..df57eee 100755
--- a/src/modules/sox/configure
+++ b/src/modules/sox/configure
@@ -8,7 +8,7 @@ then
 	Darwin)
 		LDD="otool -L"
 		;;
-	Linux)
+	Linux|FreeBSD)
 		LDD="ldd"
 		;;
 	*)
@@ -34,8 +34,10 @@ then
 		pkg-config sox
 		if [ $? -eq 0 ]
 		then
-			echo "CFLAGS += $(pkg-config --cflags sox)" > config.mak
-			echo "LDFLAGS += $(pkg-config --libs sox)" > config.mak
+			disable_sox=0
+			echo "CFLAGS += $(pkg-config --cflags sox) -I$(pkg-config --variable=prefix sox)" > config.mak
+			echo "LDFLAGS += $(pkg-config --libs sox)" >> config.mak
+			[ $(pkg-config --modversion sox | cut -d. -f1) -gt 13 ] && echo "CFLAGS += -DSOX14" >> config.mak
 		else
 			sox --version 2> /dev/null | grep 'v14.' > /dev/null
 			disable_sox=$?
@@ -62,8 +64,12 @@ then
 				$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 -lsfx $libsamplerate" >> config.mak
+				echo "LDFLAGS += -L$soxdir/$LIBDIR -lsox $libsfx $libsamplerate" >> config.mak
 			fi
 		fi
 	fi