Thread: [Mlt-devel] SF.net SVN: mlt:[1350] trunk/mlt/src/modules/sox/configure
Brought to you by:
ddennedy,
lilo_booter
From: <dde...@us...> - 2009-02-12 00:32:49
|
Revision: 1350 http://mlt.svn.sourceforge.net/mlt/?rev=1350&view=rev Author: ddennedy Date: 2009-02-12 00:32:45 +0000 (Thu, 12 Feb 2009) Log Message: ----------- sox/configure: give pkg-config priority over libst-config Modified Paths: -------------- trunk/mlt/src/modules/sox/configure Modified: trunk/mlt/src/modules/sox/configure =================================================================== --- trunk/mlt/src/modules/sox/configure 2009-02-10 22:44:56 UTC (rev 1349) +++ trunk/mlt/src/modules/sox/configure 2009-02-12 00:32:45 UTC (rev 1350) @@ -15,29 +15,29 @@ ;; 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=$? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |