altivec workaround

[ffmpeg] / configure

diff --git a/configure b/configure
index b53b15c2c443b61a853b5dd4efebdcd29472fd5d..01d7d9ee618d3dd352895feea7e14be1852dc2d9 100755 (executable)
--- a/configure
+++ b/configure
@@ -62,6 +62,7 @@ echo "  --disable-ffserver       disable ffserver build"
 echo "  --disable-ffplay         disable ffplay build"
 echo "  --disable-risky          disables patent encumbered codecs"
 echo "  --enable-small           optimize for size instead of speed"
+echo "  --enable-memalign-hack   emulate memalign, interferes with memory debuggers"
 echo ""
 echo "NOTE: The object files are build at the place where configure is launched"
 exit 1
@@ -178,6 +179,7 @@ amr_nb_fixed="no"
 sunmlib="no"
 pthreads="no"
 gpl="no"
+memalignhack="no"
 
 # OS specific
 targetos=`uname -s`
@@ -371,7 +373,7 @@ for opt do
   ;;
   --disable-dv1394) dv1394="no"
   ;;
-  --disable-network) network="no"
+  --disable-network) network="no"; ffserver="no"
   ;;
   --disable-zlib) zlib="no"
   ;;
@@ -427,6 +429,8 @@ for opt do
   ;;
   --enable-gpl) gpl="yes"
   ;;
+  --enable-memalign-hack) memalignhack="yes"
+  ;;
   esac
 done
 
@@ -853,7 +857,7 @@ int main( void ) { return (int) imlib_load_font("foo"); }
 EOF
 
 imlib2=no
-if $cc -o $TMPE $TMPC -lImlib2 > /dev/null 2>&1  ; then
+if $cc -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1  ; then
 imlib2=yes
 fi
 
@@ -867,7 +871,7 @@ EOF
 
 freetype2=no
 if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then
-  if test "`which freetype-config`" != ""; then
+  if freetype-config --version >/dev/null 2>&1 ; then
     if $cc -o $TMPE $TMPC `freetype-config --cflags` `freetype-config --libs`  > /dev/null 2>&1 ; then
       freetype2=yes
     fi
@@ -885,6 +889,7 @@ EOF
 
 sdl_too_old=no
 sdl=no
+if sdl-config --version >/dev/null 2>&1 ; then
 if $cc -o $TMPE `sdl-config --cflags` $TMPC `sdl-config --libs`  > /dev/null 2>&1  ; then
 _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
 if test "$_sdlversion" -lt 121 ; then
@@ -893,6 +898,7 @@ else
 sdl=yes
 fi
 fi
+fi
 
 case "`$cc -v 2>&1 | grep version`" in
     *gcc*)
@@ -1267,6 +1273,11 @@ else
   echo "#undef  HAVE_MEMALIGN" >> $TMPH
 fi
 
+if test "$memalignhack" = "yes" ; then
+  echo "#define MEMALIGN_HACK 1" >> $TMPH
+fi
+
+
 if test "$netserver" = "yes" ; then
   echo "#define CONFIG_BEOS_NETSERVER 1" >> $TMPH
   echo "CONFIG_BEOS_NETSERVER=yes" >> config.mak
@@ -1301,6 +1312,10 @@ fi
 
 echo "#define restrict $_restrict" >> $TMPH
 
+if test "$optimize" = "small"; then
+  echo "#define always_inline"  >> $TMPH
+fi
+
 # build tree in object directory if source path is different from current one
 if test "$source_path_used" = "yes" ; then
     DIRS="libavformat libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \