diff --git a/stepmania/autoconf/m4/alsa.m4 b/stepmania/autoconf/m4/alsa.m4
index 050ab6cbd3..cb12fd99a2 100644
--- a/stepmania/autoconf/m4/alsa.m4
+++ b/stepmania/autoconf/m4/alsa.m4
@@ -8,7 +8,7 @@ dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
 dnl enables arguments --with-alsa-prefix=
 dnl                   --with-alsa-enc-prefix=
 dnl
-AC_DEFUN(AM_PATH_ALSA,
+AC_DEFUN([AM_PATH_ALSA],
 [dnl Save the original CFLAGS, LDFLAGS, and LIBS
 alsa_save_CFLAGS="$CFLAGS"
 alsa_save_LDFLAGS="$LDFLAGS"
diff --git a/stepmania/autoconf/m4/audio.m4 b/stepmania/autoconf/m4/audio.m4
index 14aaebed47..00ee4b1ebf 100644
--- a/stepmania/autoconf/m4/audio.m4
+++ b/stepmania/autoconf/m4/audio.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(SM_AUDIO, [
+AC_DEFUN([SM_AUDIO], [
 
 AC_ARG_WITH(vorbis, AC_HELP_STRING([--without-vorbis], [Disable Vorbis support]), with_vorbis=$enableval, with_vorbis=yes)
 
diff --git a/stepmania/autoconf/m4/backtrace.m4 b/stepmania/autoconf/m4/backtrace.m4
index 190231b561..582aba886b 100644
--- a/stepmania/autoconf/m4/backtrace.m4
+++ b/stepmania/autoconf/m4/backtrace.m4
@@ -1,5 +1,5 @@
 # See if we have a working backtrace_symbols.
-AC_DEFUN(SM_FUNC_BACKTRACE_SYMBOLS,
+AC_DEFUN([SM_FUNC_BACKTRACE_SYMBOLS],
 [
     AC_MSG_CHECKING(for working backtrace_symbols())
     AC_TRY_RUN(
@@ -15,7 +15,7 @@ AC_DEFUN(SM_FUNC_BACKTRACE_SYMBOLS,
     AC_MSG_RESULT($have_backtrace_symbols)
 ])
 
-AC_DEFUN(SM_FUNC_CXA_DEMANGLE,
+AC_DEFUN([SM_FUNC_CXA_DEMANGLE],
 [
     # Check for abi::__cxa_demangle (gcc 3.1+)
     AC_MSG_CHECKING(for working cxa_demangle)
@@ -45,7 +45,7 @@ AC_DEFUN(SM_FUNC_CXA_DEMANGLE,
 	
 # To support backtraces in the crash handler, we need two things: a call to
 # get backtrace pointers, and a way to convert them to symbols.
-AC_DEFUN(SM_CHECK_CRASH_HANDLER,
+AC_DEFUN([SM_CHECK_CRASH_HANDLER],
 [
     # See if we have a custom backtrace():
     case $host in
diff --git a/stepmania/autoconf/m4/gtk-2.0.m4 b/stepmania/autoconf/m4/gtk-2.0.m4
index a0c53ac11f..36a1f9f760 100644
--- a/stepmania/autoconf/m4/gtk-2.0.m4
+++ b/stepmania/autoconf/m4/gtk-2.0.m4
@@ -5,7 +5,7 @@ dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [,
 dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
 dnl pass to pkg-config
 dnl
-AC_DEFUN(AM_PATH_GTK_2_0,
+AC_DEFUN([AM_PATH_GTK_2_0],
 [dnl 
 dnl Get the cflags and libraries from pkg-config
 dnl
diff --git a/stepmania/autoconf/m4/lua.m4 b/stepmania/autoconf/m4/lua.m4
index 4da0def9d9..95c659e9d5 100644
--- a/stepmania/autoconf/m4/lua.m4
+++ b/stepmania/autoconf/m4/lua.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(SM_LUA, [
+AC_DEFUN([SM_LUA], [
 
 AC_CHECK_PROGS(LUA_CONFIG, [lua-config50 lua-config], "")
 if test "$LUA_CONFIG" != ""; then
diff --git a/stepmania/autoconf/m4/opengl.m4 b/stepmania/autoconf/m4/opengl.m4
index 3fb64a5d3f..aebae267ba 100644
--- a/stepmania/autoconf/m4/opengl.m4
+++ b/stepmania/autoconf/m4/opengl.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(SM_X_WITH_OPENGL,
+AC_DEFUN([SM_X_WITH_OPENGL],
 [
     AC_PATH_X
     
diff --git a/stepmania/autoconf/m4/sdl.m4 b/stepmania/autoconf/m4/sdl.m4
index 4cba2c48a6..ada3a4165b 100644
--- a/stepmania/autoconf/m4/sdl.m4
+++ b/stepmania/autoconf/m4/sdl.m4
@@ -8,7 +8,7 @@
 dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
 dnl
-AC_DEFUN(AM_PATH_SDL,
+AC_DEFUN([AM_PATH_SDL],
 [dnl 
 dnl Get the cflags and libraries from the sdl-config script
 dnl
diff --git a/stepmania/autoconf/m4/tls.m4 b/stepmania/autoconf/m4/tls.m4
index cddc769674..7f6da091c8 100644
--- a/stepmania/autoconf/m4/tls.m4
+++ b/stepmania/autoconf/m4/tls.m4
@@ -2,7 +2,7 @@
 # the resulting program actually runs, not whether the resulting TLS variables
 # work properly; that check is done at runtime, since we can run binaries
 # compiled with __thread on systems without TLS.
-AC_DEFUN(SM_TLS,
+AC_DEFUN([SM_TLS],
 [
     AC_MSG_CHECKING(for TLS)
     AC_TRY_RUN( [ static __thread int val; int main() { return 0; } ], have_tls=yes,have_tls=no,have_tls=no )
diff --git a/stepmania/autoconf/m4/zlib.m4 b/stepmania/autoconf/m4/zlib.m4
index 0be0f65916..e076e701ac 100644
--- a/stepmania/autoconf/m4/zlib.m4
+++ b/stepmania/autoconf/m4/zlib.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(SM_ZLIB,
+AC_DEFUN([SM_ZLIB],
 [
 	AC_CHECK_LIB(z, inflate, have_libz=yes, have_libz=no)
 	AC_CHECK_HEADER(zlib.h, have_libz_header=yes, have_libz_header=no)