diff -NurdB gnome-session-2.10.0/configure.in gnome-session-2.10.0-patched/configure.in --- gnome-session-2.10.0/configure.in 2005-03-07 06:35:25.000000000 -0500 +++ gnome-session-2.10.0-patched/configure.in 2005-07-19 07:56:41.000000000 -0500 @@ -47,15 +47,40 @@ dnl pkg-config dependency checks +PKG_PROG_PKG_CONFIG() + dnl We first check for esound and audiofile (which has conditional dnl support built in) -ESOUND_MODULE="esound >= $ESOUND_REQUIRED" -PKG_CHECK_MODULES(SOUND_TEST, $ESOUND_MODULE, [ +AC_MSG_CHECKING([whether ESounD support is requested]) +AC_ARG_ENABLE([esd], + AS_HELP_STRING([--enable-esd],[Enable ESounD (default=yes)]), + [enable_esd=$enableval], + [enable_esd=yes]) +AC_MSG_RESULT([$enable_esd]) + +if test x$enable_esd = xyes; then + ESOUND_MODULE="esound >= $ESOUND_REQUIRED" + PKG_CHECK_MODULES(SOUND_TEST, $ESOUND_MODULE) AC_DEFINE(HAVE_ESD, 1, [Define if you have the ESound Daemon]) -],[ + + ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound` + old_path=$PATH + if test x"$ESDSERVERDIR" != x; then + PATH=$ESDSERVERDIR:$PATH + fi + + AC_PATH_PROG(ESD_SERVER, esd, no) + if test x"$ESD_SERVER" = xno; then + AC_MSG_ERROR([esd executable not found in your path - should be installed with ESound]) + fi + + AC_SUBST(ESD_SERVER) + PATH=$old_path + +else ESOUND_MODULE="" -]) +fi PKG_CHECK_MODULES(GNOME_SESSION, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $ESOUND_MODULE) @@ -92,21 +117,6 @@ AC_SUBST(GNOME_KEYRING_DAEMON) -# esd -ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound` -old_path=$PATH -if test x"$ESDSERVERDIR" != x; then - PATH=$ESDSERVERDIR:$PATH -fi - -AC_PATH_PROG(ESD_SERVER, esd, no) -if test x"$ESD_SERVER" = xno; then - AC_MSG_ERROR([esd executable not found in your path - should be installed with ESound]) -fi - -AC_SUBST(ESD_SERVER) -PATH=$old_path - dnl X development libraries check #