applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #392276

Browse source 
2007-01-06  Marc-Andre Lureau  <marcandre.lureau@gmail.com>

	Fixes #392276

	* configure.in: added support for disabling esound.

svn path=/trunk/; revision=7066
This commit is contained in:
Marc-Andre Lureau 2007-01-06 21:21:59 +00:00 • committed by Rodrigo Moya
parent 5beb200f1c
commit 15c0f6ec87
2 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-01-06 Marc-Andre Lureau <marcandre.lureau@gmail.com>
Fixes #392276
* configure.in: added support for disabling esound.
2007-01-03 Christian Persch <chpe@svn.gnome.org> 2007-01-03 Christian Persch <chpe@svn.gnome.org>
* configure.in: * configure.in:

38
configure.in
View file

@ -381,15 +381,6 @@ DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services"
AC_SUBST(DBUS_SERVICES_DIR) AC_SUBST(DBUS_SERVICES_DIR)
AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) 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) AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
if test x"$GDK_PIXBUF_CSOURCE" = xno; then if test x"$GDK_PIXBUF_CSOURCE" = xno; then
@ -454,7 +445,7 @@ AC_ARG_ENABLE(alsa,
[case "${enableval}" in [case "${enableval}" in
yes) WANT_ALSA=yes ;; yes) WANT_ALSA=yes ;;
no) WANT_ALSA=no ;; no) WANT_ALSA=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-alsa) ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-alsa) ;;
esac], esac],
[WANT_ALSA=yes]) dnl Default value [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_LIBS)
AC_SUBST(ALSA_CFLAGS) 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 ==============================================
dnl GStreamer section dnl GStreamer section
dnl ============================================== dnl ==============================================