r20191 - in /desktop/unstable/nautilus/debian: changelog nautilus.install patches/13_autostart.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun May 31 12:04:12 UTC 2009
Author: joss
Date: Sun May 31 12:04:12 2009
New Revision: 20191
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20191
Log:
* 13_autostart.patch: new patch. Put nautilus.desktop into the
autostart directory so that we don’t rely on gnome-session’s
required_applications mechanism. This allows to add an autostart
condition on the show_desktop GConf key.
* 90_relibtoolize.patch: update accordingly.
Added:
desktop/unstable/nautilus/debian/patches/13_autostart.patch
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/nautilus.install
desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch
desktop/unstable/nautilus/debian/patches/series
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=20191&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Sun May 31 12:04:12 2009
@@ -1,9 +1,14 @@
-nautilus (2.26.2-4) UNRELEASED; urgency=low
+nautilus (2.26.2-4) unstable; urgency=low
* 11_restart_mode.patch: add reference.
* Remove scrollkeeper dependency.
-
- -- Josselin Mouette <joss at debian.org> Wed, 29 Apr 2009 20:48:55 +0200
+ * 13_autostart.patch: new patch. Put nautilus.desktop into the
+ autostart directory so that we don’t rely on gnome-session’s
+ required_applications mechanism. This allows to add an autostart
+ condition on the show_desktop GConf key.
+ * 90_relibtoolize.patch: update accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 31 May 2009 13:51:27 +0200
nautilus (2.26.2-3) unstable; urgency=low
Modified: desktop/unstable/nautilus/debian/nautilus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/nautilus.install?rev=20191&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/nautilus.install (original)
+++ desktop/unstable/nautilus/debian/nautilus.install Sun May 31 12:04:12 2009
@@ -1,3 +1,4 @@
debian/tmp/usr/bin
debian/tmp/usr/share/applications
+debian/tmp/usr/share/gnome/autostart
debian/tmp/usr/share/man
Added: desktop/unstable/nautilus/debian/patches/13_autostart.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/13_autostart.patch?rev=20191&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/13_autostart.patch (added)
+++ desktop/unstable/nautilus/debian/patches/13_autostart.patch Sun May 31 12:04:12 2009
@@ -1,0 +1,52 @@
+Index: nautilus-2.26.2/Makefile.am
+===================================================================
+--- nautilus-2.26.2.orig/Makefile.am 2009-05-31 13:37:15.641665893 +0200
++++ nautilus-2.26.2/Makefile.am 2009-05-31 13:39:30.522302392 +0200
+@@ -5,7 +5,6 @@ include $(top_srcdir)/Makefile.shared
+ desktopdir = $(datadir)/applications
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ desktop_in_files = \
+- nautilus.desktop.in \
+ nautilus-home.desktop.in \
+ nautilus-computer.desktop.in \
+ nautilus-folder-handler.desktop.in \
+@@ -13,6 +12,10 @@ desktop_in_files = \
+ nautilus-browser.desktop.in \
+ nautilus-autorun-software.desktop.in
+
++autostartdir = $(datadir)/gnome/autostart
++autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
++autostart_in_files = nautilus.desktop.in
++
+ SUBDIRS = \
+ eel \
+ libnautilus-extension \
+Index: nautilus-2.26.2/nautilus.desktop.in.in
+===================================================================
+--- nautilus-2.26.2.orig/nautilus.desktop.in.in 2009-05-31 13:35:47.754168589 +0200
++++ nautilus-2.26.2/nautilus.desktop.in.in 2009-05-31 13:36:46.730282031 +0200
+@@ -6,8 +6,8 @@ Icon=system-file-manager
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-NoDisplay=true
+ OnlyShowIn=GNOME;
++AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=nautilus
+ X-GNOME-Bugzilla-Component=general
+Index: nautilus-2.26.2/src/nautilus-main.c
+===================================================================
+--- nautilus-2.26.2.orig/src/nautilus-main.c 2009-05-31 13:34:07.889665421 +0200
++++ nautilus-2.26.2/src/nautilus-main.c 2009-05-31 13:34:31.538266282 +0200
+@@ -466,8 +466,8 @@ main (int argc, char *argv[])
+ if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP))
+ && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) {
+ egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop");
+- } else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
+- egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
++ } else if (g_file_test (DATADIR "/gnome/autostart/nautilus.desktop", G_FILE_TEST_EXISTS)) {
++ egg_set_desktop_file (DATADIR "/gnome/autostart/nautilus.desktop");
+ }
+
+ application = NULL;
Modified: desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch?rev=20191&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch (original)
+++ desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch Sun May 31 12:04:12 2009
@@ -8,15 +8,15 @@
Index: nautilus-2.26.2/aclocal.m4
===================================================================
---- nautilus-2.26.2.orig/aclocal.m4 2009-04-25 00:43:02.361417224 +0200
-+++ nautilus-2.26.2/aclocal.m4 2009-04-25 01:43:16.689416921 +0200
+--- nautilus-2.26.2.orig/aclocal.m4 2009-05-31 13:32:23.606178158 +0200
++++ nautilus-2.26.2/aclocal.m4 2009-05-31 13:48:59.946163959 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-@@ -13,4795 +13,4038 @@
+@@ -13,4795 +13,4039 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
@@ -125,10 +125,11 @@
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+ AC_ARG_ENABLE(schemas-install,
-+ [ --disable-schemas-install Disable the schemas installation],
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
+ [case ${enableval} in
+ yes|no) ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+ esac])
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+])
@@ -1193,8 +1194,7 @@
- fi
- rm -rf conftest*
- ;;
-+fi
-
+-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
@@ -1244,8 +1244,7 @@
- fi
- rm -rf conftest*
- ;;
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+AC_SUBST(ALL_LINGUAS)
++fi
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
@@ -1279,6 +1278,17 @@
- fi
- rm -rf conftest*
- ;;
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
++AC_SUBST(ALL_LINGUAS)
+
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+- AC_CHECK_TOOL(AS, as, false)
+- AC_CHECK_TOOL(OBJDUMP, objdump, false)
+- ;;
+- ])
+-esac
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
@@ -1304,69 +1314,11 @@
+fi
+AC_SUBST(DATADIRNAME)
--AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-- AC_CHECK_TOOL(AS, as, false)
-- AC_CHECK_TOOL(OBJDUMP, objdump, false)
-- ;;
+-need_locks="$enable_libtool_lock"
+IT_PO_SUBDIR([po])
-+
+
+-])# _LT_AC_LOCK
+])
-+
-+
-+# IT_PO_SUBDIR(DIRNAME)
-+# ---------------------
-+# All po subdirs have to be declared with this macro; the subdir "po" is
-+# declared by IT_PROG_INTLTOOL.
-+#
-+AC_DEFUN([IT_PO_SUBDIR],
-+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-+dnl
-+dnl The following CONFIG_COMMANDS should be exetuted at the very end
-+dnl of config.status.
-+AC_CONFIG_COMMANDS_PRE([
-+ AC_CONFIG_COMMANDS([$1/stamp-it], [
-+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-+ fi
-+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-+ >"$1/stamp-it.tmp"
-+ [sed '/^#/d
-+ s/^[[].*] *//
-+ /^[ ]*$/d
-+ '"s|^| $ac_top_srcdir/|" \
-+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-+ ]
-+ [sed '/^POTFILES =/,/[^\\]$/ {
-+ /^POTFILES =/!d
-+ r $1/POTFILES
-+ }
-+ ' "$1/Makefile.in" >"$1/Makefile"]
-+ rm -f "$1/Makefile.tmp"
-+ mv "$1/stamp-it.tmp" "$1/stamp-it"
- ])
--esac
-+])dnl
-+])
-
--need_locks="$enable_libtool_lock"
-+# _IT_SUBST(VARIABLE)
-+# -------------------
-+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-+#
-+AC_DEFUN([_IT_SUBST],
-+[
-+AC_SUBST([$1])
-+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-+]
-+)
-
--])# _LT_AC_LOCK
-+# deprecated macros
-+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-+# A hint is needed for aclocal from Automake <= 1.9.4:
-+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
@@ -1404,6 +1356,91 @@
- fi
- fi
- $rm conftest*
++# IT_PO_SUBDIR(DIRNAME)
++# ---------------------
++# All po subdirs have to be declared with this macro; the subdir "po" is
++# declared by IT_PROG_INTLTOOL.
++#
++AC_DEFUN([IT_PO_SUBDIR],
++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
++dnl
++dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl of config.status.
++AC_CONFIG_COMMANDS_PRE([
++ AC_CONFIG_COMMANDS([$1/stamp-it], [
++ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
++ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
++ fi
++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
++ >"$1/stamp-it.tmp"
++ [sed '/^#/d
++ s/^[[].*] *//
++ /^[ ]*$/d
++ '"s|^| $ac_top_srcdir/|" \
++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
++ ]
++ [sed '/^POTFILES =/,/[^\\]$/ {
++ /^POTFILES =/!d
++ r $1/POTFILES
++ }
++ ' "$1/Makefile.in" >"$1/Makefile"]
++ rm -f "$1/Makefile.tmp"
++ mv "$1/stamp-it.tmp" "$1/stamp-it"
++ ])
++])dnl
+ ])
+
+-if test x"[$]$2" = xyes; then
+- ifelse([$5], , :, [$5])
+-else
+- ifelse([$6], , :, [$6])
+-fi
+-])# AC_LIBTOOL_COMPILER_OPTION
++# _IT_SUBST(VARIABLE)
++# -------------------
++# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
++#
++AC_DEFUN([_IT_SUBST],
++[
++AC_SUBST([$1])
++m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
++]
++)
++
++# deprecated macros
++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
++# A hint is needed for aclocal from Automake <= 1.9.4:
++# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
+
+-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-# [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_CACHE_CHECK([$1], [$2],
+- [$2=no
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS $3"
+- echo "$lt_simple_link_test_code" > conftest.$ac_ext
+- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The linker can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test -s conftest.err; then
+- # Append any errors to the config.log.
+- cat conftest.err 1>&AS_MESSAGE_LOG_FD
+- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+- if diff conftest.exp conftest.er2 >/dev/null; then
+- $2=yes
+- fi
+- else
+- $2=yes
+- fi
+- fi
+- $rm -r conftest*
+- LDFLAGS="$save_LDFLAGS"
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1444,43 +1481,22 @@
])
-if test x"[$]$2" = xyes; then
+- ifelse([$4], , :, [$4])
+-else
- ifelse([$5], , :, [$5])
--else
-- ifelse([$6], , :, [$6])
-fi
--])# AC_LIBTOOL_COMPILER_OPTION
+-])# AC_LIBTOOL_LINKER_OPTION
+# serial 56 LT_INIT
--# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--# [ACTION-SUCCESS], [ACTION-FAILURE])
--# ------------------------------------------------------------
--# Check whether the given compiler option works
--AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
--[AC_REQUIRE([LT_AC_PROG_SED])dnl
--AC_CACHE_CHECK([$1], [$2],
-- [$2=no
-- save_LDFLAGS="$LDFLAGS"
-- LDFLAGS="$LDFLAGS $3"
-- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-- # The linker can only warn and ignore the option if not recognized
-- # So say no if there are warnings
-- if test -s conftest.err; then
-- # Append any errors to the config.log.
-- cat conftest.err 1>&AS_MESSAGE_LOG_FD
-- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-- if diff conftest.exp conftest.er2 >/dev/null; then
-- $2=yes
-- fi
-- else
-- $2=yes
-- fi
-- fi
-- $rm -r conftest*
-- LDFLAGS="$save_LDFLAGS"
--])
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
+-AC_MSG_CHECKING([the maximum length of command line arguments])
+-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+- i=0
+- teststring="ABCD"
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
@@ -1491,13 +1507,21 @@
+ 63)])],
+ [$2])])
--if test x"[$]$2" = xyes; then
-- ifelse([$4], , :, [$4])
--else
-- ifelse([$5], , :, [$5])
--fi
--])# AC_LIBTOOL_LINKER_OPTION
-
+- case $build_os in
+- msdosdjgpp*)
+- # On DJGPP, this test can blow up pretty badly due to problems in libc
+- # (any single argument exceeding 2000 bytes causes a buffer overrun
+- # during glob expansion). Even if it were fixed, the result of this
+- # check would be larger than it should be.
+- lt_cv_sys_max_cmd_len=12288; # 12K is about right
+- ;;
+
+- gnu*)
+- # Under GNU Hurd, this test is not required because there is
+- # no limit to the length of command line arguments.
+- # Libtool will interpret -1 as no limit whatsoever
+- lt_cv_sys_max_cmd_len=-1;
+- ;;
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
@@ -1508,22 +1532,21 @@
+esac
+])
--# AC_LIBTOOL_SYS_MAX_CMD_LEN
--# --------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
--[# find the maximum length of command line arguments
--AC_MSG_CHECKING([the maximum length of command line arguments])
--AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-- i=0
-- teststring="ABCD"
-
-- case $build_os in
-- msdosdjgpp*)
-- # On DJGPP, this test can blow up pretty badly due to problems in libc
-- # (any single argument exceeding 2000 bytes causes a buffer overrun
-- # during glob expansion). Even if it were fixed, the result of this
-- # check would be larger than it should be.
-- lt_cv_sys_max_cmd_len=12288; # 12K is about right
+- cygwin* | mingw*)
+- # On Win9x/ME, this test blows up -- it succeeds, but takes
+- # about 5 minutes as the teststring grows exponentially.
+- # Worse, since 9x/ME are not pre-emptively multitasking,
+- # you end up with a "frozen" computer, even though with patience
+- # the test eventually succeeds (with a max line length of 256k).
+- # Instead, let's just punt: use the minimum linelength reported by
+- # all of the supported platforms: 8192 (on NT/2K/XP).
+- lt_cv_sys_max_cmd_len=8192;
+- ;;
+
+- amigaos*)
+- # On AmigaOS with pdksh, this test takes hours, literally.
+- # So we just punt and use a minimum line length of 8192.
+- lt_cv_sys_max_cmd_len=8192;
- ;;
+# LT_INIT([OPTIONS])
+# ------------------
@@ -1544,37 +1567,6 @@
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
-
-- gnu*)
-- # Under GNU Hurd, this test is not required because there is
-- # no limit to the length of command line arguments.
-- # Libtool will interpret -1 as no limit whatsoever
-- lt_cv_sys_max_cmd_len=-1;
-- ;;
-+dnl Parse OPTIONS
-+_LT_SET_OPTIONS([$0], [$1])
-
-- cygwin* | mingw*)
-- # On Win9x/ME, this test blows up -- it succeeds, but takes
-- # about 5 minutes as the teststring grows exponentially.
-- # Worse, since 9x/ME are not pre-emptively multitasking,
-- # you end up with a "frozen" computer, even though with patience
-- # the test eventually succeeds (with a max line length of 256k).
-- # Instead, let's just punt: use the minimum linelength reported by
-- # all of the supported platforms: 8192 (on NT/2K/XP).
-- lt_cv_sys_max_cmd_len=8192;
-- ;;
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
-
-- amigaos*)
-- # On AmigaOS with pdksh, this test takes hours, literally.
-- # So we just punt and use a minimum line length of 8192.
-- lt_cv_sys_max_cmd_len=8192;
-- ;;
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
@@ -1589,22 +1581,15 @@
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
-+_LT_SETUP
++dnl Parse OPTIONS
++_LT_SET_OPTIONS([$0], [$1])
- interix*)
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- lt_cv_sys_max_cmd_len=196608
- ;;
-+# Only expand once:
-+m4_define([LT_INIT])
-+])# LT_INIT
-+
-+# Old names:
-+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ltmain"
- osf*)
- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
@@ -1653,6 +1638,23 @@
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- fi
- ;;
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
++
++_LT_SETUP
++
++# Only expand once:
++m4_define([LT_INIT])
++])# LT_INIT
++
++# Old names:
++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
++dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
++
+
+# _LT_CC_BASENAME(CC)
+# -------------------
@@ -8424,7 +8426,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
AC_MSG_CHECKING([command to parse $NM output from $compiler object])
AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-@@ -4815,33 +4058,18 @@ symcode='[[BCDEGRST]]'
+@@ -4815,33 +4059,18 @@ symcode='[[BCDEGRST]]'
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -8460,7 +8462,7 @@
;;
irix* | nonstopux*)
symcode='[[BCDEGRST]]'
-@@ -4866,44 +4094,72 @@ sysv4)
+@@ -4866,44 +4095,72 @@ sysv4)
;;
esac
@@ -8545,7 +8547,7 @@
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
-@@ -4917,48 +4173,50 @@ EOF
+@@ -4917,48 +4174,50 @@ EOF
fi
# Make sure that we snagged all the symbols we need.
@@ -8617,7 +8619,7 @@
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
-@@ -4995,56 +4253,78 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -4995,56 +4254,78 @@ if test -z "$lt_cv_sys_global_symbol_pip
else
AC_MSG_RESULT(ok)
fi
@@ -8715,7 +8717,7 @@
;;
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
-@@ -5052,22 +4332,28 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5052,22 +4333,28 @@ AC_MSG_CHECKING([for $compiler option to
;;
sysv4*MP*)
if test -d /usr/nec; then
@@ -8750,7 +8752,7 @@
;;
esac
else
-@@ -5076,37 +4362,27 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5076,37 +4363,27 @@ AC_MSG_CHECKING([for $compiler option to
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -8793,7 +8795,7 @@
;;
*)
;;
-@@ -5118,21 +4394,21 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5118,21 +4395,21 @@ AC_MSG_CHECKING([for $compiler option to
hpux9* | hpux10* | hpux11*)
case $cc_basename in
CC*)
@@ -8821,7 +8823,7 @@
;;
esac
;;
-@@ -5147,8 +4423,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5147,8 +4424,8 @@ AC_MSG_CHECKING([for $compiler option to
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
@@ -8832,7 +8834,7 @@
# CC pic flag -KPIC is the default.
;;
*)
-@@ -5159,35 +4435,48 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5159,35 +4436,48 @@ AC_MSG_CHECKING([for $compiler option to
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -8897,7 +8899,7 @@
;;
esac
;;
-@@ -5200,30 +4489,35 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5200,30 +4490,35 @@ AC_MSG_CHECKING([for $compiler option to
mvs*)
case $cc_basename in
cxx*)
@@ -8940,7 +8942,7 @@
;;
*)
;;
-@@ -5235,13 +4529,13 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5235,13 +4530,13 @@ AC_MSG_CHECKING([for $compiler option to
case $cc_basename in
CC*)
# Sun C++ 4.2, 5.x and Centerline C++
@@ -8958,7 +8960,7 @@
;;
*)
;;
-@@ -5251,82 +4545,104 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5251,82 +4546,104 @@ AC_MSG_CHECKING([for $compiler option to
case $cc_basename in
CC*)
# Sun C++ 4.x
@@ -9088,7 +9090,7 @@
;;
interix[[3-9]]*)
-@@ -5337,65 +4653,48 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5337,65 +4654,48 @@ AC_MSG_CHECKING([for $compiler option to
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -9169,7 +9171,7 @@
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
case $host_cpu in
-@@ -5403,222 +4702,266 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5403,222 +4703,266 @@ AC_MSG_CHECKING([for $compiler option to
# +Z the default
;;
*)
@@ -9545,7 +9547,7 @@
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
-@@ -5627,10 +4970,9 @@ ifelse([$1],[CXX],[
+@@ -5627,10 +4971,9 @@ ifelse([$1],[CXX],[
# Exclude shared library initialization/finalization symbols.
dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
@@ -9558,7 +9560,7 @@
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
-@@ -5645,9 +4987,12 @@ dnl Note also adjust exclude_expsyms for
+@@ -5645,9 +4988,12 @@ dnl Note also adjust exclude_expsyms for
openbsd*)
with_gnu_ld=no
;;
@@ -9572,7 +9574,7 @@
if test "$with_gnu_ld" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -5656,16 +5001,16 @@ dnl Note also adjust exclude_expsyms for
+@@ -5656,16 +5002,16 @@ dnl Note also adjust exclude_expsyms for
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
@@ -9596,7 +9598,7 @@
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -5678,8 +5023,8 @@ dnl Note also adjust exclude_expsyms for
+@@ -5678,8 +5024,8 @@ dnl Note also adjust exclude_expsyms for
aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
@@ -9607,7 +9609,7 @@
*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
-@@ -5687,49 +5032,50 @@ dnl Note also adjust exclude_expsyms for
+@@ -5687,49 +5033,50 @@ dnl Note also adjust exclude_expsyms for
*** really care for shared libraries, you may want to modify your PATH
*** so that a non-GNU linker is found, and then restart.
@@ -9684,7 +9686,7 @@
cp $export_symbols $output_objdir/$soname.def;
else
echo EXPORTS > $output_objdir/$soname.def;
-@@ -5737,79 +5083,109 @@ EOF
+@@ -5737,79 +5084,109 @@ EOF
fi~
$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
@@ -9826,7 +9828,7 @@
*** Warning: The releases 2.8.* of the GNU linker cannot reliably
*** create shared libraries on Solaris systems. Therefore, libtool
-@@ -5818,19 +5194,19 @@ EOF
+@@ -5818,19 +5195,19 @@ EOF
*** your PATH or compiler configuration so that the native linker is
*** used, and then restart.
@@ -9852,7 +9854,7 @@
cat <<_LT_EOF 1>&2
*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-@@ -5843,54 +5219,58 @@ EOF
+@@ -5843,54 +5220,58 @@ EOF
_LT_EOF
;;
*)
@@ -9932,7 +9934,7 @@
fi
;;
-@@ -5904,10 +5284,10 @@ _LT_EOF
+@@ -5904,10 +5285,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -9946,7 +9948,7 @@
fi
aix_use_runtimelinking=no
-@@ -5916,10 +5296,10 @@ _LT_EOF
+@@ -5916,10 +5297,10 @@ _LT_EOF
# need to do runtime linking.
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
@@ -9961,7 +9963,7 @@
done
;;
esac
-@@ -5934,30 +5314,32 @@ _LT_EOF
+@@ -5934,30 +5315,32 @@ _LT_EOF
# CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
# enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
@@ -10010,7 +10012,7 @@
fi
;;
esac
-@@ -5965,11 +5347,12 @@ _LT_EOF
+@@ -5965,11 +5348,12 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10025,7 +10027,7 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
-@@ -5980,129 +5363,94 @@ _LT_EOF
+@@ -5980,129 +5364,94 @@ _LT_EOF
fi
fi
@@ -10202,7 +10204,7 @@
;;
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-@@ -6110,60 +5458,60 @@ _LT_EOF
+@@ -6110,60 +5459,60 @@ _LT_EOF
# does not break anything, and helps significantly (at the cost of a little
# extra space).
freebsd2.2*)
@@ -10291,7 +10293,7 @@
fi
;;
-@@ -6171,45 +5519,45 @@ _LT_EOF
+@@ -6171,45 +5520,45 @@ _LT_EOF
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
@@ -10351,7 +10353,7 @@
;;
esac
fi
-@@ -6217,194 +5565,221 @@ _LT_EOF
+@@ -6217,194 +5566,221 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -10665,7 +10667,7 @@
fi
;;
-@@ -6415,50 +5790,65 @@ _LT_EOF
+@@ -6415,50 +5791,65 @@ _LT_EOF
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
@@ -10752,7 +10754,7 @@
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
;;
-@@ -6467,7 +5857,7 @@ x|xyes)
+@@ -6467,7 +5858,7 @@ x|xyes)
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
@@ -10761,7 +10763,7 @@
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-@@ -6475,1966 +5865,3925 @@ x|xyes)
+@@ -6475,1966 +5866,3925 @@ x|xyes)
lib=conftest
libobjs=conftest.$ac_objext
deplibs=
@@ -16430,18 +16432,130 @@
Index: nautilus-2.26.2/config.guess
===================================================================
---- nautilus-2.26.2.orig/config.guess 2009-04-25 00:43:02.345415889 +0200
-+++ nautilus-2.26.2/config.guess 2009-04-25 01:43:35.977415338 +0200
+--- nautilus-2.26.2.orig/config.guess 2009-05-31 13:32:23.550165171 +0200
++++ nautilus-2.26.2/config.guess 2009-05-31 13:49:02.006164047 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-01-08'
-+timestamp='2008-01-23'
++timestamp='2009-04-27'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -1484,9 +1484,9 @@ This script, last modified $timestamp, h
+@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
++ s390x:SunOS:*:*)
++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ exit ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ eval $set_cc_for_build
++ SUN_ARCH="i386"
++ # If there is a compiler, see if it is configured for 64-bit objects.
++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++ # This test works for both compilers.
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ SUN_ARCH="x86_64"
++ fi
++ fi
++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+@@ -796,7 +812,7 @@ EOF
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd)
++ EM64T | authenticamd | genuineintel)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -935,6 +951,9 @@ EOF
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
++ padre:Linux:*:*)
++ echo sparc-unknown-linux-gnu
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -985,9 +1004,6 @@ EOF
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit ;;
+- coff-i386)
+- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+- exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+@@ -1102,8 +1118,11 @@ EOF
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+- # the processor, so we play safe by assuming i386.
+- echo i386-pc-msdosdjgpp
++ # the processor, so we play safe by assuming i586.
++ # Note: whatever this is, it MUST be the same as what config.sub
++ # prints for the "djgpp" host, or else GDB configury will decide that
++ # this is a cross-build.
++ echo i586-pc-msdosdjgpp
+ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+@@ -1141,6 +1160,16 @@ EOF
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
++ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++ OS_REL='.3'
++ test -r /etc/.relid \
++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+@@ -1216,6 +1245,9 @@ EOF
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit ;;
++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
++ echo i586-pc-haiku
++ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+@@ -1324,6 +1356,9 @@ EOF
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
++ i*86:AROS:*:*)
++ echo ${UNAME_MACHINE}-pc-aros
++ exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1484,9 +1519,9 @@ This script, last modified $timestamp, h
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
@@ -16455,8 +16569,8 @@
send the following data and any information you think might be
Index: nautilus-2.26.2/config.h.in
===================================================================
---- nautilus-2.26.2.orig/config.h.in 2009-04-25 00:43:02.321416819 +0200
-+++ nautilus-2.26.2/config.h.in 2009-04-25 01:43:16.693926432 +0200
+--- nautilus-2.26.2.orig/config.h.in 2009-05-31 13:32:23.522166987 +0200
++++ nautilus-2.26.2/config.h.in 2009-05-31 13:48:41.725666296 +0200
@@ -150,6 +150,10 @@
/* Define to 1 if you have the <X11/XF86keysym.h> header file. */
#undef HAVE_X11_XF86KEYSYM_H
@@ -16470,8 +16584,8 @@
Index: nautilus-2.26.2/configure
===================================================================
---- nautilus-2.26.2.orig/configure 2009-04-25 00:43:02.305419394 +0200
-+++ nautilus-2.26.2/configure 2009-04-25 01:43:39.513913337 +0200
+--- nautilus-2.26.2.orig/configure 2009-05-31 13:32:23.482166089 +0200
++++ nautilus-2.26.2/configure 2009-05-31 13:49:05.577662105 +0200
@@ -577,22 +577,22 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -16805,7 +16919,16 @@
PKG_CONFIG
ALL_CFLAGS
ALL_LIBS
-@@ -1730,10 +1713,9 @@ Optional Features:
+@@ -1723,17 +1706,17 @@ Optional Features:
+ --enable-empty-view Enable empty view
+ --disable-packagekit build without PackageKit support
+ --enable-more-warnings Maximum compiler warnings
+- --disable-schemas-install Disable the schemas installation
++ --disable-schemas-install
++ Disable the schemas installation
+ --disable-update-mimedb disable the update-mime-database after install
+ default=no
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -16817,7 +16940,7 @@
--with-html-dir=PATH path to installed docs
--with-x use the X Window System
--with-gconf-source=sourceaddress
-@@ -1750,11 +1732,6 @@ Some influential environment variables:
+@@ -1750,11 +1733,6 @@ Some influential environment variables:
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
@@ -16829,7 +16952,7 @@
PKG_CONFIG path to pkg-config utility
ALL_CFLAGS C compiler flags for ALL, overriding pkg-config
ALL_LIBS linker flags for ALL, overriding pkg-config
-@@ -6269,52 +6246,8 @@ fi
+@@ -6269,52 +6247,8 @@ fi
@@ -16882,7 +17005,7 @@
# Make sure we can run config.sub.
-@@ -6400,869 +6333,687 @@ IFS=$ac_save_IFS
+@@ -6400,869 +6334,687 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -18313,7 +18436,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7271,7 +7022,7 @@ do
+@@ -7271,7 +7023,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -18322,7 +18445,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7281,28 +7032,32 @@ IFS=$as_save_IFS
+@@ -7281,28 +7033,32 @@ IFS=$as_save_IFS
fi
fi
@@ -18366,7 +18489,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7311,7 +7066,7 @@ do
+@@ -7311,7 +7067,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -18375,7 +18498,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7321,17 +7076,21 @@ IFS=$as_save_IFS
+@@ -7321,17 +7077,21 @@ IFS=$as_save_IFS
fi
fi
@@ -18403,7 +18526,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -7339,235 +7098,281 @@ yes:)
+@@ -7339,235 +7099,281 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -18444,13 +18567,13 @@
+else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
-+ (eval echo "\"\$as_me:7124: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:7125: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
-+ (eval echo "\"\$as_me:7127: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:7128: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
-+ (eval echo "\"\$as_me:7130: output\"" >&5)
++ (eval echo "\"\$as_me:7131: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
@@ -18880,7 +19003,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -7576,7 +7381,7 @@ do
+@@ -7576,7 +7382,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -18889,7 +19012,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -7586,21 +7391,57 @@ IFS=$as_save_IFS
+@@ -7586,21 +7392,57 @@ IFS=$as_save_IFS
fi
fi
@@ -18954,7 +19077,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -7608,637 +7449,242 @@ yes:)
+@@ -7608,637 +7450,242 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -19772,7 +19895,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8247,7 +7693,7 @@ do
+@@ -8247,7 +7694,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -19781,7 +19904,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8257,32 +7703,28 @@ IFS=$as_save_IFS
+@@ -8257,32 +7704,28 @@ IFS=$as_save_IFS
fi
fi
@@ -19825,7 +19948,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8291,7 +7733,7 @@ do
+@@ -8291,7 +7734,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -19834,7 +19957,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8301,21 +7743,17 @@ IFS=$as_save_IFS
+@@ -8301,21 +7744,17 @@ IFS=$as_save_IFS
fi
fi
@@ -19865,7 +19988,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -8323,299 +7761,283 @@ yes:)
+@@ -8323,299 +7762,283 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -20395,7 +20518,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-@@ -8632,33 +8054,18 @@ symcode='[BCDEGRST]'
+@@ -8632,33 +8055,18 @@ symcode='[BCDEGRST]'
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -20431,7 +20554,7 @@
;;
irix* | nonstopux*)
symcode='[BCDEGRST]'
-@@ -8683,44 +8090,72 @@ sysv4)
+@@ -8683,44 +8091,72 @@ sysv4)
;;
esac
@@ -20516,7 +20639,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -8742,42 +8177,44 @@ EOF
+@@ -8742,42 +8178,44 @@ EOF
fi
# Make sure that we snagged all the symbols we need.
@@ -20581,7 +20704,7 @@
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
lt_save_LIBS="$LIBS"
-@@ -8829,80 +8266,262 @@ else
+@@ -8829,80 +8267,262 @@ else
$as_echo "ok" >&6; }
fi
@@ -20691,7 +20814,7 @@
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
-+ echo '#line 8321 "configure"' > conftest.$ac_ext
++ echo '#line 8322 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
@@ -20901,7 +21024,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8911,7 +8530,7 @@ do
+@@ -8911,7 +8531,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -20910,7 +21033,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8921,10 +8540,10 @@ IFS=$as_save_IFS
+@@ -8921,10 +8541,10 @@ IFS=$as_save_IFS
fi
fi
@@ -20925,7 +21048,7 @@
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
-@@ -8932,17 +8551,17 @@ fi
+@@ -8932,17 +8552,17 @@ fi
fi
@@ -20950,7 +21073,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8951,7 +8570,7 @@ do
+@@ -8951,7 +8571,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -20959,7 +21082,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8961,17 +8580,17 @@ IFS=$as_save_IFS
+@@ -8961,17 +8581,17 @@ IFS=$as_save_IFS
fi
fi
@@ -20983,7 +21106,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -8979,23 +8598,23 @@ yes:)
+@@ -8979,23 +8599,23 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -21016,7 +21139,7 @@
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
-@@ -9003,7 +8622,7 @@ do
+@@ -9003,7 +8623,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -21025,7 +21148,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -9013,10 +8632,10 @@ IFS=$as_save_IFS
+@@ -9013,10 +8633,10 @@ IFS=$as_save_IFS
fi
fi
@@ -21040,7 +21163,7 @@
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
-@@ -9024,17 +8643,17 @@ fi
+@@ -9024,17 +8644,17 @@ fi
fi
@@ -21065,7 +21188,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -9043,7 +8662,7 @@ do
+@@ -9043,7 +8663,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -21074,7 +21197,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -9053,17 +8672,17 @@ IFS=$as_save_IFS
+@@ -9053,17 +8673,17 @@ IFS=$as_save_IFS
fi
fi
@@ -21098,7 +21221,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -9071,22 +8690,22 @@ yes:)
+@@ -9071,22 +8691,22 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -21129,7 +21252,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -9095,7 +8714,7 @@ do
+@@ -9095,7 +8715,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -21138,7 +21261,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -9105,10 +8724,10 @@ IFS=$as_save_IFS
+@@ -9105,10 +8725,10 @@ IFS=$as_save_IFS
fi
fi
@@ -21153,7 +21276,7 @@
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
-@@ -9116,17 +8735,17 @@ fi
+@@ -9116,17 +8736,17 @@ fi
fi
@@ -21178,7 +21301,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -9135,7 +8754,7 @@ do
+@@ -9135,7 +8755,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -21187,7 +21310,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -9145,17 +8764,17 @@ IFS=$as_save_IFS
+@@ -9145,17 +8765,17 @@ IFS=$as_save_IFS
fi
fi
@@ -21211,7 +21334,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -9163,250 +8782,154 @@ yes:)
+@@ -9163,250 +8783,154 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -21588,7 +21711,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -9415,7 +8938,7 @@ do
+@@ -9415,7 +8939,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -21597,7 +21720,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -9425,17 +8948,17 @@ IFS=$as_save_IFS
+@@ -9425,17 +8949,17 @@ IFS=$as_save_IFS
fi
fi
@@ -21621,7 +21744,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -9443,103 +8966,36 @@ yes:)
+@@ -9443,103 +8967,36 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -21746,7 +21869,7 @@
{ $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-@@ -9549,18 +9005,24 @@ if test "${lt_cv_apple_cc_single_mod+set
+@@ -9549,18 +9006,24 @@ if test "${lt_cv_apple_cc_single_mod+set
else
lt_cv_apple_cc_single_mod=no
if test -z "${LT_MULTI_MODULE}"; then
@@ -21783,7 +21906,7 @@
fi
fi
{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-@@ -9621,27 +9083,27 @@ fi
+@@ -9621,27 +9084,27 @@ fi
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
@@ -21821,7 +21944,7 @@
esac
;;
esac
-@@ -9651,10 +9113,10 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -9651,10 +9114,10 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
_lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
else
@@ -21834,7 +21957,7 @@
else
_lt_dsymutil=
fi
-@@ -9662,2347 +9124,1548 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -9662,2347 +9125,1548 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
esac
@@ -23576,11 +23699,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:9654: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9655: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:9658: \$? = $ac_status" >&5
++ echo "$as_me:9659: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
@@ -24176,11 +24299,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:9993: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9994: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:9997: \$? = $ac_status" >&5
++ echo "$as_me:9998: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
@@ -24449,11 +24572,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:10098: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10099: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:10102: \$? = $ac_status" >&5
++ echo "$as_me:10103: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -24504,11 +24627,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:10153: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10154: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:10157: \$? = $ac_status" >&5
++ echo "$as_me:10158: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -25471,7 +25594,7 @@
;
return 0;
}
-@@ -12028,80 +10691,52 @@ $as_echo "$ac_try_echo") >&5
+@@ -12028,80 +10692,52 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -25579,7 +25702,7 @@
;
return 0;
}
-@@ -12127,140 +10762,242 @@ $as_echo "$ac_try_echo") >&5
+@@ -12127,140 +10763,242 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -25940,7 +26063,7 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
-@@ -12283,10307 +11020,7101 @@ $as_echo "$ac_try_echo") >&5
+@@ -12283,10307 +11021,7101 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -31558,7 +31681,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
-+#line 12969 "configure"
++#line 12970 "configure"
+#include "confdefs.h"
-# Source file extension for f77 test sources.
@@ -31683,7 +31806,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
-+#line 13065 "configure"
++#line 13066 "configure"
+#include "confdefs.h"
-ac_outfile=conftest.$ac_objext
@@ -42225,7 +42348,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -22592,130 +18123,78 @@ $as_echo "$ac_try_echo") >&5
+@@ -22592,130 +18124,78 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -42402,7 +42525,7 @@
;
return 0;
}
-@@ -22741,1157 +18220,810 @@ $as_echo "$ac_try_echo") >&5
+@@ -22741,1157 +18221,810 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -44192,7 +44315,7 @@
;
return 0;
}
-@@ -23917,73 +19049,58 @@ $as_echo "$ac_try_echo") >&5
+@@ -23917,73 +19050,58 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -44300,7 +44423,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23992,516 +19109,687 @@ $as_echo "$ac_try_echo") >&5
+@@ -23992,516 +19110,687 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -45382,7 +45505,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -24511,7 +19799,7 @@ do
+@@ -24511,7 +19800,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -45391,7 +45514,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -24519,44 +19807,91 @@ done
+@@ -24519,44 +19808,91 @@ done
done
IFS=$as_save_IFS
@@ -45503,7 +45626,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -24566,7 +19901,7 @@ do
+@@ -24566,7 +19902,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -45512,7 +45635,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -24574,5822 +19909,2583 @@ done
+@@ -24574,5822 +19910,2583 @@ done
done
IFS=$as_save_IFS
@@ -53579,8 +53702,8 @@
{ (exit 1); exit 1; }; }
Index: nautilus-2.26.2/cut-n-paste-code/libegg/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/cut-n-paste-code/libegg/Makefile.in 2009-04-25 00:43:02.289417568 +0200
-+++ nautilus-2.26.2/cut-n-paste-code/libegg/Makefile.in 2009-04-25 01:43:36.481912556 +0200
+--- nautilus-2.26.2.orig/cut-n-paste-code/libegg/Makefile.in 2009-05-31 13:32:23.458166040 +0200
++++ nautilus-2.26.2/cut-n-paste-code/libegg/Makefile.in 2009-05-31 13:49:02.389662224 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -53717,8 +53840,8 @@
tags: TAGS
Index: nautilus-2.26.2/cut-n-paste-code/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/cut-n-paste-code/Makefile.in 2009-04-25 00:43:02.257418806 +0200
-+++ nautilus-2.26.2/cut-n-paste-code/Makefile.in 2009-04-25 01:43:36.285914537 +0200
+--- nautilus-2.26.2.orig/cut-n-paste-code/Makefile.in 2009-05-31 13:32:23.390166963 +0200
++++ nautilus-2.26.2/cut-n-paste-code/Makefile.in 2009-05-31 13:49:02.213662695 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -53855,8 +53978,8 @@
tags: TAGS
Index: nautilus-2.26.2/data/icons/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/data/icons/Makefile.in 2009-04-25 00:43:02.229418178 +0200
-+++ nautilus-2.26.2/data/icons/Makefile.in 2009-04-25 01:43:36.665913244 +0200
+--- nautilus-2.26.2.orig/data/icons/Makefile.in 2009-05-31 13:32:23.362166825 +0200
++++ nautilus-2.26.2/data/icons/Makefile.in 2009-05-31 13:49:02.605662172 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -53984,8 +54107,8 @@
done; \
Index: nautilus-2.26.2/data/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/data/Makefile.in 2009-04-25 00:43:02.197417949 +0200
-+++ nautilus-2.26.2/data/Makefile.in 2009-04-25 01:43:36.577913718 +0200
+--- nautilus-2.26.2.orig/data/Makefile.in 2009-05-31 13:32:23.326167974 +0200
++++ nautilus-2.26.2/data/Makefile.in 2009-05-31 13:49:02.517662157 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -54122,8 +54245,8 @@
tags: TAGS
Index: nautilus-2.26.2/data/patterns/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/data/patterns/Makefile.in 2009-04-25 00:43:02.165414301 +0200
-+++ nautilus-2.26.2/data/patterns/Makefile.in 2009-04-25 01:43:36.753912771 +0200
+--- nautilus-2.26.2.orig/data/patterns/Makefile.in 2009-05-31 13:32:23.278165435 +0200
++++ nautilus-2.26.2/data/patterns/Makefile.in 2009-05-31 13:49:02.693661691 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -54251,8 +54374,8 @@
done; \
Index: nautilus-2.26.2/docs/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/docs/Makefile.in 2009-04-25 00:43:02.117416160 +0200
-+++ nautilus-2.26.2/docs/Makefile.in 2009-04-25 01:43:36.849912966 +0200
+--- nautilus-2.26.2.orig/docs/Makefile.in 2009-05-31 13:32:23.246168633 +0200
++++ nautilus-2.26.2/docs/Makefile.in 2009-05-31 13:49:02.785662272 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -54400,8 +54523,8 @@
tags: TAGS
Index: nautilus-2.26.2/docs/reference/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/docs/reference/libnautilus-extension/Makefile.in 2009-04-25 00:43:02.085416910 +0200
-+++ nautilus-2.26.2/docs/reference/libnautilus-extension/Makefile.in 2009-04-25 01:43:37.037914222 +0200
+--- nautilus-2.26.2.orig/docs/reference/libnautilus-extension/Makefile.in 2009-05-31 13:32:23.214167433 +0200
++++ nautilus-2.26.2/docs/reference/libnautilus-extension/Makefile.in 2009-05-31 13:49:02.986161991 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -54576,8 +54699,8 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: nautilus-2.26.2/docs/reference/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/docs/reference/Makefile.in 2009-04-25 00:43:02.069417040 +0200
-+++ nautilus-2.26.2/docs/reference/Makefile.in 2009-04-25 01:43:36.933913374 +0200
+--- nautilus-2.26.2.orig/docs/reference/Makefile.in 2009-05-31 13:32:23.178165652 +0200
++++ nautilus-2.26.2/docs/reference/Makefile.in 2009-05-31 13:49:02.873662285 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -54714,8 +54837,8 @@
tags: TAGS
Index: nautilus-2.26.2/eel/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/eel/Makefile.in 2009-04-25 00:43:02.053416681 +0200
-+++ nautilus-2.26.2/eel/Makefile.in 2009-04-25 01:43:37.177913932 +0200
+--- nautilus-2.26.2.orig/eel/Makefile.in 2009-05-31 13:32:23.150168939 +0200
++++ nautilus-2.26.2/eel/Makefile.in 2009-05-31 13:49:03.161662375 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -54942,8 +55065,8 @@
fi; \
Index: nautilus-2.26.2/icons/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/icons/Makefile.in 2009-04-25 00:43:02.041418858 +0200
-+++ nautilus-2.26.2/icons/Makefile.in 2009-04-25 01:43:37.265913948 +0200
+--- nautilus-2.26.2.orig/icons/Makefile.in 2009-05-31 13:32:23.097665199 +0200
++++ nautilus-2.26.2/icons/Makefile.in 2009-05-31 13:49:03.257661578 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -55071,8 +55194,8 @@
done; \
Index: nautilus-2.26.2/INSTALL
===================================================================
---- nautilus-2.26.2.orig/INSTALL 2009-04-25 00:43:02.025425834 +0200
-+++ nautilus-2.26.2/INSTALL 2009-04-25 01:43:38.037415416 +0200
+--- nautilus-2.26.2.orig/INSTALL 2009-05-31 13:32:23.061665859 +0200
++++ nautilus-2.26.2/INSTALL 2009-05-31 13:49:04.038163996 +0200
@@ -2,15 +2,15 @@ Installation Instructions
*************************
@@ -55254,8 +55377,8 @@
Index: nautilus-2.26.2/libnautilus-extension/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/libnautilus-extension/Makefile.in 2009-04-25 00:43:01.993414364 +0200
-+++ nautilus-2.26.2/libnautilus-extension/Makefile.in 2009-04-25 01:43:37.389915256 +0200
+--- nautilus-2.26.2.orig/libnautilus-extension/Makefile.in 2009-05-31 13:32:23.033666209 +0200
++++ nautilus-2.26.2/libnautilus-extension/Makefile.in 2009-05-31 13:49:03.381661905 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -55392,8 +55515,8 @@
tags: TAGS
Index: nautilus-2.26.2/libnautilus-private/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/libnautilus-private/Makefile.in 2009-04-25 00:43:01.977417921 +0200
-+++ nautilus-2.26.2/libnautilus-private/Makefile.in 2009-04-25 01:43:37.545915797 +0200
+--- nautilus-2.26.2.orig/libnautilus-private/Makefile.in 2009-05-31 13:32:23.005666069 +0200
++++ nautilus-2.26.2/libnautilus-private/Makefile.in 2009-05-31 13:49:03.541662556 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -55530,8 +55653,8 @@
tags: TAGS
Index: nautilus-2.26.2/ltmain.sh
===================================================================
---- nautilus-2.26.2.orig/ltmain.sh 2009-04-25 00:43:01.961414142 +0200
-+++ nautilus-2.26.2/ltmain.sh 2009-04-25 01:43:25.553923027 +0200
+--- nautilus-2.26.2.orig/ltmain.sh 2009-05-31 13:32:22.933663966 +0200
++++ nautilus-2.26.2/ltmain.sh 2009-05-31 13:48:51.617669349 +0200
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -69738,15 +69861,29 @@
+
Index: nautilus-2.26.2/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/Makefile.in 2009-04-25 00:43:01.933416452 +0200
-+++ nautilus-2.26.2/Makefile.in 2009-04-25 01:43:38.125913117 +0200
+--- nautilus-2.26.2.orig/Makefile.in 2009-05-31 13:32:22.905665294 +0200
++++ nautilus-2.26.2/Makefile.in 2009-05-31 13:49:04.141662278 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -115,10 +115,6 @@ CORE_CFLAGS = @CORE_CFLAGS@
+@@ -73,9 +73,11 @@ am__vpath_adj = case $$p in \
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(desktopdir)"
++am__installdirs = "$(DESTDIR)$(autostartdir)" \
++ "$(DESTDIR)$(desktopdir)"
++autostartDATA_INSTALL = $(INSTALL_DATA)
+ desktopDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(desktop_DATA)
++DATA = $(autostart_DATA) $(desktop_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+@@ -115,10 +117,6 @@ CORE_CFLAGS = @CORE_CFLAGS@
CORE_LIBS = @CORE_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
@@ -69757,7 +69894,7 @@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
-@@ -126,7 +122,7 @@ DEPDIR = @DEPDIR@
+@@ -126,7 +124,7 @@ DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
@@ -69766,7 +69903,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-@@ -140,8 +136,7 @@ EXEMPI_NEW_API_CFLAGS = @EXEMPI_NEW_API_
+@@ -140,8 +138,7 @@ EXEMPI_NEW_API_CFLAGS = @EXEMPI_NEW_API_
EXEMPI_NEW_API_LIBS = @EXEMPI_NEW_API_LIBS@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
@@ -69776,7 +69913,7 @@
GAIL_REQUIRED = @GAIL_REQUIRED@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-@@ -154,7 +149,6 @@ GMSGFMT = @GMSGFMT@
+@@ -154,7 +151,6 @@ GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_REQUIRED = @GNOME_DESKTOP_REQUIRED@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -69784,7 +69921,7 @@
GTK_REQUIRED = @GTK_REQUIRED@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -164,29 +158,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -164,29 +160,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
@@ -69815,7 +69952,7 @@
LDFLAGS = @LDFLAGS@
LIBEGG_CFLAGS = @LIBEGG_CFLAGS@
LIBEGG_LIBS = @LIBEGG_LIBS@
-@@ -195,6 +171,7 @@ LIBNAUTILUS_EXTENSION_LIBS = @LIBNAUTILU
+@@ -195,6 +173,7 @@ LIBNAUTILUS_EXTENSION_LIBS = @LIBNAUTILU
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -69823,7 +69960,7 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-@@ -205,9 +182,12 @@ MSGFMT = @MSGFMT@
+@@ -205,9 +184,12 @@ MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NAUTILUS_EXTENSION_VERSION_INFO = @NAUTILUS_EXTENSION_VERSION_INFO@
@@ -69836,7 +69973,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -246,8 +226,7 @@ abs_srcdir = @abs_srcdir@
+@@ -246,8 +228,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
@@ -69846,7 +69983,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +257,7 @@ libdir = @libdir@
+@@ -278,6 +259,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -69854,16 +69991,51 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -423,7 +403,7 @@ clean-libtool:
+@@ -297,7 +279,6 @@ NULL =
+ desktopdir = $(datadir)/applications
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ desktop_in_files = \
+- nautilus.desktop.in \
+ nautilus-home.desktop.in \
+ nautilus-computer.desktop.in \
+ nautilus-folder-handler.desktop.in \
+@@ -305,6 +286,9 @@ desktop_in_files = \
+ nautilus-browser.desktop.in \
+ nautilus-autorun-software.desktop.in
+
++autostartdir = $(datadir)/gnome/autostart
++autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
++autostart_in_files = nautilus.desktop.in
+ SUBDIRS = \
+ eel \
+ libnautilus-extension \
+@@ -423,7 +407,24 @@ clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
- -rm -f libtool
+ -rm -f libtool config.lt
++install-autostartDATA: $(autostart_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(autostartdir)" || $(MKDIR_P) "$(DESTDIR)$(autostartdir)"
++ @list='$(autostart_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f=$(am__strip_dir) \
++ echo " $(autostartDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(autostartdir)/$$f'"; \
++ $(autostartDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(autostartdir)/$$f"; \
++ done
++
++uninstall-autostartDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(autostart_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(autostartdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(autostartdir)/$$f"; \
++ done
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
-@@ -517,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -517,7 +518,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -69872,10 +70044,61 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
+@@ -725,7 +726,7 @@ check: check-recursive
+ all-am: Makefile $(DATA) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(desktopdir)"; do \
++ for dir in "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-recursive
+@@ -774,7 +775,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-desktopDATA
++install-data-am: install-autostartDATA install-desktopDATA
+
+ install-dvi: install-dvi-recursive
+
+@@ -810,7 +811,7 @@ ps: ps-recursive
+
+ ps-am:
+
+-uninstall-am: uninstall-desktopDATA
++uninstall-am: uninstall-autostartDATA uninstall-desktopDATA
+
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
+@@ -822,14 +823,15 @@ uninstall-am: uninstall-desktopDATA
+ distclean distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-desktopDATA install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am tags tags-recursive uninstall uninstall-am \
++ install-autostartDATA install-data install-data-am \
++ install-desktopDATA install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
++ installcheck-am installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-autostartDATA \
+ uninstall-desktopDATA
+
+
Index: nautilus-2.26.2/src/file-manager/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/src/file-manager/Makefile.in 2009-04-25 00:43:01.901413783 +0200
-+++ nautilus-2.26.2/src/file-manager/Makefile.in 2009-04-25 01:43:37.825914245 +0200
+--- nautilus-2.26.2.orig/src/file-manager/Makefile.in 2009-05-31 13:32:22.873667022 +0200
++++ nautilus-2.26.2/src/file-manager/Makefile.in 2009-05-31 13:49:03.825663026 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -70012,8 +70235,8 @@
tags: TAGS
Index: nautilus-2.26.2/src/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/src/Makefile.in 2009-04-25 00:43:01.869416980 +0200
-+++ nautilus-2.26.2/src/Makefile.in 2009-04-25 01:43:37.701914399 +0200
+--- nautilus-2.26.2.orig/src/Makefile.in 2009-05-31 13:32:22.841663860 +0200
++++ nautilus-2.26.2/src/Makefile.in 2009-05-31 13:49:03.701662218 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -70219,8 +70442,8 @@
fi; \
Index: nautilus-2.26.2/test/Makefile.in
===================================================================
---- nautilus-2.26.2.orig/test/Makefile.in 2009-04-25 00:43:01.845417421 +0200
-+++ nautilus-2.26.2/test/Makefile.in 2009-04-25 01:43:37.985913902 +0200
+--- nautilus-2.26.2.orig/test/Makefile.in 2009-05-31 13:32:22.797671677 +0200
++++ nautilus-2.26.2/test/Makefile.in 2009-05-31 13:49:03.982163228 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -70357,8 +70580,8 @@
tags: TAGS
Index: nautilus-2.26.2/gtk-doc.make
===================================================================
---- nautilus-2.26.2.orig/gtk-doc.make 2009-04-25 01:43:21.873920470 +0200
-+++ nautilus-2.26.2/gtk-doc.make 2009-04-25 01:43:24.976399480 +0200
+--- nautilus-2.26.2.orig/gtk-doc.make 2009-05-31 13:32:22.765665583 +0200
++++ nautilus-2.26.2/gtk-doc.make 2009-05-31 13:48:51.053665519 +0200
@@ -11,7 +11,7 @@ GTKDOC_RUN = $(LIBTOOL) --mode=execute
else
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=20191&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Sun May 31 12:04:12 2009
@@ -4,6 +4,7 @@
10_load_session.patch
11_restart_mode.patch
12_list-view_expand.patch
+13_autostart.patch
20_open-with_install.patch
90_relibtoolize.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list