Commit 99d0dcaa authored by diego's avatar diego

Rename --disable-strip option to --disable-stripping. This allows

handling this option in a more standard way.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12582 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 55ea7275
...@@ -177,7 +177,7 @@ show_help(){ ...@@ -177,7 +177,7 @@ show_help(){
echo " --enable-gprof enable profiling with gprof [$gprof]" echo " --enable-gprof enable profiling with gprof [$gprof]"
echo " --disable-optimizations disable compiler optimizations" echo " --disable-optimizations disable compiler optimizations"
echo " --enable-extra-warnings enable more compiler warnings" echo " --enable-extra-warnings enable more compiler warnings"
echo " --disable-strip disable stripping of executables and shared libraries" echo " --disable-stripping disable stripping of executables and shared libraries"
echo "" echo ""
echo "NOTE: Object files are built at the place where configure is launched." echo "NOTE: Object files are built at the place where configure is launched."
exit 1 exit 1
...@@ -776,6 +776,7 @@ CMDLINE_SELECT=" ...@@ -776,6 +776,7 @@ CMDLINE_SELECT="
optimizations optimizations
shared shared
static static
stripping
" "
# code dependency declarations # code dependency declarations
...@@ -900,7 +901,6 @@ enable zlib ...@@ -900,7 +901,6 @@ enable zlib
# configurable options # configurable options
enable debug enable debug
enable dostrip
enable ffmpeg enable ffmpeg
enable ffplay enable ffplay
enable ffserver enable ffserver
...@@ -910,6 +910,7 @@ enable mpegaudio_hp ...@@ -910,6 +910,7 @@ enable mpegaudio_hp
enable network enable network
enable optimizations enable optimizations
enable protocols enable protocols
enable stripping
vhook="default" vhook="default"
# build settings # build settings
...@@ -1030,8 +1031,6 @@ for opt do ...@@ -1030,8 +1031,6 @@ for opt do
;; ;;
--enable-sunmlib) enable mlib --enable-sunmlib) enable mlib
;; ;;
--disable-strip) disable dostrip
;;
--disable-devices) disable $INDEV_LIST $OUTDEV_LIST --disable-devices) disable $INDEV_LIST $OUTDEV_LIST
;; ;;
--enable-debug=*) debuglevel="$optval" --enable-debug=*) debuglevel="$optval"
...@@ -1908,7 +1907,7 @@ if test $arch = "powerpc"; then ...@@ -1908,7 +1907,7 @@ if test $arch = "powerpc"; then
fi fi
echo "gprof enabled ${gprof-no}" echo "gprof enabled ${gprof-no}"
echo "debug symbols ${debug-no}" echo "debug symbols ${debug-no}"
echo "strip symbols ${dostrip-no}" echo "strip symbols ${stripping-no}"
echo "optimizations ${optimizations-no}" echo "optimizations ${optimizations-no}"
echo "static ${static-no}" echo "static ${static-no}"
echo "shared ${shared-no}" echo "shared ${shared-no}"
...@@ -1985,7 +1984,7 @@ echo "CC=$cc" >> config.mak ...@@ -1985,7 +1984,7 @@ echo "CC=$cc" >> config.mak
echo "AR=$ar" >> config.mak echo "AR=$ar" >> config.mak
echo "RANLIB=$ranlib" >> config.mak echo "RANLIB=$ranlib" >> config.mak
echo "LN_S=$ln_s" >> config.mak echo "LN_S=$ln_s" >> config.mak
enabled dostrip && enabled stripping &&
echo "STRIP=$strip" >> config.mak || echo "STRIP=$strip" >> config.mak ||
echo "STRIP=echo ignoring strip" >> config.mak echo "STRIP=echo ignoring strip" >> config.mak
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment