Re: [GnomeMeeting-devel-list] [patch] remove hard dependency on esound

[Benoit Boissinot <bboissin gmail com>]

On Wed, 23 Feb 2005 14:44:21 +0100, Damien Sandras <dsandras seconix com> wrote:
> Hi Benoît,
> 
> I'll apply this patch to GM CVS (OPAL branch).
> 

Sorry, there was a typo in the patch... (ifndef HAS_ESD instead of
ifdef HAS_ESD)

Updated patch attached. (compiles and runs fines)

Thanks,

Benoit

diff -Naurp gnomemeeting-1.2.0.orig/configure.in gnomemeeting-1.2.0/configure.in
--- gnomemeeting-1.2.0.orig/configure.in	2004-12-05 16:04:12.000000000 +0100
+++ gnomemeeting-1.2.0/configure.in	2005-02-23 13:27:28.000000000 +0100
@@ -76,10 +76,10 @@ dnl ####################################
 dnl PKG_CONFIG and required versions
 dnl ###########################################################################
 if test x"${disable_gnome}" = xyes; then
-PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 esound >= 0.2.28 libxml-2.0 >= 2.5.0)
+PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 libxml-2.0 >= 2.5.0)
 GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS -DDISABLE_GNOME"
 else
-PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 esound >= 0.2.28 gconf-2.0 >= 2.2.0 libxml-2.0 >= 2.6.0 libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0 libebook-1.0 >= 0.0.94)
+PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 gconf-2.0 >= 2.2.0 libxml-2.0 >= 2.6.0 libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0 libebook-1.0 >= 0.0.94)
 fi
 
 PWLIB_REC_VERSION="1.8.3"
@@ -307,6 +307,43 @@ else
         HAS_IXJ="enabled";
 fi
 
+dnl ###########################################################################
+dnl   Check for Esound and disable-esd
+dnl ###########################################################################
+
+AC_ARG_ENABLE(esd,
+        [  --disable-esd        Remove Esound support.],
+        disable_esd=yes, disable_esd=no)
+
+AC_MSG_CHECKING(whether Esound support must be compiled in)
+if test x"${disable_esd}" = xyes ; then
+   AC_MSG_RESULT([no])
+   HAS_ESD="disabled"
+else
+   AC_MSG_RESULT([yes])
+fi
+
+if test x"${disable_esd}" = xno ; then
+dnl Esound does not work on Win32 yet, so disable it
+if test ${gm_platform} = "win32" ; then
+	HAS_ESD="disabled"
+        AC_MSG_WARN([*** Esound cannot be used on Win32.])
+else
+	ESD_VERSION=0.2.28
+	ESD_HAS_ESD=
+	PKG_CHECK_MODULES(ESD, esound >= $ESD_VERSION,
+	            ESD_HAS_ESD="-DHAS_ESD",
+		    AC_MSG_WARN([*** Esound version >= $ESD_VERSION not found!.]))
+	ESD_CFLAGS="$ESD_CFLAGS $ESD_HAS_ESD" 
+
+	if test "x${ESD_HAS_ESD}" = "x-DHAS_ESD" ; then
+		HAS_ESD="enabled"
+	else  
+		HAS_ESD="disabled"
+	fi
+fi
+fi
+
 
 dnl ###########################################################################
 dnl   Check for SDL and disable-sdl
@@ -461,8 +498,8 @@ dnl  The various CFLAGS are merged into 
 dnl  GNOMEMEETING_LIB_CFLAGS
 dnl ###########################################################################
 GNOMEMEETING_LIB_CFLAGS="$GNOMEMEETING_CFLAGS"
-GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $PWLIB_CFLAGS $LDAP_INCLUDES $OPENH323_CFLAGS $SDL_CFLAGS $LDAP_CFLAGS $ARCH_OPENH323_CFLAGS"
-GNOMEMEETING_LIBS="$GNOMEMEETING_LIBS $PWLIB_LIBS $OPENH323_LIBS $LDAP_LIBS $SDL_LDFLAGS $ARCH_OPENH323_LIBS"
+GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $PWLIB_CFLAGS $LDAP_INCLUDES $OPENH323_CFLAGS $SDL_CFLAGS $LDAP_CFLAGS $ARCH_OPENH323_CFLAGS $ESD_CFLAGS"
+GNOMEMEETING_LIBS="$GNOMEMEETING_LIBS $PWLIB_LIBS $OPENH323_LIBS $LDAP_LIBS $SDL_LDFLAGS $ARCH_OPENH323_LIBS $ESD_LIBS"
 CFLAGS=""
 
 
@@ -547,6 +584,7 @@ echo "                Quicknet support  
 echo "          SDL Fullscreen support  :  $HAS_SDL"
 echo "                    DBUS support  :  $DBUS"
 echo "                Zeroconf support  :  $HOWL"
+echo "                  Esound support  :  $HAS_ESD"
 echo ""
 echo "                         OS Type  :  $target_os"
 echo "                    Machine Type  :  $target_cpu"
diff -Naurp gnomemeeting-1.2.0.orig/src/sound_handling.cpp gnomemeeting-1.2.0/src/sound_handling.cpp
--- gnomemeeting-1.2.0.orig/src/sound_handling.cpp	2004-11-20 15:37:56.000000000 +0100
+++ gnomemeeting-1.2.0/src/sound_handling.cpp	2005-02-23 13:26:51.000000000 +0100
@@ -90,7 +90,7 @@ static void dialog_response_cb (GtkWidge
 void 
 gnomemeeting_sound_daemons_suspend (void)
 {
-#ifndef WIN32
+#ifdef HAS_ESD
   int esd_client = 0;
   
   /* Put ESD into standby mode */
@@ -108,7 +108,7 @@ gnomemeeting_sound_daemons_suspend (void
 void 
 gnomemeeting_sound_daemons_resume (void)
 {
-#ifndef WIN32
+#ifdef HAS_ESD
   int esd_client = 0;
 
   /* Put ESD into normal mode */
diff -Naurp gnomemeeting-1.2.0.orig/src/sound_handling.h gnomemeeting-1.2.0/src/sound_handling.h
--- gnomemeeting-1.2.0.orig/src/sound_handling.h	2004-09-10 11:44:23.000000000 +0200
+++ gnomemeeting-1.2.0/src/sound_handling.h	2005-02-23 13:26:51.000000000 +0100
@@ -42,7 +42,7 @@
 #include "common.h"
 #include "endpoint.h"
 
-#ifndef WIN32
+#ifdef HAS_ESD
 #include <esd.h>
 #endif