Make the capplet build if gnomevfs isn't already installed.

2000-06-01  JP Rosevear  <jpr@arcavia.com>

	* mime-type-capplet/Makefile.am: Make the capplet build if
gnomevfs
	isn't already installed.

	* libgnomevfs-corba/gnome-vfs-corba.c: Use only the oaf stuff

	* libgnomevfs-corba/gnome-vfs-slave.c: ditto

	* libgnomevfs/Makefile.am: Remove oaf conditionals since we
require
	oaf now

	* libgnomevfs-corba/Makefile.am:

	* configure.in: Check for oaf >= 0.3.0 and make it mandatory
This commit is contained in:
JP Rosevear 2000-06-01 14:59:44 +00:00 committed by JP Rosevear
parent 1bdfaaac57
commit cc325cf040

View file

@ -23,8 +23,7 @@ nautilus_mime_type_capplet_LDADD =\
$(CAPPLET_LIBS) \
$(ORBIT_LIBS) \
$(INTLLIBS) \
$(VFS_LIBS) \
-lgnomevfs
$(top_builddir)/libgnomevfs/libgnomevfs.la
EXTRA_DIST = \
nautilus-mime-type.desktop
@ -35,3 +34,8 @@ sys_DATA = nautilus-mime-type.desktop
install-data-local:
$(INSTALL_DATA) $(srcdir)/nautilus-mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/nautilus-mime-type.desktop