Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus-media/ChangeLog,v
retrieving revision 1.50
diff -u -r1.50 ChangeLog
--- ChangeLog	7 Jan 2003 10:38:59 -0000	1.50
+++ ChangeLog	7 Jan 2003 23:18:32 -0000
@@ -1,3 +1,10 @@
+2003-01-07  Alex Duggan <aldug@gnome.org>
+	
+	* configure.in:
+	* Makefile.am:
+	Disable building the test view by default, use --enable-test-view
+	to build it.
+		
 2003-01-07  Thomas Vander Stichele <thomas at apestaart dot org>
 
         * audio-properties-view/audio-properties-view.c: don't crash
Index: configure.in
===================================================================
RCS file: /cvs/gnome/nautilus-media/configure.in,v
retrieving revision 1.37
diff -u -r1.37 configure.in
--- configure.in	7 Jan 2003 07:34:45 -0000	1.37
+++ configure.in	7 Jan 2003 23:18:32 -0000
@@ -102,6 +102,13 @@
 AS_AC_EXPAND(PIXMAPSDIR, $datadir/pixmaps/$PACKAGE)
 AC_DEFINE_UNQUOTED(PIXMAPSDIR, "$PIXMAPSDIR", 
                    [directory where pixmaps are stored])
+						 
+AC_ARG_ENABLE(test-view,      [  --enable-test-view      build the nautilus test view],enable_test_view=yes,enable_test_view=no)
+AM_CONDITIONAL(BUILD_TEST_VIEW, test x$enable_test_view = xyes)
+if test x$enable_test_view = xyes; then
+    AC_DEFINE(BUILD_TEST_VIEW,1,[Build test view])
+fi
+
 
 AC_OUTPUT([
   Makefile 
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus-media/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- Makefile.am	1 Dec 2002 23:51:28 -0000	1.5
+++ Makefile.am	7 Jan 2003 23:18:32 -0000
@@ -1,7 +1,14 @@
+if BUILD_TEST_VIEW
+TEST_DIR=test-view
+else
+TEST_DIR=
+endif
+
 SUBDIRS = \
 	media-info \
 	audio-view audio-properties-view \
-	test-view thumbnail pixmaps po
+	$(TEST_DIR) thumbnail pixmaps po
+
 
 EXTRA_DIST = \
 	ChangeLog \