[FFmpeg-devel] [PATCH] Other configure version check patches

[Stefano Sabatini]

On date Sunday 2008-10-19 12:03:07 +0200, Stefano Sabatini encoded:
> On date Saturday 2008-10-18 22:20:08 +0100, M?ns Rullg?rd encoded:
> > Diego Biurrun <diego at biurrun.de> writes:
> > 
> > > On Sat, Oct 18, 2008 at 10:03:48PM +0100, M?ns Rullg?rd wrote:
> > >> Diego Biurrun <diego at biurrun.de> writes:
> > >> 
> > >> > On Sat, Oct 18, 2008 at 08:51:01PM +0100, M?ns Rullg?rd wrote:
> [...]
> > >> >> > --- configure	(revision 15633)
> > >> >> > +++ configure	(working copy)
> > >> >> > @@ -1316,6 +1316,10 @@
> > >> >> > +        check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3) || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION >= 12)" ||
> > >> >> > +            die "w32api must be >= 3.12."
> > >> >> 
> > >> >> Those lines are frightfully long, but I don't see any better alternative.
> > >> >
> > >> > For example:
> > >> >
> > >> >     check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3) || (__W32API_MAJOR_VERSION == 3
> > >> >                                 && __W32API_MINOR_VERSION >= 12)" || die "w32api must be >= 3.12."
> > >> 
> > >> If a line is longer than 80 characters, it doesn't really get worse
> > >> until it hits 160.
> > >
> > > It could be split at the || as well...
> > 
> > I don't like quoted strings spanning multiple lines either.  I would
> > just go with the single line.  The alternatives aren't really any
> > easier to read.
> > 
> > >> BTW, your split would need a backslash or two.
> > >
> > > No, the quotes take care of this.
> > 
> > The quotes quote the newline, upon which the preprocessor will choke.
> 
> Yes, while long lines are ugly I think in this case they provide the
> more robust solution.
> 
> In this new patch I just added the missing "ERROR:" in the messages.
> 
> Regards.
> -- 
> FFmpeg = Faboulous and Forgiving Multipurpose Patchable Exxagerate Gangster

> Index: configure
> ===================================================================
> --- configure	(revision 15638)
> +++ configure	(working copy)
> @@ -1316,6 +1316,10 @@
>          SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
>          objformat="win32"
>          enable dos_paths
> +        check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
> +            die "ERROR: MinGW runtime version must be >= 3.15."
> +        check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3) || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION >= 12)" ||
> +            die "ERROR: w32api version must be >= 3.12."
>          ;;
>      cygwin*)
>          target_os=cygwin

My MinGW isn't working and I'm quite busy this week, so if there is
someone which can test the patch please do it, otherwise I'll do it
when I'll have more time to set up MinGW, but I don't know when this
will happen.

Regards.
-- 
FFmpeg = Faboulous and Foolish Martial Patchable Everlasting Gospel