diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2008-10-09 00:49:42 +0200 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-10-09 00:49:42 +0200 |
| commit | 38fd36a1c05121e1c23be7c4df0279aabb52c836 (patch) | |
| tree | 8cca5dd49a3d957d3a2ca4542f52802c339d8d57 /gnome-base/gnome-settings-daemon/files | |
| parent | gnome-base/gnome-settings-daemon: (diff) | |
| download | gnome-38fd36a1c05121e1c23be7c4df0279aabb52c836.tar.gz gnome-38fd36a1c05121e1c23be7c4df0279aabb52c836.tar.bz2 gnome-38fd36a1c05121e1c23be7c4df0279aabb52c836.zip | |
gnome-base/gnome-settings-daemon: forgot the patch
gnome-extra/bug-buddy: fixed deps
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
| -rw-r--r-- | gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch new file mode 100644 index 00000000..e7645161 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch @@ -0,0 +1,44 @@ +--- configure.ac 2008-10-09 00:03:09.000000000 +0200 ++++ configure.ac.new 2008-10-09 00:03:46.000000000 +0200 +@@ -87,9 +87,16 @@ + dnl - Check for libnotify + dnl --------------------------------------------------------------------------- + +-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION, +- [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available]) +- have_libnotify=yes], [have_libnotify=no]) ++have_libnotify=no ++AC_ARG_ENABLE(libnotify, ++ AS_HELP_STRING([--disable-libnotify], [Enable nice notifications]), ++ , enable_libnotify=yes) ++ ++if test "x$enable_libnotify" = "xyes"; then ++ have_libnotify=yes ++ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION) ++ AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available]) ++fi + AC_SUBST(LIBNOTIFY_CFLAGS) + AC_SUBST(LIBNOTIFY_LIBS) + +@@ -339,9 +346,18 @@ + # --------------------------------------------------------------------------- + # Enable Legacy Sound Preference + # --------------------------------------------------------------------------- +-PKG_CHECK_MODULES(PULSEAUDIO, libpulse, have_pulseaudio=yes, have_pulseaudio=no) +-if test x$have_pulseaudio = xyes; then +- default_enable_legacy_sound_pref=no ++ ++AC_ARG_ENABLE(libpulse, ++ AS_HELP_STRING([--enable-libpulse], [Prefer pulseaudio over ESD])) ++ ++if test x$enable_pulse = yes; then ++ PKG_CHECK_MODULES(PULSEAUDIO, libpulse, have_pulseaudio=yes, have_pulseaudio=no) ++ ++ if test x$have_pulseaudio = xyes; then ++ default_enable_legacy_sound_pref=no ++ else ++ AC_MSG_ERROR([Pulseaudio support required but libpulse not found]) ++ fi + else + default_enable_legacy_sound_pref=yes + fi |