check in more fixes from Luca to build properly on linux-ppc (asm-related again)

diff --git a/configure.in b/configure.in
index 603d6ca..5a37032 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -185,14 +185,17 @@ AC_DEFINE(FLAC__HAS_NASM)
 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(GAS, 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

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index e7823ae..5c85c46 100644 (file)
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -59,12 +59,13 @@ if FLaC__CPU_PPC
 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