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