diff -Npaur libgnome-2.8.0/configure libgnome-2.8.0-esdcheck/configure
--- libgnome-2.8.0/configure	2004-09-12 19:46:16.000000000 +0200
+++ libgnome-2.8.0-esdcheck/configure	2004-12-13 13:30:58.478709840 +0100
@@ -1054,6 +1054,8 @@ Optional Packages:
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
+  --without-esound        Disable support for ESD
+  --without-audiofile     Disable support for AudioFile
   --with-html-dir=PATH    path to installed docs
   --with-gconf-source=sourceaddress      Config database for installing schema files.
   --with-gconf-schema-file-dir=dir        Directory for installing schema files.
@@ -5128,7 +5130,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5131 "configure"' > conftest.$ac_ext
+  echo '#line 5133 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6534,7 +6536,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:6537:" \
+echo "$as_me:6539:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7584,11 +7586,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7587: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7589: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7591: \$? = $ac_status" >&5
+   echo "$as_me:7593: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7827,11 +7829,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7830: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7832: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7834: \$? = $ac_status" >&5
+   echo "$as_me:7836: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7887,11 +7889,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7890: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7892: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7894: \$? = $ac_status" >&5
+   echo "$as_me:7896: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9222,7 +9224,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 9225 "configure"' > conftest.$ac_ext
+    echo '#line 9227 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10093,7 +10095,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10096 "configure"
+#line 10098 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10191,7 +10193,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10194 "configure"
+#line 10196 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12380,11 +12382,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12383: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12385: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12387: \$? = $ac_status" >&5
+   echo "$as_me:12389: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12440,11 +12442,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12443: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12445: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12447: \$? = $ac_status" >&5
+   echo "$as_me:12449: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12951,7 +12953,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 12954 "configure"' > conftest.$ac_ext
+    echo '#line 12956 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -13822,7 +13824,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13825 "configure"
+#line 13827 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13920,7 +13922,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13923 "configure"
+#line 13925 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14757,11 +14759,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14760: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14762: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14764: \$? = $ac_status" >&5
+   echo "$as_me:14766: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14817,11 +14819,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14820: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14822: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14824: \$? = $ac_status" >&5
+   echo "$as_me:14826: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16132,7 +16134,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 16135 "configure"' > conftest.$ac_ext
+    echo '#line 16137 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -16873,11 +16875,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16876: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16878: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16880: \$? = $ac_status" >&5
+   echo "$as_me:16882: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17116,11 +17118,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17119: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17121: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17123: \$? = $ac_status" >&5
+   echo "$as_me:17125: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17176,11 +17178,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17179: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17181: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17183: \$? = $ac_status" >&5
+   echo "$as_me:17185: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18511,7 +18513,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 18514 "configure"' > conftest.$ac_ext
+    echo '#line 18516 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -19382,7 +19384,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19385 "configure"
+#line 19387 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19480,7 +19482,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19483 "configure"
+#line 19485 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -22711,7 +22713,15 @@ fi
 
 
 
-SOUND_MODULES="esound >= 0.2.26  audiofile >= 0.2.3"
+
+# Check whether --with-esound or --without-esound was given.
+if test "${with_esound+set}" = set; then
+  withval="$with_esound"
+
+fi;
+
+if test "$with_esound" != "no"; then
+	SOUND_MODULES="$SOUND_MODULES 		"
 
   succeeded=no
 
@@ -22766,23 +22776,23 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for $SOUND_MODULES" >&5
-echo $ECHO_N "checking for $SOUND_MODULES... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for esound >= 0.2.26" >&5
+echo $ECHO_N "checking for esound >= 0.2.26... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "$SOUND_MODULES" ; then
+        if $PKG_CONFIG --exists "esound >= 0.2.26" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
             echo "$as_me:$LINENO: checking SOUND_TEST_CFLAGS" >&5
 echo $ECHO_N "checking SOUND_TEST_CFLAGS... $ECHO_C" >&6
-            SOUND_TEST_CFLAGS=`$PKG_CONFIG --cflags "$SOUND_MODULES"`
+            SOUND_TEST_CFLAGS=`$PKG_CONFIG --cflags "esound >= 0.2.26"`
             echo "$as_me:$LINENO: result: $SOUND_TEST_CFLAGS" >&5
 echo "${ECHO_T}$SOUND_TEST_CFLAGS" >&6
 
             echo "$as_me:$LINENO: checking SOUND_TEST_LIBS" >&5
 echo $ECHO_N "checking SOUND_TEST_LIBS... $ECHO_C" >&6
-            SOUND_TEST_LIBS=`$PKG_CONFIG --libs "$SOUND_MODULES"`
+            SOUND_TEST_LIBS=`$PKG_CONFIG --libs "esound >= 0.2.26"`
             echo "$as_me:$LINENO: result: $SOUND_TEST_LIBS" >&5
 echo "${ECHO_T}$SOUND_TEST_LIBS" >&6
         else
@@ -22790,8 +22800,8 @@ echo "${ECHO_T}$SOUND_TEST_LIBS" >&6
             SOUND_TEST_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            SOUND_TEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SOUND_MODULES"`
-
+            SOUND_TEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "esound >= 0.2.26"`
+            echo $SOUND_TEST_PKG_ERRORS
         fi
 
 
@@ -22806,21 +22816,134 @@ echo "${ECHO_T}$SOUND_TEST_LIBS" >&6
 
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBAUDIOFILE
+#define HAVE_ESD
 _ACEOF
 
+		SOUND_MODULES="$SOUND_MODULES 			esound >= 0.2.26"
+
+  else
+     { { echo "$as_me:$LINENO: error: Library requirements (esound >= 0.2.26) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (esound >= 0.2.26) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+fi
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ESD
-_ACEOF
 
+# Check whether --with-audiofile or --without-audiofile was given.
+if test "${with_audiofile+set}" = set; then
+  withval="$with_audiofile"
+
+fi;
+
+if test "$with_audiofile" != "no"; then
+	SOUND_MODULES="$SOUND_MODULES 		"
+
+  succeeded=no
 
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
   else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for audiofile >= 0.2.3" >&5
+echo $ECHO_N "checking for audiofile >= 0.2.3... $ECHO_C" >&6
+
+        if $PKG_CONFIG --exists "audiofile >= 0.2.3" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+
+            echo "$as_me:$LINENO: checking SOUND_TEST_CFLAGS" >&5
+echo $ECHO_N "checking SOUND_TEST_CFLAGS... $ECHO_C" >&6
+            SOUND_TEST_CFLAGS=`$PKG_CONFIG --cflags "audiofile >= 0.2.3"`
+            echo "$as_me:$LINENO: result: $SOUND_TEST_CFLAGS" >&5
+echo "${ECHO_T}$SOUND_TEST_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking SOUND_TEST_LIBS" >&5
+echo $ECHO_N "checking SOUND_TEST_LIBS... $ECHO_C" >&6
+            SOUND_TEST_LIBS=`$PKG_CONFIG --libs "audiofile >= 0.2.3"`
+            echo "$as_me:$LINENO: result: $SOUND_TEST_LIBS" >&5
+echo "${ECHO_T}$SOUND_TEST_LIBS" >&6
+        else
+            SOUND_TEST_CFLAGS=""
+            SOUND_TEST_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            SOUND_TEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "audiofile >= 0.2.3"`
+            echo $SOUND_TEST_PKG_ERRORS
+        fi
 
-  SOUND_MODULES=""
 
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
   fi
 
+  if test $succeeded = yes; then
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBAUDIOFILE
+_ACEOF
+
+		SOUND_MODULES="$SOUND_MODULES 			audiofile >= 0.2.3"
+
+  else
+     { { echo "$as_me:$LINENO: error: Library requirements (audiofile >= 0.2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (audiofile >= 0.2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+fi
 
 
   succeeded=no
diff -Npaur libgnome-2.8.0/configure.in libgnome-2.8.0-esdcheck/configure.in
--- libgnome-2.8.0/configure.in	2004-09-12 19:31:58.000000000 +0200
+++ libgnome-2.8.0-esdcheck/configure.in	2004-12-13 13:28:01.404629192 +0100
@@ -112,15 +112,35 @@ dnl We first check for esound and audiof
 dnl support built in)
 dnl
 
-SOUND_MODULES="esound >= esound_required_version dnl
- audiofile >= audiofile_required_version"
-PKG_CHECK_MODULES(SOUND_TEST, [$SOUND_MODULES],
-[
-  AC_DEFINE(HAVE_LIBAUDIOFILE,, [Compile with audiofile support])
-  AC_DEFINE(HAVE_ESD,, [Compile with esd support])
-],[
-  SOUND_MODULES=""
-])
+AC_ARG_WITH(esound,
+	AC_HELP_STRING([--without-esound],
+		[Disable support for ESD]) )
+
+if test "$with_esound" != "no"; then
+	SOUND_MODULES="$SOUND_MODULES dnl
+		"
+	PKG_CHECK_MODULES(SOUND_TEST, [esound >= esound_required_version],
+	[
+		AC_DEFINE(HAVE_ESD,, [Compile with esd support])
+		SOUND_MODULES="$SOUND_MODULES dnl
+			esound >= esound_required_version"
+	])
+fi
+
+AC_ARG_WITH(audiofile,
+	AC_HELP_STRING([--without-audiofile],
+		[Disable support for AudioFile]) )
+
+if test "$with_audiofile" != "no"; then
+	SOUND_MODULES="$SOUND_MODULES dnl
+		"
+	PKG_CHECK_MODULES(SOUND_TEST, [audiofile >= audiofile_required_version],
+	[
+		AC_DEFINE(HAVE_LIBAUDIOFILE,, [Compile with audiofile support])
+		SOUND_MODULES="$SOUND_MODULES dnl
+			audiofile >= audiofile_required_version"
+	])
+fi
 
 PKG_CHECK_MODULES(LIBGNOME, dnl
  [glib-2.0 >= glib_required_version dnl