fix libFLAC to build PPC asm properly, conditionalized for gas or as

src/libFLAC/Makefile.am

@@ -44,8 +44,13 @@ endif
 endif
 if FLaC__CPU_PPC
 ARCH_SUBDIRS = ppc
-#@@@@@@ need to conditionalize this to gas or as depending on configure
+if FLaC__HAS_AS
 libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
+else
+if FLaC__HAS_GAS
+libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
+endif
+endif
 LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
 endif
 endif

src/libFLAC/ppc/Makefile.am

@@ -28,6 +28,4 @@
 #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#@@@@@@ We actually want to only compile one based on some configuration,
-#@@@@@@ so we'll eventually have to conditionalize the sub-Makefile.am's
 SUBDIRS = as gas

src/libFLAC/ppc/as/Makefile.am

@@ -28,6 +28,8 @@
 #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+if FLaC__HAS_AS
+
 SUFFIXES = .s .lo
 
 STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
@@ -40,3 +42,10 @@ STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
 noinst_LTLIBRARIES = libFLAC-asm.la
 libFLAC_asm_la_SOURCES = \
 	lpc_asm.s
+
+else
+
+EXTRA_DIST = \
+	lpc_asm.s
+
+endif

src/libFLAC/ppc/gas/Makefile.am

@@ -28,6 +28,8 @@
 #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+if FLaC__HAS_GAS
+
 SUFFIXES = .s .lo
 
 STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
@@ -40,3 +42,10 @@ STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
 noinst_LTLIBRARIES = libFLAC-asm.la
 libFLAC_asm_la_SOURCES = \
 	lpc_asm.s
+
+else
+
+EXTRA_DIST = \
+	lpc_asm.s
+
+endif