diff -ur TiMidity++-2.13.2.orig/autoconf/arts.m4 TiMidity++-2.13.2/autoconf/arts.m4
--- TiMidity++-2.13.2.orig/autoconf/arts.m4	2002-10-05 06:16:37.000000000 +0300
+++ TiMidity++-2.13.2/autoconf/arts.m4	2009-07-24 11:35:57.000000000 +0300
@@ -9,7 +9,7 @@
 dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for aRts, and define ARTS_CFLAGS and ARTS_LIBS
 dnl
-AC_DEFUN(AM_PATH_ARTS,
+AC_DEFUN([AM_PATH_ARTS],
 	[dnl 
 dnl Get the cflags and libraries from the arts-config script
 dnl
@@ -156,4 +156,4 @@
   AC_SUBST(ARTS_LIBS)
   rm -f conf.artstest
 ])
-dnl End of aRts
\ No newline at end of file
+dnl End of aRts
diff -ur TiMidity++-2.13.2.orig/autoconf/vorbis.m4 TiMidity++-2.13.2/autoconf/vorbis.m4
--- TiMidity++-2.13.2.orig/autoconf/vorbis.m4	2002-07-06 17:38:06.000000000 +0300
+++ TiMidity++-2.13.2/autoconf/vorbis.m4	2009-07-24 11:32:13.000000000 +0300
@@ -5,7 +5,7 @@
 dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
 dnl
-AC_DEFUN(AM_PATH_VORBIS,
+AC_DEFUN([AM_PATH_VORBIS],
 [dnl 
 dnl Get the cflags and libraries
 dnl
diff -ur TiMidity++-2.13.2.orig/configure.in TiMidity++-2.13.2/configure.in
--- TiMidity++-2.13.2.orig/configure.in	2004-10-03 15:39:52.000000000 +0300
+++ TiMidity++-2.13.2/configure.in	2009-07-24 12:26:04.000000000 +0300
@@ -1925,10 +1925,10 @@
 
 AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes")
 
-SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
-SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
-SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
-SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
+LDFLAGS="$LDFLAGS"
+SHLDFLAGS="$SHLDFLAGS"
+CFLAGS="$EXTRACFLAGS $CFLAGS"
+CPPFLAGS="$CPPFLAGS $EXTRADEFS"
 
 if test "x$oss_device" != x; then
   AC_DEFINE_UNQUOTED(OSS_DEVICE,"$oss_device", oss device name)