flac dev - Mar 2005 - flac-1.1.2 configure and Makefile fixes

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: flac-1.1.2-gas.patch
Type: text/x-patch
Size: 735 bytes
Desc: not available
Url :
http://lists.xiph.org/pipermail/flac-dev/attachments/20050219/cb731522/flac-1.1.2-gas.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: flac-1.1.2-makefile.patch
Type: text/x-patch
Size: 511 bytes
Desc: not available
Url :
http://lists.xiph.org/pipermail/flac-dev/attachments/20050219/cb731522/flac-1.1.2-makefile.bin

ok, great, thanks.  checked in.

Josh

--- Luca Barbato <lu_zero@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

> +test "$AS" = "as" && as --version | grep GNU
>/dev/null && AS=gas
The above does not work quite as expected due to several issues.  First of
all, configure will hang as the apple as expects input on stdin if no
source file is
specified.  Also, the version version flag is -v; though it will print
the version
when it doesn't understand the --version flag, it uses stderr, so the
grep doesn't
see it.  The last issue is that both the apple and gnu as have GNU in
the version:

% as -v
Apple Computer, Inc. version cctools-525.obj~1, GNU assembler version 1.38

Considering the above, it is probably best to check for the apple as
explicitly, and
make sure the stdio goes where it should.  Perhaps something like the following:

AC_CHECK_PROGS(AS, [as gas])
test "$AS" = "as" && as -v < /dev/null
2>&1 | grep Apple >/dev/null || AS=gas

One problem not addressed is that some linux distributions (maybe not ppc)
have no gas binary, only gas is installed as as.  In this case, the AS=gas would
not be right, but the hard coded binary name in the ppc/gas/Makefile.am would
prevent it from working anyway.

Chris