Patch from Ricardo Setti: Add $(ESOUND_LIBS) to LDADD if esound is

2006-11-03  Jordi Mallach  <jordi@sindominio.net>

	* configure.in, src/Makefile.am: Patch from Ricardo Setti: Add
	$(ESOUND_LIBS) to LDADD if esound is detected. Fixes: #312995.

diff --git a/ChangeLog b/ChangeLog
index 7f6ee2cbb7dc20ab9f0ad67e9aee9f27f26bd56d..5f7974ad5ee3877d65803a8ba551d85ded00e156 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-03  Jordi Mallach  <jordi@sindominio.net>
+
+       * configure.in, src/Makefile.am: Patch from Ricardo Setti: Add
+       $(ESOUND_LIBS) to LDADD if esound is detected. Fixes: #312995.
+
 2006-11-03  Jordi Mallach  <jordi@sindominio.net>
 
        * src/config.c, src/dialogs.c, gtetrinet.schemas.in: Patch from

diff --git a/configure.in b/configure.in
index b31d47c45dc85b9bc001e4f6449d9b6a7e967a3b..02133688647057089a5accae6dff899d1938497c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,6 +30,7 @@ dnl *****************************************
 LIBGTK_REQUIRED=2.6.0
 LIBGNOME_REQUIRED=2.0.0
 LIBGNOMEUI_REQUIRED=2.0.0
+LIBESD_REQUIRED=0.2.36
 
 dnl *****************************************
 dnl libgnome, libgnomeui needed for all utils
@@ -39,7 +40,21 @@ PKG_CHECK_MODULES(GTET, gtk+-2.0 >= $LIBGTK_REQUIRED libgnome-2.0 >= $LIBGNOME_R
 AC_SUBST(GTET_CFLAGS)
 AC_SUBST(GTET_LIBS)
 
-AM_PATH_ESD(0.2.5, AC_DEFINE(HAVE_ESD, 1, [Define this to enable EsounD support.]))
+dnl Check for libesd
+if pkg-config --exists esound ; then
+       have_esound=yes
+else 
+       have_esound=no
+fi
+
+if test "x$have_esound" = "xyes"; then
+AC_DEFINE(HAVE_ESD, 1, [Define this to enable EsounD support.])
+PKG_CHECK_MODULES(ESOUND, esound >= $LIBESD_REQUIRED)
+AC_SUBST(ESOUND_CFLAGS)
+AC_SUBST(ESOUND_LIBS)
+fi
+
+AM_CONDITIONAL(HAVE_ESOUND, test "x$have_esound" = "xyes")
 
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT

diff --git a/src/Makefile.am b/src/Makefile.am
index 7623bd9651285d30be2944a28ff502226e30e2e7..e114978d4311c6e639304f07be7c656f09c22b89 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,13 @@ INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
           -DPIXMAPSDIR=\""$(datadir)/pixmaps"\" \
           -DGTETPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" \
           $(GTET_CFLAGS)
+
+if HAVE_ESOUND
+LDADD = $(GTET_LIBS) $(ESOUND_LIBS)
+else
 LDADD = $(GTET_LIBS)
+endif
+
 AM_CPPFLAGS = -DGTETRINET_DATA=\"$(pkgdatadir)\"
 
 gamesdir = $(prefix)/games