diff -Naur nautilus-2.0.8/Makefile.in nautilus-new/Makefile.in --- nautilus-2.0.8/Makefile.in 2002-11-18 17:58:14.000000000 -0500 +++ nautilus-new/Makefile.in 2003-03-20 23:52:09.000000000 -0500 @@ -150,7 +150,6 @@ libnautilus-private \ libnautilus-adapter \ src \ - test \ components \ po \ data \ diff -Naur nautilus-2.0.8/components/Makefile.in nautilus-new/components/Makefile.in --- nautilus-2.0.8/components/Makefile.in 2002-11-18 17:58:26.000000000 -0500 +++ nautilus-new/components/Makefile.in 2003-03-20 23:52:09.000000000 -0500 @@ -146,7 +146,6 @@ loser \ music \ notes \ - sample \ text \ throbber \ tree \ diff -Naur nautilus-2.0.8/configure nautilus-new/configure --- nautilus-2.0.8/configure 2002-11-18 17:57:23.000000000 -0500 +++ nautilus-new/configure 2003-03-20 23:52:10.000000000 -0500 @@ -6281,7 +6281,7 @@ # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test x$module = xyes || echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -10964,7 +10964,8 @@ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -p' INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -u -c $(top_builddir)/po/.intltool-merge-cache\ +%.server.in: Makefile ; sed -e "s|\@LIBDIR\@|$(libdir)|" $@ > $@.tmp; mv -f $@.tmp $@ ' INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' @@ -13384,7 +13385,7 @@ LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" -LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" +LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`" CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" @@ -13392,7 +13393,7 @@ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" -CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" +CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`" COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0" diff -Naur nautilus-2.0.8/libnautilus-private/nautilus-medusa-support.c nautilus-new/libnautilus-private/nautilus-medusa-support.c --- nautilus-2.0.8/libnautilus-private/nautilus-medusa-support.c 2001-10-28 15:21:46.000000000 -0500 +++ nautilus-new/libnautilus-private/nautilus-medusa-support.c 2003-03-20 23:52:10.000000000 -0500 @@ -30,6 +30,7 @@ #include #include +#include #include #include #include diff -Naur nautilus-2.0.8/libnautilus-private/nautilus-volume-monitor.c nautilus-new/libnautilus-private/nautilus-volume-monitor.c --- nautilus-2.0.8/libnautilus-private/nautilus-volume-monitor.c 2002-08-29 06:56:02.000000000 -0400 +++ nautilus-new/libnautilus-private/nautilus-volume-monitor.c 2003-03-20 23:52:53.000000000 -0500 @@ -1019,6 +1019,9 @@ static GList * get_mount_list (NautilusVolumeMonitor *monitor) { +#ifdef MACOSX + return NULL; +#else /* !MACOSX */ GList *volumes; NautilusVolume *volume; static time_t last_mtime = 0; @@ -1117,6 +1120,7 @@ saved_list = volumes; return copy_mount_list (volumes); +#endif /* !MACOSX */ } #endif /* !SOLARIS_MNT */ diff -Naur nautilus-2.0.8/ltmain.sh nautilus-new/ltmain.sh --- nautilus-2.0.8/ltmain.sh 2002-11-18 17:57:07.000000000 -0500 +++ nautilus-new/ltmain.sh 2003-03-20 23:52:10.000000000 -0500 @@ -1739,7 +1739,7 @@ if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes + # need_relink=yes fi if test -n "$old_archive_from_expsyms_cmds"; then @@ -2894,8 +2894,19 @@ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else - eval cmds=\"$archive_cmds\" - fi + save_deplibs="$deplibs" + for conv in $convenience; do + tmp_deplibs= + for test_deplib in $deplibs; do + if test "$test_deplib" != "$conv"; then + tmp_deplibs="$tmp_deplibs $test_deplib" + fi + done + deplibs="$tmp_deplibs" + done + eval cmds=\"$archive_cmds\" + deplibs="$save_deplibs" + fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs"