diff options
| author | A. Walton <awalton@gnome.org> | 2008-04-30 05:12:50 +0000 |
|---|---|---|
| committer | Andrew Walton <awalton@src.gnome.org> | 2008-04-30 05:12:50 +0000 |
| commit | 7ad0ff2a263a8f1a4c7c0272213df9f8b8f03702 (patch) | |
| tree | eadf9e2d94080495f507ecf6b5cdb82d70e59295 | |
| parent | 7311ed4dd8a7410bda4b16186e723c0d94db006c (diff) | |
| download | nautilus-7ad0ff2a263a8f1a4c7c0272213df9f8b8f03702.tar.gz | |
Remove false dependency for ESound. Closes bug #311445.
2008-04-30 A. Walton <awalton@gnome.org>
* configure.in:
* src/file-manager/fm-icon-view.c:
Remove false dependency for ESound. Closes bug #311445.
svn path=/branches/gnome-2-22/; revision=14116
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | src/file-manager/fm-icon-view.c | 1 |
3 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2008-04-30 A. Walton <awalton@gnome.org> + + * configure.in: + * src/file-manager/fm-icon-view.c: + Remove false dependency for ESound. Closes bug #311445. + 2008-04-29 David Zeuthen <davidz@redhat.com> * libnautilus-private/nautilus-autorun.c: diff --git a/configure.in b/configure.in index 8b6697e28..3ea48c21c 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,6 @@ dnl =========================================================================== m4_define(bonobo_activation_minver, 2.1.0) m4_define(bonobo_minver, 2.1.0) m4_define(eel_minver, 2.21.90) -m4_define(esound_minver, 0.2.27) m4_define(glib_minver, 2.15.6) m4_define(gnome_desktop_minver, 2.9.91) m4_define(gnome_minver, 2.14.0) @@ -43,7 +42,6 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"]) AC_SUBST(BONOBO_ACTIVATION_REQUIRED, [bonobo_activation_minver]) AC_SUBST(BONOBO_REQUIRED, [bonobo_minver]) AC_SUBST(EEL_REQUIRED, [eel_minver]) -AC_SUBST(ESOUND_REQUIRED, [esound_minver]) AC_SUBST(GLIB_REQUIRED, [glib_minver]) AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver]) AC_SUBST(GNOME_REQUIRED, [gnome_minver]) @@ -87,7 +85,6 @@ fi AC_SUBST(STARTUP_NOTIFICATION_PACKAGE) PKG_CHECK_MODULES(ALL, [ - esound >= esound_minver bonobo-activation-2.0 >= bonobo_activation_minver eel-2.0 >= eel_minver glib-2.0 >= glib_minver @@ -407,7 +404,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`" AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS) dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires") -CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gio-2.0 gio-unix-2.0 $EXTRA_CORE_MODULES" +CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 gnome-desktop-2.0 gio-2.0 gio-unix-2.0 $EXTRA_CORE_MODULES" CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS" AC_SUBST(CORE_CFLAGS) CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index 91f575fcb..12b7cb73c 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -68,7 +68,6 @@ #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> -#include <esd.h> #include "nautilus-audio-mime-types.h" |