[commit] r2390 - in trunk/user/sox: . src

[dslinux_sonny_jim at dslinux.in-berlin.de]

Author: dslinux_sonny_jim
Date: Thu Dec 18 18:09:33 2008
New Revision: 2390

Log:
Add libsamplerate support to SoX, hardcoded distro name in configure script

Modified:
   trunk/user/sox/Makefile
   trunk/user/sox/src/configure

Modified: trunk/user/sox/Makefile
==============================================================================
--- trunk/user/sox/Makefile	(original)
+++ trunk/user/sox/Makefile	Thu Dec 18 18:09:33 2008
@@ -3,10 +3,11 @@
 all: .compiled
 
 SOX_CONFIGURE_FLAGS=--disable-largefile --disable-nls \
-		    --enable-static --disable-shared
-
+		    --enable-static --disable-shared \
+		    --with-samplerate --libdir=$(ROOTDIR)/lib \
+		    --includedir=$(ROOTDIR)/include
 .configured:
-	cd src && env CFLAGS="$(CFLAGS)"\
+	cd src && env CFLAGS="$(CFLAGS)" PKG_CONFIG=no \
 		./configure --host=arm-linux-elf \
 		--prefix=/nonexistent $(SOX_CONFIGURE_FLAGS)
 	touch $@

Modified: trunk/user/sox/src/configure
==============================================================================
--- trunk/user/sox/src/configure	(original)
+++ trunk/user/sox/src/configure	Thu Dec 18 18:09:33 2008
@@ -20808,7 +20808,8 @@
 if test -r /etc/issue; then
   { $as_echo "$as_me:$LINENO: checking distro name" >&5
 $as_echo_n "checking distro name... " >&6; }
-  DISTRO=`sed -e "s/.0-90-9;*mJH//g" < /etc/issue|tr "\n" " " | sed -e "s/(\\\\?\\\\\\\\.*//" -e "s/  */ /g" -e "s/^ //" -e "s/ $//"`
+ # DISTRO=`sed -e "s/.0-90-9;*mJH//g" < /etc/issue|tr "\n" " " | sed -e "s/(\\\\?\\\\\\\\.*//" -e "s/  */ /g" -e "s/^ //" -e "s/ $//"`
+   DISTRO=DSLinux
   { $as_echo "$as_me:$LINENO: result: \"$DISTRO\"" >&5
 $as_echo "\"$DISTRO\"" >&6; }
 
@@ -28494,7 +28495,7 @@
   # As a last resort, just hope that header and library can
   # be found in default paths and that it doesn't need
   # to link against any other libraries.
-  SAMPLERATE_LIBS="-lsamplerate"
+  SAMPLERATE_LIBS="-lsamplerate -lm"
   have_samplerate="maybe"
 fi