[SCM] libav/experimental: Introduce --disable-logging option to control logging. --logfile now just controls the name of the log file, not the decision whether or not to log.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:17:41 UTC 2013
The following commit has been merged in the experimental branch:
commit 8c6afa4dae7df62dfceed22e65fe243762fdd137
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Mar 25 09:53:49 2008 +0000
Introduce --disable-logging option to control logging. --logfile now just
controls the name of the log file, not the decision whether or not to log.
Originally committed as revision 12577 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/configure b/configure
index f12952e..940e5e0 100755
--- a/configure
+++ b/configure
@@ -56,7 +56,8 @@ show_help(){
echo
echo "Standard options:"
echo " --help print this message"
- echo " --logfile=<FILE|yes|no> log tests and output to FILE [config.err]"
+ echo " --logfile=FILE log tests and output to FILE [config.err]"
+ echo " --disable-logging do not log configure debug information"
echo " --prefix=PREFIX install in PREFIX [$PREFIX]"
echo " --libdir=DIR install libs in DIR [PREFIX/lib]"
echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]"
@@ -771,6 +772,7 @@ CMDLINE_SELECT="
$THREADS_LIST
debug
extra_warnings
+ logging
optimizations
shared
static
@@ -990,7 +992,7 @@ show_list() {
for opt do
optval="${opt#*=}"
case "$opt" in
- --logfile=*) logging="$optval"
+ --logfile=*) logfile="$optval"
;;
--prefix=*) PREFIX="$optval"
;;
@@ -1304,13 +1306,10 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
add_extralibs $osextralibs
-if ! disabled logging ; then
- enabled logging || logfile="$logging"
+enabled logging || logfile=/dev/null
+
echo "# $0 $@" >$logfile
set >>$logfile
-else
- logfile=/dev/null
-fi
# Combine FFLDFLAGS and the LDFLAGS environment variable.
LDFLAGS="$FFLDFLAGS $LDFLAGS"
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list