sox/configure, filter_sox.c: fix building against sox 14.1.0.

[melted] / src / modules / sox / configure

diff --git a/src/modules/sox/configure b/src/modules/sox/configure
index 5336c69..d6a3450 100755 (executable)
--- a/src/modules/sox/configure
+++ b/src/modules/sox/configure
@@ -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)" > "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