Updated. Removed music-view-related stuff, updated to 2.1.2.

2002-10-31  Dave Camp  <dave@ximian.com>

	* NEWS: Updated.
	* configure.in: Removed music-view-related stuff, updated to
	2.1.2.

ChangeLog

@@ -1,3 +1,9 @@
+2002-10-31  Dave Camp  <dave@ximian.com>
+
+	* NEWS: Updated.
+	* configure.in: Removed music-view-related stuff, updated to
+	2.1.2.
+
 2002-10-31  Dave Camp  <dave@ximian.com>
 
 	* components/Makefile.am (SUBDIRS): Removed the music view.

NEWS

@@ -1,4 +1,20 @@
-This is nautilus 2.1.1. The file manager for the Gnome 2 desktop.
+This is nautilus 2.1.2. The file manager for the Gnome 2 desktop.
+
+Major changes since 2.1.1 are:
+
+* New preferences dialog and capplet.
+
+* Pluggable file property pages.
+
+* New Image properties page.
+
+* Emblem sidebar work.
+
+* Handle rootwindow drops.
+
+* Background drag and drop changes
+
+* The music view has been removed.
 
 Major changes since 2.1.0 are:
 

configure.in

@@ -6,7 +6,7 @@ ART_REQUIRED=2.3.10
 BONOBO_ACTIVATION_REQUIRED=1.0.0
 BONOBO_REQUIRED=2.0.0
 BONOBO_UI_REQUIRED=2.0.0
-EEL_REQUIRED=2.1.1
+EEL_REQUIRED=2.1.2
 ESOUND_REQUIRED=0.2.27
 GLIB_REQUIRED=2
 GNOME_CANVAS_REQUIRED=2.0
@@ -28,7 +28,7 @@ AC_SUBST(XML_REQUIRED)
 
 dnl ===========================================================================
 
-AM_INIT_AUTOMAKE(nautilus, 2.1.1)
+AM_INIT_AUTOMAKE(nautilus, 2.1.2)
 AM_CONFIG_HEADER(config.h)
 
 AM_SANITY_CHECK
@@ -110,14 +110,6 @@ AC_CHECK_FUNCS(setenv unsetenv putenv)
 
 dnl ==========================================================================
 
-dnl x86 checks (used by audio routines in music component)
-
-_system_is_x86="no"
-AC_CHECK_HEADER( asm/vm86.h, _system_is_x86="yes" )
-AM_CONDITIONAL(X86_OPTIMIZED, test "x$_system_is_x86" = "xyes")
-
-dnl ==========================================================================
-
 dnl X
 
 x_libs="`$PKG_CONFIG --libs pangox`"
@@ -284,13 +276,6 @@ AC_SUBST(COMPONENT_CFLAGS)
 COMPONENT_LIBS="`$PKG_CONFIG --libs $COMPONENT_MODULES`"
 AC_SUBST(COMPONENT_LIBS)
 
-dnl music component
-MUSIC_COMPONENT_MODULES="$COMPONENT_MODULES esound"
-MUSIC_COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $MUSIC_COMPONENT_MODULES`"
-AC_SUBST(MUSIC_COMPONENT_CFLAGS)
-MUSIC_COMPONENT_LIBS="`$PKG_CONFIG --libs $MUSIC_COMPONENT_MODULES`"
-AC_SUBST(MUSIC_COMPONENT_LIBS)
-
 dnl emblems component
 EMBLEM_COMPONENT_MODULES="$COMPONENT_MODULES librsvg-2.0"
 EMBLEM_COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $EMBLEM_COMPONENT_MODULES`"
@@ -349,7 +334,6 @@ components/history/Makefile
 components/loser/Makefile
 components/loser/content/Makefile
 components/loser/sidebar/Makefile
-components/music/Makefile
 components/notes/Makefile
 components/sample/Makefile
 components/text/Makefile