[FFmpeg-cvslog] r12577 - trunk/configure

[Måns Rullgård]

diego wrote:
> Author: diego
> Date: Tue Mar 25 10:53:49 2008
> New Revision: 12577
>
> Log:
> 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.
>
>
> Modified:
>    trunk/configure
>
> Modified: trunk/configure
> ==============================================================================
> --- trunk/configure	(original)
> +++ trunk/configure	Tue Mar 25 10:53:49 2008
> @@ -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}-$
>
>  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

This is wrong.  Options are unset by default, i.e. neither enabled nor
disabled.  Change that to "disabled logging && ..." instead.

-- 
M?ns Rullg?rd
mans at mansr.com