10l

[ffmpeg] / configure

diff --git a/configure b/configure
index 939877b348fb8368a835b16eed10ae777fc5f80a..2c237210d68019fcabaea11e6c0aef6ffaa13ab8 100755 (executable)
--- a/configure
+++ b/configure
@@ -115,9 +115,12 @@ case "$cpu" in
   mips)
     cpu="mips"
   ;;
-  sun4u)
+  sun4u|sparc64)
     cpu="sparc64"
   ;;
+  sparc)
+    cpu="sparc"
+  ;;
   sh4)
     cpu="sh4"
   ;;
@@ -224,7 +227,8 @@ v4l="no"
 audio_oss="yes"
 dv1394="no"
 make="gmake"
-LDFLAGS="$LDFLAGS -export-dynamic"
+CFLAGS="-pthread"
+LDFLAGS="$LDFLAGS -export-dynamic -pthread"
 ;;
 BSD/OS)
 v4l="no"
@@ -515,6 +519,7 @@ fi
 
 # Add processor-specific flags
 TUNECPU="generic"
+POWERPCMODE="32bits"
 if test $tune != "generic"; then
     case $tune in
        601|ppc601|PowerPC601)
@@ -560,11 +565,12 @@ if test $tune != "generic"; then
            TUNECPU=ppc7400
        ;;
        G5|g5|970|ppc970|PowerPC970|power4*|Power4*)
-           CFLAGS="$CFLAGS -mcpu=970 -mtune=970 -mpowerpc64 -force_cpusubtype_ALL "
+           CFLAGS="$CFLAGS -mcpu=970 -mtune=970 -mpowerpc-gfxopt -mpowerpc64"
            if test $altivec = "no"; then
                echo "WARNING: tuning for PPC970 but altivec disabled !";
            fi
            TUNECPU=ppc970
+            POWERPCMODE="64bits"
        ;;
        *)
        echo "WARNING: unknown CPU "$tune", ignored"
@@ -1023,9 +1029,19 @@ elif test "$cpu" = "alpha" ; then
 elif test "$cpu" = "sparc64" ; then
   echo "TARGET_ARCH_SPARC64=yes" >> config.mak
   echo "#define ARCH_SPARC64 1" >> $TMPH
+  echo "TARGET_ARCH_SPARC=yes" >> config.mak
+  echo "#define ARCH_SPARC 1" >> $TMPH
+elif test "$cpu" = "sparc" ; then
+  echo "TARGET_ARCH_SPARC=yes" >> config.mak
+  echo "#define ARCH_SPARC 1" >> $TMPH
 elif test "$cpu" = "powerpc" ; then
   echo "TARGET_ARCH_POWERPC=yes" >> config.mak
   echo "#define ARCH_POWERPC 1" >> $TMPH
+  if test $POWERPCMODE = "32bits"; then
+    echo "#define POWERPC_MODE_32BITS 1" >> $TMPH
+  else
+    echo "#define POWERPC_MODE_64BITS 1" >> $TMPH
+  fi
   if test "$powerpc_perf" = "yes"; then
     echo "#define POWERPC_PERFORMANCE_REPORT 1" >> $TMPH
   fi
@@ -1092,7 +1108,9 @@ fi
 if test "$pthreads" = "yes" ; then
   echo "HAVE_PTHREADS=yes" >> config.mak
   echo "#define HAVE_PTHREADS 1" >> $TMPH
-  extralibs="$extralibs -lpthread"
+  if test $targetos != FreeBSD; then
+     extralibs="$extralibs -lpthread"
+  fi
 fi
 if test "$sdl" = "yes" ; then
   echo "CONFIG_SDL=yes" >> config.mak
@@ -1283,6 +1301,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 \