From 15c0f6ec87f63a4a541ed746ab2eff6c4a7e9c26 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lureau Date: Sat, 6 Jan 2007 21:21:59 +0000 Subject: [PATCH] Fixes #392276 2007-01-06 Marc-Andre Lureau Fixes #392276 * configure.in: added support for disabling esound. svn path=/trunk/; revision=7066 --- ChangeLog | 6 ++++++ configure.in | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index c41262e89..8536cf1db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-06 Marc-Andre Lureau + + Fixes #392276 + + * configure.in: added support for disabling esound. + 2007-01-03 Christian Persch * configure.in: diff --git a/configure.in b/configure.in index b655e9961..a8645a626 100644 --- a/configure.in +++ b/configure.in @@ -381,15 +381,6 @@ DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services" AC_SUBST(DBUS_SERVICES_DIR) AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) -# esd -ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound` -if test x"$ESDSERVERDIR" = x; then - ESD_SERVER="esd" -else - ESD_SERVER="$ESDSERVERDIR/esd" -fi -AC_SUBST(ESD_SERVER) - AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) if test x"$GDK_PIXBUF_CSOURCE" = xno; then @@ -454,7 +445,7 @@ AC_ARG_ENABLE(alsa, [case "${enableval}" in yes) WANT_ALSA=yes ;; no) WANT_ALSA=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-alsa) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-alsa) ;; esac], [WANT_ALSA=yes]) dnl Default value @@ -470,6 +461,33 @@ AM_CONDITIONAL(HAVE_ALSA, test x"$have_alsa" = "xyes") AC_SUBST(ALSA_LIBS) AC_SUBST(ALSA_CFLAGS) +dnl ============================================== +dnl Esd section +dnl ============================================== +have_esd=no +AC_ARG_ENABLE(esd, + AC_HELP_STRING([--disable-esd], + [Turn off support for ESD]), + [case "${enableval}" in + yes) WANT_ESD=yes ;; + no) WANT_ESD=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-esd) ;; + esac], + [WANT_ESD=yes]) dnl Default value + +if test x$WANT_ESD = xyes ; then + PKG_CHECK_MODULES(ESD, esound >= 0.2.28, + have_esd=yes + AC_DEFINE(HAVE_ESD, 1, Have ESD Sound Server), + AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***)) +else + have_esd=no +fi + +AM_CONDITIONAL(HAVE_ESD, test x"$have_esd" = "xyes") +AC_SUBST(ESD_CFLAGS) +AC_SUBST(ESD_LIBS) + dnl ============================================== dnl GStreamer section dnl ==============================================