1999-09-16 Owen Taylor <otaylor@redhat.com>

* Remove the magicdev autoconf test in favor of just
	including the idl file. Otherwise we have a dependency
	loop between this and magicdev.

1999-09-16  Owen Taylor  <otaylor@redhat.com>

        * gmount.c: Remove the HAVE_MAGICDEV conditional.

	* Makefile.in magicdev.idl: Add the magicdev.idl file
	here to avoid creating dependency loops.

ChangeLog

@@ -1,3 +1,9 @@
+1999-09-16  Owen Taylor  <otaylor@redhat.com>
+
+	* Remove the magicdev autoconf test in favor of just
+	including the idl file. Otherwise we have a dependency
+	loop between this and magicdev.
+
 1999-09-08  Federico Mena Quintero  <federico@redhat.com>
 
 	* idl/FileManager.idl: Changed names, and put everything under a

configure.in

@@ -539,7 +539,6 @@ dnl
 mx=""
 gmcdep=""
 libgtkedit=""
-have_magicdev=no
 
 AC_SUBST(insticons)
 GNOME_INIT_HOOK([
@@ -553,31 +552,13 @@ GNOME_INIT_HOOK([
 	    xvers="Gnome+$xvers"
 	fi
 	gnomeicondir=`gnome-config --datadir`/pixmaps
-        GNOME_IDLDIR=`gnome-config --datadir`/idl
-
-        dnl 
-        dnl Check for the MagicDev automounter
-        dnl
-	AC_MSG_CHECKING(for magicdev idl file)
-	if test -e $GNOME_IDLDIR/magicdev.idl ; then
-	    have_magicdev=yes
-        fi
-        AC_MSG_RESULT($have_magicdev)
 ])
 AC_SUBST(gnomeicondir)
-AC_SUBST(GNOME_IDLDIR)
 AC_SUBST(mx)
 AC_SUBST(gmcdep)
 AC_SUBST(libgtkedit)
 AC_SUBST(GNOMEGNORBA_LIBS)
 
-MAGICDEV=#
-if test x$have_magicdev = xyes ; then
-   AC_DEFINE(HAVE_MAGICDEV)
-   MAGICDEV=
-fi
-AC_SUBST(MAGICDEV)
-
 dnl
 dnl Check for the -mandoc package
 dnl

gnome/ChangeLog

@@ -1,3 +1,10 @@
+1999-09-16  Owen Taylor  <otaylor@redhat.com>
+
+        * gmount.c: Remove the HAVE_MAGICDEV conditional.
+	
+	* Makefile.in magicdev.idl: Add the magicdev.idl file
+	here to avoid creating dependency loops.
+
 1999-09-14  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* layout: Added the new samba password dialog.

gnome/Makefile.in

@@ -140,7 +140,8 @@ CORBAOBJS = 			\
 	main-corba.o		\
 	gcorba.o		\
 	gmount-corba.o          \
-	$(MAGICDEV_OBJS)        \
+	magicdev-common.o 	\
+	magicdev-stubs.o	\
 	FileManager-skels.o	\
 	FileManager-stubs.o	\
 	FileManager-common.o
@@ -198,10 +199,6 @@ MAGICDEV_GENERATED =            \
 	magicdev-common.c 	\
 	magicdev-stubs.c
 
-@MAGICDEV@MAGICDEV_OBJS = 	  \
-@MAGICDEV@	magicdev-common.o \
-@MAGICDEV@      magicdev-stubs.o
-
 CLIENTSRCS = gmc-client.c
 
 CLIENTOBJS = 			\
@@ -213,12 +210,12 @@ CLIENTOBJS = 			\
 $(CORBA_GENERATED): $(rootdir)/idl/FileManager.idl
 	orbit-idl `gnome-config --cflags idl` $(rootdir)/idl/FileManager.idl
 
-@MAGICDEV@$(MAGICDEV_GENERATED): $(GNOME_IDLDIR)/magicdev.idl
-@MAGICDEV@	orbit-idl `gnome-config --cflags idl` --noskels $(GNOME_IDLDIR)/magicdev.idl
+$(MAGICDEV_GENERATED): magicdev.idl
+	orbit-idl `gnome-config --cflags idl` --noskels magicdev.idl
 
 FileManager-impl.c: FileManager.h
 
-EXTRA_DIST = gnome.TODO layout gmc.gnorba mc.keys.in.in	gimp.image.desktop 
+EXTRA_DIST = gnome.TODO layout gmc.gnorba mc.keys.in.in	gimp.image.desktop magicdev.idl
 
 DISTGNOME_NEW = \
 	gimp.image.desktop application.x-gnumeric.desktop

gnome/gmount.c

@@ -84,10 +84,10 @@ void free (void *ptr);
 #define MOUNTED_GETMNTTBL
 #endif
 
-#ifdef HAVE_MAGICDEV
+#ifdef HAVE_CORBA
 #include <libgnorba/gnorba.h>
 #include "magicdev.h"
-#endif /* HAVE_MAGICDEV */
+#endif HAVE_CORBA
 
 #include <dirent.h>
 #include <sys/types.h>
@@ -289,7 +289,7 @@ mount_point_to_device (char *mount_point)
 static gboolean
 automounter_is_running (void)
 {
-#if defined(HAVE_MAGICDEV) && defined(HAVE_CORBA)
+#if defined(HAVE_CORBA)
 	CORBA_Object server;
 	CORBA_Environment ev;
 	gboolean result = FALSE;
@@ -311,9 +311,9 @@ automounter_is_running (void)
 
 	return result;
 		
-#else  /* !HAVE_MAGICDEV */
+#else  /* !HAVE_CORBA */
 	return FALSE;
-#endif /* HAVE_MAGICDEV */
+#endif /* HAVE_CORBA */
 }