aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-30 03:01:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-03-30 03:09:08 +0200
commit445fdc014017a236fa7aa2645ffad7e8d0b45bee (patch)
tree1bd6be8b1dbf95535926c0e1348c63027ecb4339 /configure
parent55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d (diff)
parent52fd16a264d1eb14b1a84b7b38041da1756fb216 (diff)
downloadffmpeg-445fdc014017a236fa7aa2645ffad7e8d0b45bee.tar.gz
Merge remote-tracking branch 'newdev/master'
* newdev/master: ac3enc: move compute_mantissa_size() to ac3dsp ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext Remove support for stripping executables ac3enc: NEON optimised float_to_fixed24 ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp dfa: protect pointer range checks against overflows. Duplicate: mimic: implement multithreading. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure18
1 files changed, 2 insertions, 16 deletions
diff --git a/configure b/configure
index 7fa3ee8574..f6926df0c6 100755
--- a/configure
+++ b/configure
@@ -243,7 +243,6 @@ Developer options (useful when working on FFmpeg itself):
--enable-debug=LEVEL set the debug level [$debuglevel]
--disable-optimizations disable compiler optimizations
--enable-extra-warnings enable more compiler warnings
- --disable-stripping disable stripping of executables and shared libraries
--samples=PATH location of test samples for FATE, if not set use
\$FATE_SAMPLES at make invocation time.
@@ -1146,7 +1145,6 @@ CMDLINE_SELECT="
extra_warnings
logging
optimizations
- stripping
symver
yasm
"
@@ -1184,7 +1182,6 @@ CMDLINE_SET="
pkg_config
samples
source_path
- strip
sysinclude
sysroot
target_exec
@@ -1242,7 +1239,7 @@ rdft_select="fft"
aac_decoder_select="mdct rdft sinewin"
aac_encoder_select="mdct sinewin"
aac_latm_decoder_select="aac_decoder aac_latm_parser"
-ac3_decoder_select="mdct ac3_parser"
+ac3_decoder_select="mdct ac3dsp ac3_parser"
ac3_encoder_select="mdct ac3dsp"
ac3_fixed_encoder_select="ac3dsp"
alac_encoder_select="lpc"
@@ -1624,7 +1621,6 @@ nm_default="nm"
objformat="elf"
pkg_config_default=pkg-config
ranlib="ranlib"
-strip_default="strip"
yasmexe="yasm"
nogas=":"
@@ -1657,7 +1653,6 @@ enable network
enable optimizations
enable protocols
enable static
-enable stripping
enable swscale
enable swscale_alpha
@@ -1834,11 +1829,10 @@ cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}"
pkg_config_default="${cross_prefix}${pkg_config_default}"
ranlib="${cross_prefix}${ranlib}"
-strip_default="${cross_prefix}${strip_default}"
sysinclude_default="${sysroot}/usr/include"
-set_default cc nm pkg_config strip sysinclude
+set_default cc nm pkg_config sysinclude
enabled cross_compile || host_cc_default=$cc
set_default host_cc
@@ -2397,7 +2391,6 @@ case $target_os in
;;
bsd/os)
add_extralibs -lpoll -lgnugetopt
- strip="strip -d"
;;
darwin)
enable malloc_aligned
@@ -2405,7 +2398,6 @@ case $target_os in
enabled ppc && add_asflags -force_cpusubtype_ALL
SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
- strip="${strip} -x"
add_ldflags -Wl,-dynamic,-search_paths_first
SLIBSUF=".dylib"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
@@ -2475,7 +2467,6 @@ case $target_os in
ranlib="echo ignoring ranlib"
;;
os/2*)
- strip="lxlite -CS"
ln_s="cp -f"
add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap
SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf'
@@ -3130,7 +3121,6 @@ if enabled sparc; then
echo "VIS enabled ${vis-no}"
fi
echo "debug symbols ${debug-no}"
-echo "strip symbols ${stripping-no}"
echo "optimizations ${optimizations-no}"
echo "static ${static-no}"
echo "shared ${shared-no}"
@@ -3226,8 +3216,6 @@ if enabled source_path_used; then
map 'test -f "$source_path/$v" && $ln_s "$source_path/$v" $v' $FILES
fi
-enabled stripping || strip="echo skipping strip"
-
config_files="$TMPH config.mak"
cat > config.mak <<EOF
@@ -3255,9 +3243,7 @@ YASM=$yasmexe
YASMDEP=$yasmexe
AR=$ar
RANLIB=$ranlib
-CP=cp -p
LN_S=$ln_s
-STRIP=$strip
CPPFLAGS=$CPPFLAGS
CFLAGS=$CFLAGS
ASFLAGS=$ASFLAGS