diff -urN xmms-1.2.7.orig/aclocal/as.m4 xmms-1.2.7/aclocal/as.m4

--- xmms-1.2.7.orig/aclocal/as.m4	Thu Jan  1 07:00:00 1970

+++ xmms-1.2.7/aclocal/as.m4	Tue Jan 22 06:11:27 2002

@@ -0,0 +1,31 @@

+# Figure out how to run the assembler.             -*- Autoconf -*-

+

+# serial 2

+

+# Copyright 2001 Free Software Foundation, Inc.

+

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2, or (at your option)

+# any later version.

+

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA

+# 02111-1307, USA.

+

+# AM_PROG_AS

+# ----------

+AC_DEFUN([AM_PROG_AS],

+[# By default we simply use the C compiler to build assembly code.

+AC_REQUIRE([AC_PROG_CC])

+: ${CCAS='$(CC)'}

+# Set ASFLAGS if not already set.

+: ${CCASFLAGS='$(CFLAGS)'}

+AC_SUBST(CCAS)

+AC_SUBST(CCASFLAGS)])

diff -urN xmms-1.2.7.orig/configure.in xmms-1.2.7/configure.in

--- xmms-1.2.7.orig/configure.in	Fri Aug  9 16:07:22 2002

+++ xmms-1.2.7/configure.in	Fri Aug  9 16:07:52 2002

@@ -48,6 +48,9 @@

 AC_PROG_LN_S

 AC_PROG_MAKE_SET

+dnl Checking for AS should go before checking for LIBTOOL

+dnl I hate this autotools magic

+AM_PROG_AS

 AM_DISABLE_STATIC

 AM_PROG_LIBTOOL

diff -urN xmms-1.2.7.orig/configure.in.orig xmms-1.2.7/configure.in.orig

--- xmms-1.2.7.orig/configure.in.orig	Fri Aug  9 16:07:22 2002

+++ xmms-1.2.7/configure.in.orig	Fri Aug  9 16:07:22 2002

@@ -465,17 +465,17 @@

 if test -n "$GCC"

 then

-  CFLAGS="$CFLAGS -Wall -Wpointer-arith -finline-functions -ffast-math"

+  CFLAGS="$CFLAGS"

   case "$CFLAGS" in

     -g*) ;;

     *\ -g*) ;;

-    *) CFLAGS="$CFLAGS -fomit-frame-pointer" ;;

+    *) CFLAGS="$CFLAGS" ;;

   esac

   case "$host" in

     *-*-freebsd*)

 	;;

     *)

-	CFLAGS="$CFLAGS -funroll-all-loops"

+	CFLAGS="$CFLAGS"

 	;;

   esac

 fi

@@ -533,7 +533,7 @@

 AC_SUBST(VISUALIZATION_PLUGIN_DIR)

 AC_SUBST(pluginsubs)

-XMMS_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/xmms\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\""

+XMMS_DEFINES="-DDATA_DIR=\\\"$datadir/xmms\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\""

 if test "x$enable_user_plugin_dir" = "xno"; then

 	AC_DEFINE(DISABLE_USER_PLUGIN_DIR,,═[Define to disable per user plugin directory])

diff -urN xmms-1.2.7.orig/xmms/Makefile.am xmms-1.2.7/xmms/Makefile.am

--- xmms-1.2.7.orig/xmms/Makefile.am	Thu Jun 14 19:30:33 2001

+++ xmms-1.2.7/xmms/Makefile.am	Fri Aug  9 16:07:52 2002

@@ -5,8 +5,8 @@

 bin_PROGRAMS = xmms

 xmms_LDFLAGS = -export-dynamic

-xmms_LDADD += @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \

-@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@

+xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \

+	@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@

 INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ -I$(top_builddir)/intl