[Flac-dev] automake 1.5

[Josh Coalson]

OK, thanks, I checked it in.

Josh

--- Matt Zimmerman <mdz at debian.org> wrote:
> automake 1.5 complains a bit about one of FLAC's Makefile.am files:
> 
> configure.in:90: warning: AC_TRY_RUN called without default to allow
> cross compiling
> configure.in:91: warning: AC_TRY_RUN called without default to allow
> cross compiling
> configure.in:92: warning: AC_TRY_RUN called without default to allow
> cross compiling
> configure.in:93: warning: AC_TRY_RUN called without default to allow
> cross compiling
> src/libFLAC/Makefile.am:25: CFLAGS was already defined in condition
> DEBUG_TRUE, which is implied by condition TRUE
>   CFLAGS (User, where = 25) =
>   {
>     DEBUG_TRUE => @CFLAGS@ -DFLAC__OVERFLOW_DETECT
>     DEBUG_FALSE => @CFLAGS@
>   }
> src/libFLAC/Makefile.am:25: CFLAGS was already defined in condition
> DEBUG_FALSE, which is implied by condition TRUE
>   CFLAGS (User, where = 25) =
>   {
>     DEBUG_TRUE => @CFLAGS@ -DFLAC__OVERFLOW_DETECT
>     DEBUG_FALSE => @CFLAGS@
>   }
> 
> The attached patch should avoid the error without changing any
> behavior (and
> should also work with previous automakes).
> 
> -- 
>  - mdz
> > Index: Makefile.am
> ===================================================================
> RCS file: /cvsroot/flac/flac/src/libFLAC/Makefile.am,v
> retrieving revision 1.16
> diff -u -r1.16 Makefile.am
> --- Makefile.am	2001/07/22 07:27:45	1.16
> +++ Makefile.am	2001/10/19 05:24:34
> @@ -22,10 +22,9 @@
>  
>  lib_LTLIBRARIES = libFLAC.la
>  if DEBUG
> -CFLAGS += @CFLAGS@ -DFLAC__OVERFLOW_DETECT
> -else
> -CFLAGS = @CFLAGS@
> +DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
>  endif
> +CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
>  
>  if FLaC__NO_ASM
>  else
> 

> ATTACHMENT part 2 application/pgp-signature 



__________________________________________________
Do You Yahoo!?
Make a great connection at Yahoo! Personals.
http://personals.yahoo.com