Revert "build: distribute version controlled ltmain.sh in tarball"

[debian/gnuradio] / configure-cell-cross

diff --git a/configure-cell-cross b/configure-cell-cross
index 6d6e7e542060661a02921726bb3bd9ec8e3e65f5..fd03588fb03521f1b17196ed2752b44d68c20a82 100755 (executable)
--- a/configure-cell-cross
+++ b/configure-cell-cross
@@ -33,9 +33,22 @@ cell_root=/mnt/cell-root
 python_version=2.5
 compiler_includes="-isystem ${cell_root}/usr/include"
 
+# check for 4.3 versions of cross-compilers and use them if we've got them
+if which ppu32-gcc43 >/dev/null 2>&1; then
+  ppu32_gcc=ppu32-gcc43
+else
+  ppu32_gcc=ppu32-gcc
+fi
+
+if which ppu32-g++43 >/dev/null 2>&1; then
+  ppu32_gxx=ppu32-g++43
+else
+  ppu32_gxx=ppu32-g++
+fi
+
 $scriptdir/configure                       \
-    CC=${arch}32-gcc                        \
-    CXX=${arch}32-g++                       \
+    CC=${ppu32_gcc}                         \
+    CXX=${ppu32_gxx}                        \
     AR=${arch}-ar                           \
     NM=${arch}-nm                           \
     RANLIB=${arch}-ranlib                   \
@@ -49,6 +62,8 @@ $scriptdir/configure                      \
     --with-pythondir=$prefix/lib/python${python_version}/site-packages                 \
     --disable-gr-video-sdl \
     --disable-gr-audio-portaudio \
+    --disable-gr-audio-jack \
+    --disable-usrp2-firmware \
     "$@"