hardware view patch ...

[Michael Meeks <michael ximian com>]

Hi Alex,

	Any chance we can have a very short lived branch 'gnome-2-0-0' so that
we can carry on working on fixing HEAD ?

	Regards,

		Michael.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5361
diff -u -p -u -r1.5361 ChangeLog
--- ChangeLog	3 Jun 2002 23:13:28 -0000	1.5361
+++ ChangeLog	6 Jun 2002 12:37:22 -0000
@@ -1,3 +1,11 @@
+2002-06-06  Michael Meeks  <michael ximian com>
+
+	* configure.in: Only enable the hardware view on
+	Linux.
+
+	* components/hardware/Makefile.am
+	(bin_PROGRAMS): only setup if ENABLE_HARDWARE_VIEW
+
 === nautilus 1.1.19 ===
  
 2002-06-03  Alex Larsson  <alexl redhat com>
Index: configure.in
===================================================================
RCS file: /cvs/gnome/nautilus/configure.in,v
retrieving revision 1.454
diff -u -p -u -r1.454 configure.in
--- configure.in	3 Jun 2002 21:22:14 -0000	1.454
+++ configure.in	6 Jun 2002 12:37:22 -0000
@@ -296,6 +296,16 @@ DISABLE_DEPRECATED_CFLAGS=" \
 	-DBONOBO_DISABLE_DEPRECATED"
 AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 
+dnl
+dnl disable (broken) hardware view on anything but Linux
+dnl
+hw_view=disabled
+if test "x`(uname -s) 2>/dev/null`" = "xLinux"; then
+	hw_view=enabled
+fi
+AM_CONDITIONAL(ENABLE_HARDWARE_VIEW, test "$hw_view" = "enabled")
+
+
 dnl libbackground
 PKG_CHECK_MODULES(CAPPLET, "gtk+-2.0 gconf-2.0 libgnomeui-2.0 libbonoboui-2.0")
 dnl ==========================================================================
@@ -366,3 +376,12 @@ test/Makefile
 ])
 
 dnl ==========================================================================
+echo "
+nautilus-$VERSION:
+
+	prefix:                 ${prefix}
+	source code location:	${srcdir}
+	compiler:		${CC}
+
+	hardware view:          ${hw_view}
+"
Index: components/hardware/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/hardware/Makefile.am,v
retrieving revision 1.20
diff -u -p -u -r1.20 Makefile.am
--- components/hardware/Makefile.am	20 Feb 2002 16:43:04 -0000	1.20
+++ components/hardware/Makefile.am	6 Jun 2002 12:37:22 -0000
@@ -12,10 +12,14 @@ INCLUDES =						\
 
 serverdir = $(libdir)/bonobo/servers
 server_in_files = Nautilus_View_hardware.server.in
-server_DATA = $(server_in_files:.server.in=.server)
- INTLTOOL_SERVER_RULE@
+server_output = $(server_in_files:.server.in=.server)
+
+if ENABLE_HARDWARE_VIEW
+bin_PROGRAMS=nautilus-hardware-view
+server_DATA = $(server_output)
+endif
 
-bin_PROGRAMS =nautilus-hardware-view
+ INTLTOOL_SERVER_RULE@
 
 nautilus_hardware_view_SOURCES =		        \
 	nautilus-hardware-view.c			\
@@ -28,4 +32,5 @@ nautilus_hardware_view_LDADD =				\
 	$(COMPONENT_LIBS) 				\
 	$(NULL)
 
-EXTRA_DIST = $(server_DATA) $(server_in_files)
+EXTRA_DIST = $(server_output) $(server_in_files) $(nautilus_hardware_view_SOURCES)
+

-- 
 mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot