From a25b30e118e03f3b16db18ab812edea2b5f112bd Mon Sep 17 00:00:00 2001
From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Thu, 12 Feb 2009 00:32:45 +0000
Subject: [PATCH] sox/configure: give pkg-config priority over libst-config

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1350 d19143bc-622f-0410-bfdd-b5b2a6649095
---
 src/modules/sox/configure |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/modules/sox/configure b/src/modules/sox/configure
index df57eee..55b0122 100755
--- a/src/modules/sox/configure
+++ b/src/modules/sox/configure
@@ -15,29 +15,29 @@ then
 		;;
 	esac
 
-	which libst-config > /dev/null 2>&1
+	pkg-config sox
 	if [ $? -eq 0 ]
 	then
 		disable_sox=0
-
-		# determine if we need libsndfile
-		$LDD $(which sox) | grep libsndfile > /dev/null
-		[ $? -eq 0 ] && libsndfile="-lsndfile"
-
-		# determine if we need libsamplerate
-		$LDD $(which sox) | grep libsamplerate > /dev/null
-		[ $? -eq 0 ] && libsamplerate="-lsamplerate"
-
-		echo "CFLAGS += $(libst-config --cflags) -I../../" > config.mak
-		echo "LDFLAGS += -lst $(libst-config --libs) $libsndfile $libsamplerate" >> config.mak
+		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
-		pkg-config sox
+		which libst-config > /dev/null 2>&1
 		if [ $? -eq 0 ]
 		then
 			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
+
+			# determine if we need libsndfile
+			$LDD $(which sox) | grep libsndfile > /dev/null
+			[ $? -eq 0 ] && libsndfile="-lsndfile"
+
+			# determine if we need libsamplerate
+			$LDD $(which sox) | grep libsamplerate > /dev/null
+			[ $? -eq 0 ] && libsamplerate="-lsamplerate"
+
+			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=$?
-- 
1.7.4.4