diff --git a/ChangeLog b/ChangeLog
index c7a1dc9a7..1e865c96e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-01  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Check for recent version of audiofile
+
 2002-07-31  Adam Fedor  <fedor@gnu.org>
 
 	* Headers/gnustep/gui/AppKit.h: Add NSSound.
diff --git a/configure b/configure
index 46abc53d6..6375ecbd6 100755
--- a/configure
+++ b/configure
@@ -3178,6 +3178,70 @@ ADDITIONAL_DEPENDS="$GRAPHIC_LIBS"
 #--------------------------------------------------------------------
 # NSSound
 #--------------------------------------------------------------------
+audio_ok=no
+BUILD_GSND=
+echo "$as_me:$LINENO: checking for afGetVirtualFrameSize in -laudiofile" >&5
+echo $ECHO_N "checking for afGetVirtualFrameSize in -laudiofile... $ECHO_C" >&6
+if test "${ac_cv_lib_audiofile_afGetVirtualFrameSize+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-laudiofile  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char afGetVirtualFrameSize ();
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+afGetVirtualFrameSize ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_audiofile_afGetVirtualFrameSize=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_audiofile_afGetVirtualFrameSize=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_audiofile_afGetVirtualFrameSize" >&5
+echo "${ECHO_T}$ac_cv_lib_audiofile_afGetVirtualFrameSize" >&6
+if test $ac_cv_lib_audiofile_afGetVirtualFrameSize = yes; then
+  audio_ok=yes
+else
+  audio_ok=no
+fi
+
+if test $audio_ok = yes; then
 
 for ac_header in audiofile.h
 do
@@ -3292,64 +3356,6 @@ fi
 
 done
 
-audio_ok=no
-BUILD_GSND=
-echo "$as_me:$LINENO: checking for main in -laudiofile" >&5
-echo $ECHO_N "checking for main in -laudiofile... $ECHO_C" >&6
-if test "${ac_cv_lib_audiofile_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-laudiofile  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_audiofile_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_audiofile_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_audiofile_main" >&5
-echo "${ECHO_T}$ac_cv_lib_audiofile_main" >&6
-if test $ac_cv_lib_audiofile_main = yes; then
-  audio_ok=yes
-else
-  audio_ok=no
-fi
-
-if test $audio_ok = yes; then
   ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
   BUILD_GSND=gsnd
 fi
diff --git a/configure.ac b/configure.ac
index 6e8dc38f0..70ed61031 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,11 +212,11 @@ ADDITIONAL_DEPENDS="$GRAPHIC_LIBS"
 #--------------------------------------------------------------------
 # NSSound
 #--------------------------------------------------------------------
-AC_CHECK_HEADERS(audiofile.h)
 audio_ok=no
 BUILD_GSND=
-AC_CHECK_LIB(audiofile, main, audio_ok=yes, audio_ok=no)
+AC_CHECK_LIB(audiofile, afGetVirtualFrameSize, audio_ok=yes, audio_ok=no)
 if test $audio_ok = yes; then
+  AC_CHECK_HEADERS(audiofile.h)
   ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
   BUILD_GSND=gsnd
 fi