[Flac-dev] flac-1.1.2 configure and Makefile fixes

[Josh Coalson]

ok, great, thanks.  checked in.

Josh

--- Luca Barbato <lu_zero at gentoo.org> wrote:

> I spent a bit of time trying to make the configure behave.
> 
> that's the result, I didn't check if the asm output runs correctly 
> (looks forcefully disabled) but at least builds as should.
> 
> lu
> 
> -- 
> 
> Luca Barbato
> 
> Gentoo/linux Developer		Gentoo/PPC Operational Manager
> http://dev.gentoo.org/~lu_zero
> 
> > --- configure.in	2005-02-03 06:03:25.000000000 +0100
> +++ /tmp/configure.in	2005-02-19 14:11:56.714378040 +0100
> @@ -184,14 +184,17 @@
>  fi
>  
>  # only matters for PowerPC
> -AC_CHECK_PROGS(AS, as)
> -AC_CHECK_PROGS(GAS, gas)
> -AM_CONDITIONAL(FLaC__HAS_AS, test -n "$AS")
> -AM_CONDITIONAL(FLaC__HAS_GAS, test -n "$GAS")
> -if test -n "$AS" ; then
> +AC_CHECK_PROGS(AS, as, as)
> +AC_CHECK_PROGS(AS, gas, gas)
> +
> +test "$AS" = "as" && as --version | grep GNU >/dev/null && AS=gas
> +
> +AM_CONDITIONAL(FLaC__HAS_AS, test "$AS" = "as" )
> +AM_CONDITIONAL(FLaC__HAS_GAS, test "$AS" = "gas" )
> +if test "$AS" = "as" ; then
>  AC_DEFINE(FLAC__HAS_AS)
>  fi
> -if test -n "$GAS" ; then
> +if test "$AS" = "gas" ; then
>  # funniest. macro. ever.
>  AC_DEFINE(FLAC__HAS_GAS)
>  fi
> > --- src.orig/libFLAC/Makefile.am	2005-02-03 05:58:13.000000000
+0100
> +++ src/libFLAC/Makefile.am	2005-02-19 14:35:39.397097392 +0100
> @@ -59,12 +59,13 @@
>  ARCH_SUBDIRS = ppc
>  if FLaC__HAS_AS__TEMPORARILY_DISABLED
>  libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
> +LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
>  else
>  if FLaC__HAS_GAS__TEMPORARILY_DISABLED
>  libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
> +LOCAL_EXTRA_LDFLAGS = ""
>  endif
>  endif
> -LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
>  endif
>  endif
>  
> 


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com