[Pkg-cli-apps-commits] r3784 - /packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
diocles-guest at users.alioth.debian.org
diocles-guest at users.alioth.debian.org
Sun Mar 9 02:29:47 UTC 2008
Author: diocles-guest
Date: Sun Mar 9 02:29:46 2008
New Revision: 3784
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3784
Log:
Update 98_autoreconf.dpatch.
Modified:
packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
Modified: packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch?rev=3784&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Sun Mar 9 02:29:46 2008
@@ -5,41 +5,72 @@
## DP: No description.
@DPATCH@
-diff -urNad trunk~/FlickrNet/Makefile.in trunk/FlickrNet/Makefile.in
---- trunk~/FlickrNet/Makefile.in 2007-12-04 12:20:31.000000000 +0000
-+++ trunk/FlickrNet/Makefile.in 2008-01-13 17:09:51.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
- LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
- LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
- LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in 2007-12-04 12:20:34.000000000 +0000
-+++ trunk/Makefile.in 2008-01-13 17:09:56.000000000 +0000
-@@ -294,7 +294,6 @@
- $(DIR_DBUS) \
- $(DIR_DBUS_GLIB)\
- docs \
-- FlickrNet \
- SmugMugNet \
- glitz-sharp \
- google-sharp \
-@@ -306,7 +305,6 @@
+diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
+--- f-spot~/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/Makefile.in 2008-03-09 00:24:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -118,7 +118,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -167,14 +169,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -186,7 +186,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -208,13 +207,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -311,7 +313,6 @@
libgphoto2-sharp \
semweb \
Tao \
@@ -47,15 +78,7 @@
tools \
po \
src \
-@@ -316,7 +314,6 @@
- dbus-sharp \
- dbus-sharp-glib \
- docs \
-- FlickrNet \
- SmugMugNet \
- glitz-sharp \
- google-sharp \
-@@ -328,7 +325,6 @@
+@@ -330,7 +331,6 @@
libgphoto2-sharp \
semweb \
Tao \
@@ -63,286 +86,5576 @@
tools \
po \
src \
-diff -urNad trunk~/SmugMugNet/Makefile.in trunk/SmugMugNet/Makefile.in
---- trunk~/SmugMugNet/Makefile.in 2007-12-04 12:20:31.000000000 +0000
-+++ trunk/SmugMugNet/Makefile.in 2008-01-13 17:09:51.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+@@ -370,7 +370,6 @@
+ gnome-doc-utils.make \
+ $(desktop_files)
+
+-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+@@ -554,8 +553,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -580,8 +579,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -591,13 +590,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -668,6 +666,10 @@
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
++dist-lzma: distdir
++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++ $(am__remove_distdir)
++
+ dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+@@ -694,6 +696,8 @@
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ *.tar.lzma*) \
++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+@@ -850,8 +854,8 @@
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+- distclean-generic distclean-hdr distclean-libtool \
++ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
++ distclean distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install \
+ install-ApplicationsDATA install-am install-data \
+diff -urNad f-spot~/Tao/Makefile.in f-spot/Tao/Makefile.in
+--- f-spot~/Tao/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/Tao/Makefile.in 2008-03-09 00:24:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -87,7 +87,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -136,14 +138,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -155,7 +155,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -177,13 +176,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -388,8 +390,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -414,8 +416,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -425,13 +427,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/Tao/Tao.GlPostProcess/Makefile.in f-spot/Tao/Tao.GlPostProcess/Makefile.in
+--- f-spot~/Tao/Tao.GlPostProcess/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-03-09 00:24:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -76,7 +76,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -125,14 +127,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -144,7 +144,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -166,13 +165,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -278,9 +280,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/Tao/Tao.GlPostProcess/Makefile.in trunk/Tao/Tao.GlPostProcess/Makefile.in
---- trunk~/Tao/Tao.GlPostProcess/Makefile.in 2007-12-04 12:20:31.000000000 +0000
-+++ trunk/Tao/Tao.GlPostProcess/Makefile.in 2008-01-13 17:09:51.000000000 +0000
-@@ -270,15 +270,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/Tao/Tao.OpenGl/Makefile.in f-spot/Tao/Tao.OpenGl/Makefile.in
+--- f-spot~/Tao/Tao.OpenGl/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-03-09 00:24:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/Tao/Tao.OpenGl/Makefile.in trunk/Tao/Tao.OpenGl/Makefile.in
---- trunk~/Tao/Tao.OpenGl/Makefile.in 2007-12-04 12:20:31.000000000 +0000
-+++ trunk/Tao/Tao.OpenGl/Makefile.in 2008-01-13 17:09:52.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
+--- f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-03-09 00:24:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in trunk/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
---- trunk~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2007-12-04 12:20:31.000000000 +0000
-+++ trunk/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-01-13 17:09:52.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in f-spot/Tao/Tao.OpenGl.Glu/Makefile.in
+--- f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-03-09 00:24:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/Tao/Tao.OpenGl.Glu/Makefile.in trunk/Tao/Tao.OpenGl.Glu/Makefile.in
---- trunk~/Tao/Tao.OpenGl.Glu/Makefile.in 2007-12-04 12:20:31.000000000 +0000
-+++ trunk/Tao/Tao.OpenGl.Glu/Makefile.in 2008-01-13 17:09:52.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/aclocal.m4 f-spot/aclocal.m4
+--- f-spot~/aclocal.m4 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/aclocal.m4 2008-03-09 00:23:48.000000000 +0000
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.10 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006 Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,10 +11,13 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
+-m4_if(m4_PACKAGE_VERSION, [2.61],,
+-[m4_fatal([this file was generated for autoconf 2.61.
+-You have another version of autoconf. If you want to use that,
+-you should regenerate the build system entirely.], [63])])
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(AC_AUTOCONF_VERSION, [2.61],,
++[m4_warning([this file was generated for autoconf 2.61.
++You have another version of autoconf. It may work, but is not guaranteed to.
++If you have problems, you may need to regenerate the build system entirely.
++To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+ dnl AM_GCONF_SOURCE_2
+ dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+@@ -60,8 +63,8 @@
+ # Owen Taylor 1997-2001
+
+ dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
+-dnl gthread, or gio is specified in MODULES, pass to pkg-config
++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
++dnl gthread is specified in MODULES, pass to pkg-config
+ dnl
+ AC_DEFUN([AM_PATH_GLIB_2_0],
+ [dnl
+@@ -86,9 +89,6 @@
+ gthread)
+ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
+- gio*)
+- pkg_config_args="$pkg_config_args $module-2.0"
+- ;;
+ esac
+ done
+
+@@ -371,7 +371,8 @@
+ #-----------------
+ glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+- [USE_NLS=yes
++ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
++ USE_NLS=yes
+ AC_SUBST(USE_NLS)
+
+ gt_cv_have_gettext=no
+@@ -623,6 +624,18 @@
+ fi
+ fi
+
++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
++ dnl Try to locate is.
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++ AC_SUBST(MKINSTALLDIRS)
++
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
+@@ -859,6 +872,10 @@
+ enable_scrollkeeper=yes)
+ AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
+
++dnl disable scrollkeeper automatically for distcheck
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
++
+ AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
+ ])
+
+@@ -882,7 +899,7 @@
+
+
+ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+-# serial 35 IT_PROG_INTLTOOL
++# serial 36 IT_PROG_INTLTOOL
+ AC_DEFUN([IT_PROG_INTLTOOL],
+ [AC_PREREQ([2.50])dnl
+
+@@ -895,7 +912,7 @@
+ esac
+
+ if test -n "$1"; then
+- AC_MSG_CHECKING(for intltool >= $1)
++ AC_MSG_CHECKING([for intltool >= $1])
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+@@ -924,6 +941,7 @@
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+ AC_SUBST(INTLTOOL_DESKTOP_RULE)
+ AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+@@ -943,6 +961,21 @@
+ AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+ AC_SUBST(INTLTOOL_THEME_RULE)
+ AC_SUBST(INTLTOOL_SERVICE_RULE)
++AC_SUBST(INTLTOOL_POLICY_RULE)
++
++# Check the gettext tools to make sure they are GNU
++AC_PATH_PROG(XGETTEXT, xgettext)
++AC_PATH_PROG(MSGMERGE, msgmerge)
++AC_PATH_PROG(MSGFMT, msgfmt)
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
+
+ # Use the tools built into the package, not the ones that are installed.
+ AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+@@ -965,19 +998,16 @@
+ fi
+ fi
+
+-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
+-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
+-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
+-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
+-
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+
+ # Set DATADIRNAME correctly if it is not set yet
+ # (copied from glib-gettext.m4)
+ if test -z "$DATADIRNAME"; then
+- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr],
++ AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[]],
++ [[extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr]])],
+ [DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+@@ -1018,10 +1048,6 @@
+ for file in intltool-extract intltool-merge intltool-update; do
+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
+- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
+- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
+- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+ < ${ac_aux_dir}/${file}.in > ${file}.out
+ if cmp -s ${file} ${file}.out 2>/dev/null; then
+@@ -1036,9 +1062,7 @@
+ ],
+ [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+ prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
+-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
+-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
+
+ ])
+
+@@ -1087,7 +1111,7 @@
+
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+-# serial 51 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+
+
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -1175,7 +1199,6 @@
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -1277,6 +1300,8 @@
+ ;;
+ esac
+
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -1356,9 +1381,80 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ ])# _LT_LINKER_BOILERPLATE
+
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
+
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+@@ -1683,7 +1779,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
+@@ -1776,7 +1876,7 @@
+ $2=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+ ])
+
+@@ -2047,7 +2147,7 @@
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+@@ -2055,7 +2155,7 @@
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -2372,7 +2472,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -2713,6 +2813,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -2893,6 +3005,13 @@
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
+
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -3392,7 +3511,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -3487,7 +3606,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -3828,7 +3947,7 @@
+ fi
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -3885,6 +4004,7 @@
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -3994,7 +4114,7 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -4007,7 +4127,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -4153,51 +4273,23 @@
+ fi
+ ;;
+ darwin* | rhapsody*)
+- case $host_os in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+- if test "$GXX" = yes ; then
+- lt_int_apple_cc_single_mod=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ case $cc_basename in
+ xlc*)
+@@ -4448,7 +4540,7 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -4521,7 +4613,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -4883,7 +4975,8 @@
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library. It's possible we should let each
+@@ -5008,6 +5101,11 @@
+
+ $rm -f confest.$objext
+
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ ifelse([$1],[CXX],
+ [case $host_os in
+@@ -5064,7 +5162,6 @@
+ ;;
+ esac
+ ])
+-
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -5149,7 +5246,7 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -5326,6 +5423,7 @@
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -5388,7 +5486,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -5625,6 +5723,10 @@
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -5974,7 +6076,7 @@
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -6031,7 +6133,8 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+@@ -6068,7 +6171,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -6164,7 +6267,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+@@ -6202,7 +6305,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -6315,7 +6418,8 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ darwin* | rhapsody*)
+@@ -6385,7 +6489,8 @@
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -6522,7 +6627,7 @@
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+@@ -6546,7 +6651,7 @@
+ #
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+@@ -6562,7 +6667,7 @@
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # 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
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -6577,10 +6682,14 @@
+ cygwin* | mingw*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -6611,12 +6720,14 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # 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
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ _LT_CC_BASENAME([$compiler])
+@@ -6666,7 +6777,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -6782,12 +6893,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -6885,7 +6997,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -6905,7 +7017,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -7065,11 +7177,10 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -7219,7 +7330,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -7798,7 +7909,7 @@
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+@@ -7808,7 +7919,7 @@
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -7823,7 +7934,7 @@
+ [am__api_version='1.10'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.10], [],
++m4_if([$1], [1.10.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -7839,8 +7950,10 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.10])dnl
+-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+@@ -8112,7 +8225,7 @@
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+@@ -8172,13 +8285,13 @@
+ # Do all the work for Automake. -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006 Free Software Foundation, Inc.
++# 2005, 2006, 2008 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 12
++# serial 13
+
+ # This macro actually does too much. Some checks are only needed if
+ # your package does certain things. But this isn't really a big deal.
+@@ -8283,16 +8396,17 @@
+ # our stamp files there.
+ AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+ [# Compute $1's index in $config_headers.
++_am_arg=$1
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+- $1 | $1:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+ # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+ #
+@@ -8610,7 +8724,7 @@
+
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+ # This macro is traced by Automake.
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+diff -urNad f-spot~/configure f-spot/configure
+--- f-spot~/configure 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/configure 2008-03-09 00:23:48.000000000 +0000
+@@ -847,14 +847,14 @@
+ INTLTOOL_SCHEMAS_RULE
+ INTLTOOL_THEME_RULE
+ INTLTOOL_SERVICE_RULE
++INTLTOOL_POLICY_RULE
++XGETTEXT
++MSGMERGE
++MSGFMT
+ INTLTOOL_EXTRACT
+ INTLTOOL_MERGE
+ INTLTOOL_UPDATE
+ INTLTOOL_PERL
+-INTLTOOL_ICONV
+-INTLTOOL_MSGFMT
+-INTLTOOL_MSGMERGE
+-INTLTOOL_XGETTEXT
+ ALL_LINGUAS
+ CC
+ CFLAGS
+@@ -889,6 +889,8 @@
+ ECHO
+ AR
+ RANLIB
++DSYMUTIL
++NMEDIT
+ CXX
+ CXXFLAGS
+ ac_ct_CXX
+@@ -914,6 +916,7 @@
+ DOC_USER_FORMATS
+ ENABLE_SK_TRUE
+ ENABLE_SK_FALSE
++DISTCHECK_CONFIGURE_FLAGS
+ HAVE_GNOME_DOC_UTILS_TRUE
+ HAVE_GNOME_DOC_UTILS_FALSE
+ F_CFLAGS
+@@ -969,10 +972,8 @@
+ ICONS_DIRECTORY
+ GETTEXT_PACKAGE
+ USE_NLS
+-MSGFMT
+ MSGFMT_OPTS
+ GMSGFMT
+-XGETTEXT
+ CATALOGS
+ CATOBJEXT
+ GMOFILES
+@@ -982,6 +983,7 @@
+ PO_IN_DATADIR_FALSE
+ POFILES
+ POSUB
++MKINSTALLDIRS
+ LIBJPEG
+ CSC
+ expanded_libdir
+@@ -3862,6 +3864,7 @@
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
+
+
+@@ -3882,24 +3885,18 @@
+
+
+
+-# Use the tools built into the package, not the ones that are installed.
+-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+-
+-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+-
+-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
+-
+
+-# Extract the first word of "perl", so it can be a program name with args.
+-set dummy perl; ac_word=$2
++# Check the gettext tools to make sure they are GNU
++# Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $INTLTOOL_PERL in
++ case $XGETTEXT in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -3909,7 +3906,7 @@
+ 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
+- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -3920,49 +3917,26 @@
+ ;;
+ esac
+ fi
+-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+-if test -n "$INTLTOOL_PERL"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
++XGETTEXT=$ac_cv_path_XGETTEXT
++if test -n "$XGETTEXT"; then
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
+-if test -z "$INTLTOOL_PERL"; then
+- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+-echo "$as_me: error: perl not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+-echo "$as_me: error: perl 5.x required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test "x" != "xno-xml"; then
+- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
+-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6; }
+- else
+- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+-
+-# Extract the first word of "iconv", so it can be a program name with args.
+-set dummy iconv; ac_word=$2
++# Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
++if test "${ac_cv_path_MSGMERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $INTLTOOL_ICONV in
++ case $MSGMERGE in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -3972,7 +3946,7 @@
+ 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
+- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -3980,14 +3954,13 @@
+ done
+ IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
+ ;;
+ esac
+ fi
+-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
+-if test -n "$INTLTOOL_ICONV"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
+-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
++MSGMERGE=$ac_cv_path_MSGMERGE
++if test -n "$MSGMERGE"; then
++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++echo "${ECHO_T}$MSGMERGE" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -3998,12 +3971,12 @@
+ set dummy msgfmt; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $INTLTOOL_MSGFMT in
++ case $MSGFMT in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4013,7 +3986,7 @@
+ 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
+- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -4021,71 +3994,51 @@
+ done
+ IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
+ ;;
+ esac
+ fi
+-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
+-if test -n "$INTLTOOL_MSGFMT"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
+-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
++MSGFMT=$ac_cv_path_MSGFMT
++if test -n "$MSGFMT"; then
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
+-# Extract the first word of "msgmerge", so it can be a program name with args.
+-set dummy msgmerge; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $INTLTOOL_MSGMERGE in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- 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
+- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
+- ;;
+-esac
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
+-if test -n "$INTLTOOL_MSGMERGE"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
+-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+
++# Use the tools built into the package, not the ones that are installed.
++INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
++
++INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+
+-# Extract the first word of "xgettext", so it can be a program name with args.
+-set dummy xgettext; ac_word=$2
++INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
++
++
++# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $INTLTOOL_XGETTEXT in
++ case $INTLTOOL_PERL in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
++ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4095,7 +4048,7 @@
+ 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
+- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -4103,20 +4056,41 @@
+ done
+ IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
+ ;;
+ esac
+ fi
+-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
+-if test -n "$INTLTOOL_XGETTEXT"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
+-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
++INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
++if test -n "$INTLTOOL_PERL"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
++if test -z "$INTLTOOL_PERL"; then
++ { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
++echo "$as_me: error: perl not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
++ { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
++echo "$as_me: error: perl 5.x required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test "x" != "xno-xml"; then
++ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
++echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
++ else
++ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
++echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++fi
+
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+
+@@ -4135,7 +4109,7 @@
+ main ()
+ {
+ extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr
++ return _nl_msg_cat_cntr
+ ;
+ return 0;
+ }
+@@ -6136,7 +6110,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -6231,7 +6205,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -6351,7 +6325,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6354 "configure"' > conftest.$ac_ext
++ echo '#line 6328 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -6523,7 +6497,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
+@@ -7715,7 +7693,6 @@
+
+
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-
+ # find the maximum length of command line arguments
+ { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+ echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+@@ -8030,7 +8007,7 @@
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -8590,6 +8567,318 @@
+ ;;
+ esac
+
++
++ case $host_os in
++ rhapsody* | darwin*)
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$DSYMUTIL"; then
++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ 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
++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++echo "${ECHO_T}$DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_DSYMUTIL"; then
++ ac_ct_DSYMUTIL=$DSYMUTIL
++ # Extract the first word of "dsymutil", so it can be a program name with args.
++set dummy dsymutil; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_DSYMUTIL"; then
++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ 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
++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
++if test -n "$ac_ct_DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_DSYMUTIL" = x; then
++ DSYMUTIL=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ DSYMUTIL=$ac_ct_DSYMUTIL
++ fi
++else
++ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
++fi
++
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
++set dummy ${ac_tool_prefix}nmedit; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$NMEDIT"; then
++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ 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
++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++NMEDIT=$ac_cv_prog_NMEDIT
++if test -n "$NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
++echo "${ECHO_T}$NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_NMEDIT"; then
++ ac_ct_NMEDIT=$NMEDIT
++ # Extract the first word of "nmedit", so it can be a program name with args.
++set dummy nmedit; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_NMEDIT"; then
++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ 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
++ ac_cv_prog_ac_ct_NMEDIT="nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
++if test -n "$ac_ct_NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_NMEDIT" = x; then
++ NMEDIT=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ NMEDIT=$ac_ct_NMEDIT
++ fi
++else
++ NMEDIT="$ac_cv_prog_NMEDIT"
++fi
++
++
++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ lt_cv_ld_exported_symbols_list=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ lt_cv_ld_exported_symbols_list=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
++ case $host_os in
++ rhapsody* | darwin1.[0123])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[012]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++
++
+ enable_dlopen=no
+ enable_win32_dll=no
+
+@@ -8655,7 +8944,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+
+@@ -8683,11 +8972,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:8686: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8975: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8690: \$? = $ac_status" >&5
++ echo "$as_me:8979: \$? = $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.
+@@ -8957,10 +9246,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works=no
++ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+@@ -8973,27 +9262,27 @@
+ -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:8976: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9265: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8980: \$? = $ac_status" >&5
++ echo "$as_me:9269: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works=yes
++ lt_cv_prog_compiler_pic_works=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -9020,10 +9309,10 @@
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works=no
++ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -9036,20 +9325,20 @@
+ $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
+- lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ else
+- lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+
+-if test x"$lt_prog_compiler_static_works" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+ else
+ lt_prog_compiler_static=
+@@ -9077,11 +9366,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:9080: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9369: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9084: \$? = $ac_status" >&5
++ echo "$as_me:9373: \$? = $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
+@@ -9161,12 +9450,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # 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
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -9225,7 +9515,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+@@ -9341,12 +9631,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs=no
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -9444,7 +9735,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -9464,7 +9755,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -9736,11 +10027,10 @@
+ link_all_deplibs=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -9890,7 +10180,7 @@
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -10260,7 +10550,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -10601,6 +10891,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -10782,6 +11084,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -11101,7 +11418,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ { echo "$as_me:$LINENO: checking for dlopen" >&5
+ echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+@@ -11377,7 +11694,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+
+@@ -11426,7 +11743,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11429 "configure"
++#line 11746 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11526,7 +11843,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11529 "configure"
++#line 11846 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11653,7 +11970,7 @@
+ fi
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -11709,6 +12026,7 @@
+ predeps \
+ postdeps \
+ compiler_lib_search_path \
++ compiler_lib_search_dirs \
+ archive_cmds \
+ archive_expsym_cmds \
+ postinstall_cmds \
+@@ -11769,7 +12087,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -12005,6 +12323,10 @@
+ # shared library.
+ postdeps=$lt_postdeps
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path
+@@ -12253,6 +12575,7 @@
+ predeps_CXX=
+ postdeps_CXX=
+ compiler_lib_search_path_CXX=
++compiler_lib_search_dirs_CXX=
+
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -12290,7 +12613,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -12497,7 +12820,7 @@
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -12510,7 +12833,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -12768,51 +13091,23 @@
+ fi
+ ;;
+ darwin* | rhapsody*)
+- case $host_os in
+- rhapsody* | darwin1.[012])
+- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- ;;
+- 10.*)
+- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+ archive_cmds_need_lc_CXX=no
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
+-
+- if test "$GXX" = yes ; then
+- lt_int_apple_cc_single_mod=no
++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
+- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- fi
+- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ case $cc_basename in
+ xlc*)
+@@ -13063,7 +13358,7 @@
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -13136,7 +13431,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -13470,7 +13765,6 @@
+ GCC_CXX="$GXX"
+ LD_CXX="$LD"
+
+-
+ cat > conftest.$ac_ext <<EOF
+ class Foo
+ {
+@@ -13572,6 +13866,11 @@
+
+ $rm -f confest.$objext
+
++compiler_lib_search_dirs_CXX=
++if test -n "$compiler_lib_search_path_CXX"; then
++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+ interix[3-9]*)
+@@ -13627,7 +13926,6 @@
+ ;;
+ esac
+
+-
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13703,7 +14001,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -13799,7 +14097,7 @@
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-static'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-fpic'
+@@ -13837,7 +14135,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -13930,10 +14228,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_CXX=no
++ lt_cv_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+@@ -13946,27 +14244,27 @@
+ -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:13949: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14247: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:13953: \$? = $ac_status" >&5
++ echo "$as_me:14251: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_CXX=yes
++ lt_cv_prog_compiler_pic_works_CXX=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+ case $lt_prog_compiler_pic_CXX in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+@@ -13993,10 +14291,10 @@
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_CXX=no
++ lt_cv_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -14009,20 +14307,20 @@
+ $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
+- lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ else
+- lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_CXX=
+@@ -14050,11 +14348,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:14053: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14351: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14057: \$? = $ac_status" >&5
++ echo "$as_me:14355: \$? = $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
+@@ -14107,7 +14405,7 @@
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # 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
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -14122,10 +14420,14 @@
+ cygwin* | mingw*)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs_CXX=no
++ ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
+ { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+@@ -14227,7 +14529,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -14567,6 +14869,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -14748,6 +15062,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -14831,6 +15160,7 @@
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX \
++ compiler_lib_search_dirs_CXX \
+ archive_cmds_CXX \
+ archive_expsym_cmds_CXX \
+ postinstall_cmds_CXX \
+@@ -15079,6 +15409,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_CXX
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+@@ -15293,7 +15627,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -15331,7 +15665,7 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4* | aix5*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -15596,10 +15930,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_F77=no
++ lt_cv_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_F77"
+@@ -15612,27 +15946,27 @@
+ -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:15615: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15949: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15619: \$? = $ac_status" >&5
++ echo "$as_me:15953: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_F77=yes
++ lt_cv_prog_compiler_pic_works_F77=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+@@ -15659,10 +15993,10 @@
+ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_F77=no
++ lt_cv_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -15675,20 +16009,20 @@
+ $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
+- lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ else
+- lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_F77=
+@@ -15716,11 +16050,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:15719: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16053: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15723: \$? = $ac_status" >&5
++ echo "$as_me:16057: \$? = $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
+@@ -15800,12 +16134,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # 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
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -15864,7 +16199,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_F77=no
+@@ -15980,12 +16315,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -16083,7 +16419,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -16103,7 +16439,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -16355,11 +16691,10 @@
+ link_all_deplibs_F77=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -16509,7 +16844,7 @@
+ link_all_deplibs_F77=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -16828,7 +17163,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -17168,6 +17503,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -17349,6 +17696,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -17432,6 +17794,7 @@
+ predeps_F77 \
+ postdeps_F77 \
+ compiler_lib_search_path_F77 \
++ compiler_lib_search_dirs_F77 \
+ archive_cmds_F77 \
+ archive_expsym_cmds_F77 \
+ postinstall_cmds_F77 \
+@@ -17680,6 +18043,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_F77
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+@@ -17854,7 +18221,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -17903,11 +18270,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:17906: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18273: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17910: \$? = $ac_status" >&5
++ echo "$as_me:18277: \$? = $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.
+@@ -17967,7 +18334,7 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+ ;;
+
+ darwin* | rhapsody*)
+@@ -18037,7 +18404,7 @@
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -18177,10 +18544,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_GCJ=no
++ lt_cv_prog_compiler_pic_works_GCJ=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+@@ -18193,27 +18560,27 @@
+ -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:18196: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18563: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18200: \$? = $ac_status" >&5
++ echo "$as_me:18567: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_GCJ=yes
++ lt_cv_prog_compiler_pic_works_GCJ=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+@@ -18240,10 +18607,10 @@
+ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_GCJ=no
++ lt_cv_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -18256,20 +18623,20 @@
+ $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
+- lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ else
+- lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_GCJ=
+@@ -18297,11 +18664,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:18300: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18667: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:18304: \$? = $ac_status" >&5
++ echo "$as_me:18671: \$? = $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
+@@ -18381,12 +18748,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # 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
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -18445,7 +18813,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_GCJ=no
+@@ -18561,12 +18929,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -18664,7 +19033,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -18684,7 +19053,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -18956,11 +19325,10 @@
+ link_all_deplibs_GCJ=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -19110,7 +19478,7 @@
+ link_all_deplibs_GCJ=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -19429,7 +19797,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -19769,6 +20137,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -19950,6 +20330,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -20033,6 +20428,7 @@
+ predeps_GCJ \
+ postdeps_GCJ \
+ compiler_lib_search_path_GCJ \
++ compiler_lib_search_dirs_GCJ \
+ archive_cmds_GCJ \
+ archive_expsym_cmds_GCJ \
+ postinstall_cmds_GCJ \
+@@ -20281,6 +20677,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_GCJ
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+@@ -20454,7 +20854,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -20514,6 +20914,7 @@
+ predeps_RC \
+ postdeps_RC \
+ compiler_lib_search_path_RC \
++ compiler_lib_search_dirs_RC \
+ archive_cmds_RC \
+ archive_expsym_cmds_RC \
+ postinstall_cmds_RC \
+@@ -20762,6 +21163,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_RC
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+@@ -21106,9 +21511,6 @@
+ gthread)
+ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
+- gio*)
+- pkg_config_args="$pkg_config_args $module-2.0"
+- ;;
+ esac
+ done
+
+@@ -21651,6 +22053,9 @@
+ fi
+
+
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++
++
+ if test "$gdu_cv_have_gdu" = "yes"; then
+ HAVE_GNOME_DOC_UTILS_TRUE=
+ HAVE_GNOME_DOC_UTILS_FALSE='#'
+@@ -21794,7 +22199,7 @@
+ and F_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -21804,7 +22209,7 @@
+ and F_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -21908,7 +22313,7 @@
+ and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -21918,7 +22323,7 @@
+ and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -22020,7 +22425,7 @@
+ and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -22030,7 +22435,7 @@
+ and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -22133,7 +22538,7 @@
+ and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -22143,7 +22548,7 @@
+ and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -22274,7 +22679,7 @@
+ and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -22284,7 +22689,7 @@
+ and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -23925,7 +24330,7 @@
+ and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -23935,7 +24340,7 @@
+ and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -24039,7 +24444,7 @@
+ and EXIF_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -24049,7 +24454,7 @@
+ and EXIF_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -24394,7 +24799,7 @@
+
+ fi
+ fi
+- USE_NLS=yes
++ USE_NLS=yes
+
+
+ gt_cv_have_gettext=no
+@@ -25686,6 +26091,15 @@
+ fi
+ fi
+
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++
++
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+@@ -26355,9 +26769,7 @@
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+ prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
+-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
+-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
+
+
+ _ACEOF
+@@ -26560,14 +26972,14 @@
+ INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
+ INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
+ INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
++INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++MSGMERGE!$MSGMERGE$ac_delim
++MSGFMT!$MSGFMT$ac_delim
+ INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+ INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+ INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+ INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
+-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
+-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
+-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
+-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
+ ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+ CC!$CC$ac_delim
+ CFLAGS!$CFLAGS$ac_delim
+@@ -26643,6 +27055,8 @@
+ ECHO!$ECHO$ac_delim
+ AR!$AR$ac_delim
+ RANLIB!$RANLIB$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
++NMEDIT!$NMEDIT$ac_delim
+ CXX!$CXX$ac_delim
+ CXXFLAGS!$CXXFLAGS$ac_delim
+ ac_ct_CXX!$ac_ct_CXX$ac_delim
+@@ -26668,6 +27082,7 @@
+ DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
+ ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
+ ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
++DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim
+ HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
+ HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
+ F_CFLAGS!$F_CFLAGS$ac_delim
+@@ -26712,9 +27127,6 @@
+ LIBGPHOTO2_LIBS!$LIBGPHOTO2_LIBS$ac_delim
+ EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim
+ EXIF_LIBS!$EXIF_LIBS$ac_delim
+-LIBEXIF_VERSION_CHECK_CFLAGS!$LIBEXIF_VERSION_CHECK_CFLAGS$ac_delim
+-LIBEXIF_VERSION_CHECK_LIBS!$LIBEXIF_VERSION_CHECK_LIBS$ac_delim
+-EXIF_SOVERSION!$EXIF_SOVERSION$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -26756,6 +27168,9 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++LIBEXIF_VERSION_CHECK_CFLAGS!$LIBEXIF_VERSION_CHECK_CFLAGS$ac_delim
++LIBEXIF_VERSION_CHECK_LIBS!$LIBEXIF_VERSION_CHECK_LIBS$ac_delim
++EXIF_SOVERSION!$EXIF_SOVERSION$ac_delim
+ WITH_TURTLE_TRUE!$WITH_TURTLE_TRUE$ac_delim
+ WITH_TURTLE_FALSE!$WITH_TURTLE_FALSE$ac_delim
+ TURTLEDIR!$TURTLEDIR$ac_delim
+@@ -26764,10 +27179,8 @@
+ ICONS_DIRECTORY!$ICONS_DIRECTORY$ac_delim
+ GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+ USE_NLS!$USE_NLS$ac_delim
+-MSGFMT!$MSGFMT$ac_delim
+ MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+ GMSGFMT!$GMSGFMT$ac_delim
+-XGETTEXT!$XGETTEXT$ac_delim
+ CATALOGS!$CATALOGS$ac_delim
+ CATOBJEXT!$CATOBJEXT$ac_delim
+ GMOFILES!$GMOFILES$ac_delim
+@@ -26777,6 +27190,7 @@
+ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+ POFILES!$POFILES$ac_delim
+ POSUB!$POSUB$ac_delim
++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+ LIBJPEG!$LIBJPEG$ac_delim
+ CSC!$CSC$ac_delim
+ expanded_libdir!$expanded_libdir$ac_delim
+@@ -26785,7 +27199,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -27186,21 +27600,22 @@
+ fi
+ rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
++_am_arg=$ac_file
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+- $ac_file | $ac_file:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X$ac_file : 'X\(//\)[^/]' \| \
+- X$ac_file : 'X\(//\)$' \| \
+- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+-echo X$ac_file |
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$_am_arg" : 'X\(//\)[^/]' \| \
++ X"$_am_arg" : 'X\(//\)$' \| \
++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$_am_arg" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -27237,7 +27652,7 @@
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+@@ -27356,10 +27771,6 @@
+ for file in intltool-extract intltool-merge intltool-update; do
+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
+- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
+- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
+- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+ < ${ac_aux_dir}/${file}.in > ${file}.out
+ if cmp -s ${file} ${file}.out 2>/dev/null; then
+diff -urNad f-spot~/dbus-sharp/Makefile.in f-spot/dbus-sharp/Makefile.in
+--- f-spot~/dbus-sharp/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/dbus-sharp/Makefile.in 2008-03-09 00:24:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/dbus-sharp/Makefile.in trunk/dbus-sharp/Makefile.in
---- trunk~/dbus-sharp/Makefile.in 2007-12-04 12:20:31.000000000 +0000
-+++ trunk/dbus-sharp/Makefile.in 2008-01-13 17:09:53.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/dbus-sharp-glib/Makefile.in f-spot/dbus-sharp-glib/Makefile.in
+--- f-spot~/dbus-sharp-glib/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/dbus-sharp-glib/Makefile.in 2008-03-09 00:24:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/dbus-sharp-glib/Makefile.in trunk/dbus-sharp-glib/Makefile.in
---- trunk~/dbus-sharp-glib/Makefile.in 2007-12-04 12:20:31.000000000 +0000
-+++ trunk/dbus-sharp-glib/Makefile.in 2008-01-13 17:09:52.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/docs/Makefile.in f-spot/docs/Makefile.in
+--- f-spot~/docs/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/docs/Makefile.in 2008-03-09 00:24:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -100,7 +100,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -149,14 +151,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -168,7 +168,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -190,13 +189,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+diff -urNad f-spot~/extensions/CDExport/Makefile.in f-spot/extensions/CDExport/Makefile.in
+--- f-spot~/extensions/CDExport/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/CDExport/Makefile.in 2008-03-09 00:24:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/extensions/DefaultExporters/Makefile.in trunk/extensions/DefaultExporters/Makefile.in
---- trunk~/extensions/DefaultExporters/Makefile.in 2007-12-04 12:20:32.000000000 +0000
-+++ trunk/extensions/DefaultExporters/Makefile.in 2008-01-13 17:09:53.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/extensions/DefaultExporters/Makefile.in f-spot/extensions/DefaultExporters/Makefile.in
+--- f-spot~/extensions/DefaultExporters/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/DefaultExporters/Makefile.in 2008-03-09 00:24:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/extensions/GalleryExport/Makefile.in trunk/extensions/GalleryExport/Makefile.in
---- trunk~/extensions/GalleryExport/Makefile.in 2007-12-04 12:20:32.000000000 +0000
-+++ trunk/extensions/GalleryExport/Makefile.in 2008-01-13 17:09:53.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in f-spot/extensions/FlickrExport/FlickrNet/Makefile.in
+--- f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-03-09 00:24:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/glitz-sharp/src/Makefile.in trunk/glitz-sharp/src/Makefile.in
---- trunk~/glitz-sharp/src/Makefile.in 2007-12-04 12:20:32.000000000 +0000
-+++ trunk/glitz-sharp/src/Makefile.in 2008-01-13 17:09:53.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/extensions/FlickrExport/Makefile.in f-spot/extensions/FlickrExport/Makefile.in
+--- f-spot~/extensions/FlickrExport/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/FlickrExport/Makefile.in 2008-03-09 00:24:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -45,13 +45,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -61,11 +54,6 @@
+ am__installdirs = "$(DESTDIR)$(plugindir)"
+ pluginDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(plugin_DATA)
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+@@ -98,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -147,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -166,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -188,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -300,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/gnome-keyring-sharp/Makefile.in trunk/gnome-keyring-sharp/Makefile.in
---- trunk~/gnome-keyring-sharp/Makefile.in 2007-12-04 12:20:32.000000000 +0000
-+++ trunk/gnome-keyring-sharp/Makefile.in 2008-01-13 17:09:54.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+@@ -326,16 +316,13 @@
+ -r:../../src/FSpot.Core.dll \
+ -r:../../src/FSpot.Utils.dll \
+ -r:../../semweb/SemWeb.dll \
+- -r:FlickrNet/FlickrNet.dll \
+ -r:Mono.Posix
+
+ PKGS = \
++ -pkg:flickrnet-2.1.5 \
+ -pkg:gtk-sharp-2.0 \
+ -pkg:glade-sharp-2.0
+
+-SUBDIRS = \
+- FlickrNet
+-
+ RESOURCES = \
+ -resource:$(srcdir)/$(PLUGIN_MANIFEST) \
+ -resource:$(srcdir)/$(PLUGIN_NAME).glade
+@@ -354,7 +341,7 @@
+ $(PLUGIN_ASSEMBLY).mdb \
+ *.mpack
+
+-all: all-recursive
++all: all-am
+
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
+@@ -409,137 +396,12 @@
+ echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(plugindir)/$$f"; \
+ done
+-
+-# This directory's subdirectories are mostly independent; you can cd
+-# into them and run `make' without going through this Makefile.
+-# To change the values of `make' variables: instead of editing Makefiles,
+-# (1) if the variable is set in `config.status', edit `config.status'
+-# (which will cause the Makefiles to be regenerated when you run `make');
+-# (2) otherwise, pass the desired values on the `make' command line.
+-$(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
+- dot_seen=no; \
+- target=`echo $@ | sed s/-recursive//`; \
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- echo "Making $$target in $$subdir"; \
+- if test "$$subdir" = "."; then \
+- dot_seen=yes; \
+- local_target="$$target-am"; \
+- else \
+- local_target="$$target"; \
+- fi; \
+- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
+- done; \
+- if test "$$dot_seen" = "no"; then \
+- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+- fi; test -z "$$fail"
+-
+-$(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
+- dot_seen=no; \
+- case "$@" in \
+- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+- *) list='$(SUBDIRS)' ;; \
+- esac; \
+- rev=''; for subdir in $$list; do \
+- if test "$$subdir" = "."; then :; else \
+- rev="$$subdir $$rev"; \
+- fi; \
+- done; \
+- rev="$$rev ."; \
+- target=`echo $@ | sed s/-recursive//`; \
+- for subdir in $$rev; do \
+- echo "Making $$target in $$subdir"; \
+- if test "$$subdir" = "."; then \
+- local_target="$$target-am"; \
+- else \
+- local_target="$$target"; \
+- fi; \
+- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
+- done && test -z "$$fail"
+-tags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+- done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
+-
+-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- mkid -fID $$unique
+ tags: TAGS
++TAGS:
+
+-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+- fi; \
+- done; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+ ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$tags $$unique
+-
+-GTAGS:
+- here=`$(am__cd) $(top_builddir) && pwd` \
+- && cd $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) $$here
++CTAGS:
+
+-distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+@@ -567,40 +429,22 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
+- || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+- (cd $$subdir && \
+- $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+- distdir) \
+- || exit 1; \
+- fi; \
+- done
+ check-am: all-am
+-check: check-recursive
++check: check-am
+ all-am: Makefile $(DATA)
+-installdirs: installdirs-recursive
+-installdirs-am:
++installdirs:
+ for dir in "$(DESTDIR)$(plugindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+-install: install-recursive
+-install-exec: install-exec-recursive
+-install-data: install-data-recursive
+-uninstall: uninstall-recursive
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
+
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+-installcheck: installcheck-recursive
++installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+@@ -617,21 +461,21 @@
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+-clean: clean-recursive
++clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+-distclean: distclean-recursive
++distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic
+
+-dvi: dvi-recursive
++dvi: dvi-am
+
+ dvi-am:
+
+-html: html-recursive
++html: html-am
+
+-info: info-recursive
++info: info-am
+
+ info-am:
+
+@@ -639,57 +483,53 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-recursive
++install-dvi: install-dvi-am
+
+ install-exec-am:
+
+-install-html: install-html-recursive
++install-html: install-html-am
+
+-install-info: install-info-recursive
++install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
++install-pdf: install-pdf-am
+
+-install-ps: install-ps-recursive
++install-ps: install-ps-am
+
+ installcheck-am:
+
+-maintainer-clean: maintainer-clean-recursive
++maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+-mostlyclean: mostlyclean-recursive
++mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-recursive
++pdf: pdf-am
+
+ pdf-am:
+
+-ps: ps-recursive
++ps: ps-am
+
+ ps-am:
+
+ uninstall-am: uninstall-pluginDATA
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-data-am install-strip
++.MAKE: install-am install-data-am install-strip
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook 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-pluginDATA install-ps install-ps-am \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++ distclean distclean-generic distclean-libtool distdir dvi \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-data-hook 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-pluginDATA install-ps \
++ install-ps-am install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-pluginDATA
++ ps ps-am uninstall uninstall-am uninstall-pluginDATA
+
+
+ all: $(PLUGIN_ASSEMBLY)
+diff -urNad f-spot~/extensions/FolderExport/Makefile.in f-spot/extensions/FolderExport/Makefile.in
+--- f-spot~/extensions/FolderExport/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/FolderExport/Makefile.in 2008-03-09 00:24:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/google-sharp/Makefile.in trunk/google-sharp/Makefile.in
---- trunk~/google-sharp/Makefile.in 2007-12-04 12:20:32.000000000 +0000
-+++ trunk/google-sharp/Makefile.in 2008-01-13 17:09:54.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/extensions/GalleryExport/Makefile.in f-spot/extensions/GalleryExport/Makefile.in
+--- f-spot~/extensions/GalleryExport/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/GalleryExport/Makefile.in 2008-03-09 00:24:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/icons/Makefile.in trunk/icons/Makefile.in
---- trunk~/icons/Makefile.in 2007-12-04 12:20:32.000000000 +0000
-+++ trunk/icons/Makefile.in 2008-01-13 17:09:54.000000000 +0000
-@@ -303,11 +303,6 @@
+ LINK_TAO = \
+@@ -538,7 +540,7 @@
+ $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+
+ install-data-hook:
+- rm -f $(plugindir)/GalleryExport.addin.xml
++ rm -f $(DESTDIR)$(plugindir)/GalleryExport.addin.xml
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -urNad f-spot~/extensions/Makefile.in f-spot/extensions/Makefile.in
+--- f-spot~/extensions/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/Makefile.in 2008-03-09 00:24:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -97,7 +97,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -146,14 +148,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -165,7 +165,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -187,13 +186,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -420,8 +422,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -446,8 +448,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -457,13 +459,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/extensions/PicasaWebExport/Makefile.in f-spot/extensions/PicasaWebExport/Makefile.in
+--- f-spot~/extensions/PicasaWebExport/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-03-09 00:24:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -98,7 +98,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -147,14 +149,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -166,7 +166,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -188,13 +187,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -300,9 +302,9 @@
+ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
+ LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+ LINK_MONO_ADDINS = \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
+- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
+- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+@@ -487,8 +489,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -513,8 +515,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -524,13 +526,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in
+--- f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-03-09 00:24:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
+ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
+ LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+ LINK_MONO_ADDINS = \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
+- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
+- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/extensions/SmugMugExport/Makefile.in f-spot/extensions/SmugMugExport/Makefile.in
+--- f-spot~/extensions/SmugMugExport/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/SmugMugExport/Makefile.in 2008-03-09 00:24:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -98,7 +98,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -147,14 +149,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -166,7 +166,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -188,13 +187,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -300,9 +302,9 @@
+ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
+ LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+ LINK_MONO_ADDINS = \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
+- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
+- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+@@ -485,8 +487,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -511,8 +513,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -522,13 +524,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in
+--- f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-03-09 00:24:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
+ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
+ LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+ LINK_MONO_ADDINS = \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
+- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
+- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/glitz-sharp/Makefile.in f-spot/glitz-sharp/Makefile.in
+--- f-spot~/glitz-sharp/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/glitz-sharp/Makefile.in 2008-03-09 00:24:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -87,7 +87,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -136,14 +138,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -155,7 +155,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -177,13 +176,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -383,8 +385,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -409,8 +411,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -420,13 +422,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/glitz-sharp/src/Makefile.in f-spot/glitz-sharp/src/Makefile.in
+--- f-spot~/glitz-sharp/src/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/glitz-sharp/src/Makefile.in 2008-03-09 00:24:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
+ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
+ LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+ LINK_MONO_ADDINS = \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
+- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
+- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/gnome-keyring-sharp/Makefile.in f-spot/gnome-keyring-sharp/Makefile.in
+--- f-spot~/gnome-keyring-sharp/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/gnome-keyring-sharp/Makefile.in 2008-03-09 00:24:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
+ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
+ LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+ LINK_MONO_ADDINS = \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
+- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
+- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/icons/Makefile.in f-spot/icons/Makefile.in
+--- f-spot~/icons/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/icons/Makefile.in 2008-03-09 00:24:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -75,7 +75,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -124,14 +126,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -143,7 +143,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -165,13 +164,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -313,11 +315,6 @@
actions,view-restore-22.png \
actions,view-restore-24.png \
actions,view-restore-32.png \
@@ -354,10 +5667,654 @@
devices,camera-photo-16.png \
devices,camera-photo-22.png \
devices,camera-photo-24.png \
-diff -urNad trunk~/libeog/Makefile.in trunk/libeog/Makefile.in
---- trunk~/libeog/Makefile.in 2007-12-04 12:20:32.000000000 +0000
-+++ trunk/libeog/Makefile.in 2008-01-13 17:09:54.000000000 +0000
-@@ -51,7 +51,9 @@
+diff -urNad f-spot~/intltool-extract.in f-spot/intltool-extract.in
+--- f-spot~/intltool-extract.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/intltool-extract.in 2008-03-09 00:23:48.000000000 +0000
+@@ -32,7 +32,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-extract";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.37.1";
+
+ ## Loaded modules
+ use strict;
+@@ -161,7 +161,8 @@
+ --type=TYPE Specify the file type of FILENAME. Currently supports:
+ "gettext/glade", "gettext/ini", "gettext/keys"
+ "gettext/rfc822deb", "gettext/schemas",
+- "gettext/scheme", "gettext/xml", "gettext/quoted"
++ "gettext/scheme", "gettext/xml", "gettext/quoted",
++ "gettext/quotedxml"
+ -l, --local Writes output into current working directory
+ (conflicts with --update)
+ --update Writes output into the same directory the source file
+@@ -218,6 +219,7 @@
+ &type_schemas if $gettext_type eq "schemas";
+ &type_rfc822deb if $gettext_type eq "rfc822deb";
+ &type_quoted if $gettext_type eq "quoted";
++ &type_quotedxml if $gettext_type eq "quotedxml";
+ }
+
+ sub entity_decode_minimal
+@@ -237,9 +239,9 @@
+
+ s/'/'/g; # '
+ s/"/"/g; # "
+- s/&/&/g;
+ s/</</g;
+ s/>/>/g;
++ s/&/&/g;
+
+ return $_;
+ }
+@@ -731,6 +733,18 @@
+ }
+ }
+
++sub type_quotedxml {
++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++ my $message = $1;
++ my $before = $`;
++ $message =~ s/\\\"/\"/g;
++ $message = entity_decode($message);
++ $before =~ s/[^\n]//g;
++ $messages{$message} = [];
++ $loc{$message} = length ($before) + 2;
++ }
++}
++
+ sub type_glade {
+ ### For translatable Glade XML files ###
+
+diff -urNad f-spot~/intltool-merge.in f-spot/intltool-merge.in
+--- f-spot~/intltool-merge.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/intltool-merge.in 2008-03-09 00:23:48.000000000 +0000
+@@ -35,7 +35,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-merge";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.37.1";
+
+ ## Loaded modules
+ use strict;
+@@ -61,6 +61,7 @@
+ my $SCHEMAS_STYLE_ARG = 0;
+ my $RFC822DEB_STYLE_ARG = 0;
+ my $QUOTED_STYLE_ARG = 0;
++my $QUOTEDXML_STYLE_ARG = 0;
+ my $QUIET_ARG = 0;
+ my $PASS_THROUGH_ARG = 0;
+ my $UTF8_ARG = 0;
+@@ -81,6 +82,7 @@
+ "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
+ "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
++ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
+ "pass-through|p" => \$PASS_THROUGH_ARG,
+ "utf8|u" => \$UTF8_ARG,
+ "multiple-output|m" => \$MULTIPLE_OUTPUT,
+@@ -93,9 +95,24 @@
+
+ my %po_files_by_lang = ();
+ my %translations = ();
+-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
++my $iconv = $ENV{"ICONV"} || "iconv";
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+
++sub isProgramInPath
++{
++ my ($file) = @_;
++ # If either a file exists, or when run it returns 0 exit status
++ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
++ return 0;
++}
++
++if (! isProgramInPath ("$iconv"))
++{
++ print STDERR " *** iconv is not found on this system!\n".
++ " *** Without it, intltool-merge can not convert encodings.\n";
++ exit;
++}
++
+ # Use this instead of \w for XML files to handle more possible characters.
+ my $w = "[-A-Za-z0-9._:]";
+
+@@ -133,7 +150,7 @@
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- &keys_merge_translations;
++ &keys_merge_translations;
+ &finalize;
+ }
+ elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
+@@ -159,12 +176,12 @@
+ &rfc822deb_merge_translations;
+ &finalize;
+ }
+-elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
++elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
+ {
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- "ed_merge_translations;
++ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
+ &finalize;
+ }
+ else
+@@ -204,6 +221,7 @@
+ -s, --schemas-style includes translations in the schemas style
+ -r, --rfc822deb-style includes translations in the RFC822 style
+ --quoted-style includes translations in the quoted string style
++ --quotedxml-style includes translations in the quoted xml string style
+ -x, --xml-style includes translations in the standard xml style
+
+ Other options:
+@@ -260,8 +278,41 @@
+
+ sub gather_po_files
+ {
+- for my $po_file (glob "$PO_DIR/*.po") {
+- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ if (my $linguas = $ENV{"LINGUAS"})
++ {
++ for my $lang (split / /, $linguas) {
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++ else
++ {
++ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
++ {
++ while (<LINGUAS_FILE>)
++ {
++ next if /^#/;
++
++ for my $lang (split)
++ {
++ chomp ($lang);
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++
++ close LINGUAS_FILE;
++ }
++ else
++ {
++ for my $po_file (glob "$PO_DIR/*.po") {
++ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ }
++ }
+ }
+ }
+
+@@ -494,16 +545,15 @@
+ return $string;
+ }
+
+-## NOTE: deal with < - < but not > - > because it seems its ok to have
+-## > in the entity. For further info please look at #84738.
+ sub entity_decode
+ {
+ local ($_) = @_;
+
+ s/'/'/g; # '
+ s/"/"/g; # "
+- s/&/&/g;
+ s/</</g;
++ s/>/>/g;
++ s/&/&/g;
+
+ return $_;
+ }
+@@ -528,6 +578,7 @@
+ return "&" if $_ == 38;
+ return "'" if $_ == 39;
+ return "<" if $_ == 60;
++ return ">" if $_ == 62;
+ return chr $_;
+ }
+
+@@ -1028,43 +1079,74 @@
+ close OUTPUT;
+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
+ }
+- }
+- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+- binmode (OUTPUT) if $^O eq 'MSWin32';
+- my $tree = readXml($FILE);
+- print_header($FILE, \*OUTPUT);
+- parseTree(\*OUTPUT, $tree);
+- close OUTPUT;
+- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ if ( ! -d "C" ) {
++ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
++ }
++ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
++ } else {
++ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ }
+ }
+
+-sub keys_merge_translations
++sub keys_merge_translation
+ {
+- open INPUT, "<${FILE}" or die;
+- open OUTPUT, ">${OUTFILE}" or die;
++ my ($lang) = @_;
++
++ if ( ! -d $lang && $MULTIPLE_OUTPUT)
++ {
++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++ }
++
++ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+
+- while (<INPUT>)
++ while (<INPUT>)
+ {
+- if (s/^(\s*)_(\w+=(.*))/$1$2/)
++ if (s/^(\s*)_(\w+=(.*))/$1$2/)
+ {
+- my $string = $3;
++ my $string = $3;
+
+- print OUTPUT;
++ if (!$MULTIPLE_OUTPUT)
++ {
++ print OUTPUT;
+
+- my $non_translated_line = $_;
++ my $non_translated_line = $_;
+
+- for my $lang (sort keys %po_files_by_lang)
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ my $translation = $translations{$lang, $string};
++ next if !$translation;
++
++ $_ = $non_translated_line;
++ s/(\w+)=.*/[$lang]$1=$translation/;
++ print OUTPUT;
++ }
++ }
++ else
+ {
+- my $translation = $translations{$lang, $string};
+- next if !$translation;
++ my $non_translated_line = $_;
++ my $translation = $translations{$lang, $string};
++ $translation = $string if !$translation;
+
+ $_ = $non_translated_line;
+- s/(\w+)=.*/[$lang]$1=$translation/;
++ s/(\w+)=.*/$1=$translation/;
+ print OUTPUT;
+ }
+- }
+- else
++ }
++ else
+ {
+ print OUTPUT;
+ }
+@@ -1072,6 +1154,24 @@
+
+ close OUTPUT;
+ close INPUT;
++
++ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
++}
++
++sub keys_merge_translations
++{
++ if ($MULTIPLE_OUTPUT)
++ {
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ keys_merge_translation ($lang);
++ }
++ keys_merge_translation ("C");
++ }
++ else
++ {
++ keys_merge_translation (".");
++ }
+ }
+
+ sub desktop_merge_translations
+@@ -1367,19 +1467,22 @@
+
+ sub quoted_translation
+ {
+- my ($lang, $string) = @_;
++ my ($xml_mode, $lang, $string) = @_;
+
++ $string = entity_decode($string) if $xml_mode;
+ $string =~ s/\\\"/\"/g;
+
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
+-
++ $translation = entity_encode($translation) if $xml_mode;
+ $translation =~ s/\"/\\\"/g;
+ return $translation
+ }
+
+ sub quoted_merge_translations
+ {
++ my ($xml_mode) = @_;
++
+ if (!$MULTIPLE_OUTPUT) {
+ print "Quoted only supports Multiple Output.\n";
+ exit(1);
+@@ -1394,7 +1497,7 @@
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ while (<INPUT>)
+ {
+- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
++ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
+ print OUTPUT;
+ }
+ close OUTPUT;
+diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
+--- f-spot~/intltool-update.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/intltool-update.in 2008-03-09 00:23:48.000000000 +0000
+@@ -30,7 +30,7 @@
+
+ ## Release information
+ my $PROGRAM = "intltool-update";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.37.1";
+ my $PACKAGE = "intltool";
+
+ ## Loaded modules
+@@ -71,7 +71,8 @@
+ "sheet(?:\\.in)+|". # ?
+ "schemas(?:\\.in)+|". # GConf specific
+ "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
+-"kbd(?:\\.in)+"; # GOK specific.
++"kbd(?:\\.in)+|". # GOK specific.
++"policy(?:\\.in)+"; # PolicyKit files
+
+ my $ini_support =
+ "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
+@@ -328,7 +329,12 @@
+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+ }, "..";
+-
++ find sub {
++ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/;
++ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
++ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
++ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
++ }, "$SRCDIR/.." if "$SRCDIR" ne ".";
+
+ open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
+ @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
+@@ -428,8 +434,8 @@
+ last;
+ }
+
+- ## N_ Q_ and _ are the three macros defined in gi8n.h
+- if (/[NQ]?_ *\(QUOTEDTEXT/)
++ ## C_ N_ Q_ and _ are the macros defined in gi8n.h
++ if (/[CNQ]?_ *\(QUOTEDTEXT/)
+ {
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ ## Remove the first 3 chars and add newline
+@@ -489,11 +495,15 @@
+ my %in2;
+ foreach (@buf_potfiles_sorted)
+ {
++ s#^$SRCDIR/../##;
++ s#^$SRCDIR/##;
+ $in2{$_} = 1;
+ }
+
+ foreach (@buf_potfiles_ignore_sorted)
+ {
++ s#^$SRCDIR/../##;
++ s#^$SRCDIR/##;
+ $in2{$_} = 1;
+ }
+
+@@ -501,9 +511,16 @@
+
+ foreach (@buf_allfiles_sorted)
+ {
+- if (!exists($in2{$_}))
++ my $dummy = $_;
++ my $srcdir = $SRCDIR;
++
++ $srcdir =~ s#^../##;
++ $dummy =~ s#^$srcdir/../##;
++ $dummy =~ s#^$srcdir/##;
++ $dummy =~ s#_build/##;
++ if (!exists($in2{$dummy}))
+ {
+- push @result, $_
++ push @result, $dummy
+ }
+ }
+
+@@ -563,13 +580,33 @@
+ exit 1;
+ }
+
++sub isProgramInPath
++{
++ my ($file) = @_;
++ # If either a file exists, or when run it returns 0 exit status
++ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
++ return 0;
++}
++
++sub isGNUGettextTool
++{
++ my ($file) = @_;
++ # Check that we are using GNU gettext tools
++ if (isProgramInPath ($file))
++ {
++ my $version = `$file --version`;
++ return 1 if ($version =~ m/.*\(GNU .*\).*/);
++ }
++ return 0;
++}
++
+ sub GenerateHeaders
+ {
+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
+
+ ## Generate the .h header files, so we can allow glade and
+ ## xml translation support
+- if (0)
++ if (! isProgramInPath ("$EXTRACT"))
+ {
+ print STDERR "\n *** The intltool-extract script wasn't found!"
+ ."\n *** Without it, intltool-update can not generate files.\n";
+@@ -616,13 +653,13 @@
+ #
+ sub GeneratePOTemplate
+ {
+- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
++ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
+ my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
+ chomp $XGETTEXT;
+
+- if (! -x $XGETTEXT)
++ if (! isGNUGettextTool ("$XGETTEXT"))
+ {
+- print STDERR " *** xgettext is not found on this system!\n".
++ print STDERR " *** GNU xgettext is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
+@@ -718,13 +755,29 @@
+ unlink "$MODULE.pot";
+ my @xgettext_argument=("$XGETTEXT",
+ "--add-comments",
+- "--directory\=\.",
++ "--directory\=.",
++ "--default-domain\=$MODULE",
++ "--flag\=g_strdup_printf:1:c-format",
++ "--flag\=g_string_printf:2:c-format",
++ "--flag\=g_string_append_printf:2:c-format",
++ "--flag\=g_error_new:3:c-format",
++ "--flag\=g_set_error:4:c-format",
++ "--flag\=g_markup_printf_escaped:1:c-format",
++ "--flag\=g_log:3:c-format",
++ "--flag\=g_print:1:c-format",
++ "--flag\=g_printerr:1:c-format",
++ "--flag\=g_printf:1:c-format",
++ "--flag\=g_fprintf:2:c-format",
++ "--flag\=g_sprintf:2:c-format",
++ "--flag\=g_snprintf:3:c-format",
++ "--flag\=g_scanner_error:2:c-format",
++ "--flag\=g_scanner_warn:2:c-format",
+ "--output\=$MODULE\.pot",
+ "--files-from\=\.\/POTFILES\.in\.temp");
+ my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
+ push @xgettext_argument, $XGETTEXT_KEYWORDS;
+ my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
++ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
+ push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
+ push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
+ my $xgettext_command = join ' ', @xgettext_argument;
+@@ -785,9 +838,16 @@
+ {
+ -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
+
+- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
++ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
+ my ($lang, $outfile) = @_;
+
++ if (! isGNUGettextTool ("$MSGMERGE"))
++ {
++ print STDERR " *** GNU msgmerge is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
++
+ print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
+
+ my $infile = "$SRCDIR/$lang.po";
+@@ -828,7 +888,14 @@
+ sub Console_Write_TranslationStatus
+ {
+ my ($lang, $output_file) = @_;
+- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++ if (! isGNUGettextTool ("$MSGFMT"))
++ {
++ print STDERR " *** GNU msgfmt is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
+
+ $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
+
+@@ -837,21 +904,28 @@
+
+ sub Console_Write_CoverageReport
+ {
+- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++ if (! isGNUGettextTool ("$MSGFMT"))
++ {
++ print STDERR " *** GNU msgfmt is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
+
+ &GatherPOFiles;
+
+ foreach my $lang (@languages)
+ {
+- print "$lang: ";
++ print STDERR "$lang: ";
+ &POFile_Update ($lang, "");
+ }
+
+- print "\n\n * Current translation support in $MODULE \n\n";
++ print STDERR "\n\n * Current translation support in $MODULE \n\n";
+
+ foreach my $lang (@languages)
+ {
+- print "$lang: ";
++ print STDERR "$lang: ";
+ system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
+ }
+ }
+@@ -925,13 +999,13 @@
+
+ $conf_in || die "Cannot find top_builddir in Makevars.";
+ }
+- elsif (-f "../configure.ac")
++ elsif (-f "$SRCDIR/../configure.ac")
+ {
+- $conf_in = "../configure.ac";
++ $conf_in = "$SRCDIR/../configure.ac";
+ }
+- elsif (-f "../configure.in")
++ elsif (-f "$SRCDIR/../configure.in")
+ {
+- $conf_in = "../configure.in";
++ $conf_in = "$SRCDIR/../configure.in";
+ }
+ else
+ {
+@@ -1044,6 +1118,8 @@
+ close IN;
+ }
+
++ # unwrap lines split with a trailing \
++ $make_source =~ s/\\ $ \n/ /mxg;
+ $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
+
+ return $keywords;
+diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
+--- f-spot~/libeog/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/libeog/Makefile.in 2008-03-09 00:24:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -51,14 +51,16 @@
am__installdirs = "$(DESTDIR)$(fspotlibdir)"
fspotlibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(fspotlib_LTLIBRARIES)
@@ -368,7 +6325,66 @@
am__objects_1 = access.lo accessible-image-view-factory.lo \
accessible-image-view.lo eog-file-selection.lo eog-image.lo \
eog-pixbuf-util.lo eog-scroll-view.lo image-view.lo \
-@@ -331,6 +333,7 @@
+ libeog-marshal.lo uta.lo cursors.lo ui-image.lo zoom.lo
+ am_libfspoteog_la_OBJECTS = $(am__objects_1)
+ libfspoteog_la_OBJECTS = $(am_libfspoteog_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -116,7 +118,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -165,14 +169,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -184,7 +186,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -206,13 +207,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -338,6 +342,7 @@
zoom.h
libfspoteog_la_SOURCES = $(libfspoteog_files)
@@ -376,10 +6392,146 @@
MARSHAL_GENERATED = libeog-marshal.c libeog-marshal.h
BUILT_SOURCES = $(MARSHAL_GENERATED)
EXTRA_DIST = libeog-marshal.list
-diff -urNad trunk~/libfspot/Makefile.in trunk/libfspot/Makefile.in
---- trunk~/libfspot/Makefile.in 2007-12-04 12:20:32.000000000 +0000
-+++ trunk/libfspot/Makefile.in 2008-01-13 17:09:54.000000000 +0000
-@@ -53,6 +53,7 @@
+@@ -381,8 +386,8 @@
+ @list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fspotlibdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fspotlibdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fspotlibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fspotlibdir)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -390,8 +395,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(fspotlibdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(fspotlibdir)/$$p"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(fspotlibdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(fspotlibdir)/$$p"; \
+ done
+
+ clean-fspotlibLTLIBRARIES:
+@@ -527,8 +532,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -553,8 +558,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -564,13 +569,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/libeog/cursors/Makefile.in f-spot/libeog/cursors/Makefile.in
+--- f-spot~/libeog/cursors/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/libeog/cursors/Makefile.in 2008-03-09 00:24:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -75,7 +75,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -124,14 +126,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -143,7 +143,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -165,13 +164,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+diff -urNad f-spot~/libfspot/Makefile.in f-spot/libfspot/Makefile.in
+--- f-spot~/libfspot/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/libfspot/Makefile.in 2008-03-09 00:24:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -53,13 +53,14 @@
LTLIBRARIES = $(fspotlib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libfspot_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -387,7 +6539,66 @@
$(top_builddir)/libjpegtran/libfspotjpegtran.la \
$(top_builddir)/libeog/libfspoteog.la
am_libfspot_la_OBJECTS = f-image-surface.lo f-image-view.lo \
-@@ -311,6 +312,8 @@
+ f-jpeg-utils.lo f-pixbuf-save.lo f-pixbuf-utils.lo \
+ f-pixbuf-unsharp.lo f-marshal.lo f-screen-utils.lo f-utils.lo
+ libfspot_la_OBJECTS = $(am_libfspot_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -107,7 +108,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -156,14 +159,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -175,7 +176,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -197,13 +197,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -318,6 +321,8 @@
f-utils.h
libfspot_la_LIBADD = \
@@ -396,33 +6607,159 @@
$(LCMS_LIBS) \
$(EXIF_LIBS) \
$(top_builddir)/libjpegtran/libfspotjpegtran.la \
-diff -urNad trunk~/libgphoto2-sharp/Makefile.in trunk/libgphoto2-sharp/Makefile.in
---- trunk~/libgphoto2-sharp/Makefile.in 2007-12-04 12:20:33.000000000 +0000
-+++ trunk/libgphoto2-sharp/Makefile.in 2008-01-13 17:09:55.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+@@ -370,8 +375,8 @@
+ @list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fspotlibdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fspotlibdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fspotlibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fspotlibdir)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -379,8 +384,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(fspotlibdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(fspotlibdir)/$$p"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(fspotlibdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(fspotlibdir)/$$p"; \
+ done
+
+ clean-fspotlibLTLIBRARIES:
+@@ -442,8 +447,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -455,8 +460,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -466,13 +471,12 @@
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/libgphoto2-sharp/Makefile.in f-spot/libgphoto2-sharp/Makefile.in
+--- f-spot~/libgphoto2-sharp/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/libgphoto2-sharp/Makefile.in 2008-03-09 00:24:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/libjpegtran/Makefile.in trunk/libjpegtran/Makefile.in
---- trunk~/libjpegtran/Makefile.in 2007-12-04 12:20:33.000000000 +0000
-+++ trunk/libjpegtran/Makefile.in 2008-01-13 17:09:55.000000000 +0000
-@@ -51,7 +51,8 @@
+ LINK_TAO = \
+diff -urNad f-spot~/libjpegtran/Makefile.in f-spot/libjpegtran/Makefile.in
+--- f-spot~/libjpegtran/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/libjpegtran/Makefile.in 2008-03-09 00:24:05.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -51,11 +51,12 @@
am__installdirs = "$(DESTDIR)$(fspotlibdir)"
fspotlibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(fspotlib_LTLIBRARIES)
@@ -432,7 +6769,63 @@
am__objects_1 = jpeg-data.lo jpeg-marker.lo jpegtran.lo transupp.lo
am_libfspotjpegtran_la_OBJECTS = $(am__objects_1)
libfspotjpegtran_la_OBJECTS = $(am_libfspotjpegtran_la_OBJECTS)
-@@ -295,6 +296,7 @@
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -103,7 +104,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -152,14 +155,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -171,7 +172,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -193,13 +193,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -302,6 +305,7 @@
libfspotjpegtran_la_SOURCES = \
$(libfspotjpegtran_files)
@@ -440,155 +6833,681 @@
EXTRA_DIST = README
all: all-am
-diff -urNad trunk~/mono-addins/Mono.Addins/Makefile.in trunk/mono-addins/Mono.Addins/Makefile.in
---- trunk~/mono-addins/Mono.Addins/Makefile.in 2007-12-04 12:20:33.000000000 +0000
-+++ trunk/mono-addins/Mono.Addins/Makefile.in 2008-01-13 17:09:56.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+@@ -342,8 +346,8 @@
+ @list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fspotlibdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fspotlibdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fspotlibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fspotlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fspotlibdir)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -351,8 +355,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(fspotlibdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(fspotlibdir)/$$p"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(fspotlibdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(fspotlibdir)/$$p"; \
+ done
+
+ clean-fspotlibLTLIBRARIES:
+@@ -409,8 +413,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -422,8 +426,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -433,13 +437,12 @@
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/mono-addins/Makefile.in f-spot/mono-addins/Makefile.in
+--- f-spot~/mono-addins/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/mono-addins/Makefile.in 2008-03-09 00:24:05.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -87,7 +87,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -136,14 +138,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -155,7 +155,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -177,13 +176,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -386,8 +388,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -412,8 +414,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -423,13 +425,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/mono-addins/Mono.Addins/Makefile.in f-spot/mono-addins/Mono.Addins/Makefile.in
+--- f-spot~/mono-addins/Mono.Addins/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-03-09 00:24:05.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/mono-addins/Mono.Addins.Gui/Makefile.in trunk/mono-addins/Mono.Addins.Gui/Makefile.in
---- trunk~/mono-addins/Mono.Addins.Gui/Makefile.in 2007-12-04 12:20:33.000000000 +0000
-+++ trunk/mono-addins/Mono.Addins.Gui/Makefile.in 2008-01-13 17:09:55.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in f-spot/mono-addins/Mono.Addins.Gui/Makefile.in
+--- f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-03-09 00:24:05.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-@@ -327,8 +327,8 @@
- REFS = \
- -r:Mono.Posix \
- -r:System \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup)
-
- PKGS = \
- -pkg:gnome-sharp-2.0 \
-diff -urNad trunk~/mono-addins/Mono.Addins.Setup/Makefile.in trunk/mono-addins/Mono.Addins.Setup/Makefile.in
---- trunk~/mono-addins/Mono.Addins.Setup/Makefile.in 2007-12-04 12:20:33.000000000 +0000
-+++ trunk/mono-addins/Mono.Addins.Setup/Makefile.in 2008-01-13 17:09:55.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in f-spot/mono-addins/Mono.Addins.Setup/Makefile.in
+--- f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-03-09 00:24:05.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-@@ -338,7 +338,7 @@
- -r:Mono.Posix \
- -r:System \
- -r:System.Xml \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll
-+ $(shell pkg-config --libs mono-addins)
-
- PKGS =
- CSC_EXTRA_FLAGS = -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
-diff -urNad trunk~/semweb/Makefile.in trunk/semweb/Makefile.in
---- trunk~/semweb/Makefile.in 2007-12-04 12:20:33.000000000 +0000
-+++ trunk/semweb/Makefile.in 2008-01-13 17:09:56.000000000 +0000
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/po/Makefile.in.in f-spot/po/Makefile.in.in
+--- f-spot~/po/Makefile.in.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/po/Makefile.in.in 2008-03-09 00:23:48.000000000 +0000
+@@ -1,10 +1,10 @@
+ # Makefile for program source directory in GNU NLS utilities package.
+ # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
++# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
+ #
+-# This file file be copied and used freely without restrictions. It can
+-# be used in projects which are not available under the GNU Public License
++# This file may be copied and used freely without restrictions. It may
++# be used in projects which are not available under a GNU Public License,
+ # but which still want to provide support for the GNU gettext functionality.
+-# Please note that the actual code is *not* freely available.
+ #
+ # - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+ # instead of PACKAGE and to look for po2tbl in ./ not in intl/
+@@ -12,7 +12,7 @@
+ # - Modified by jacob berkman <jacob at ximian.com> to install
+ # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+ #
+-# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
++# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
+ #
+ # We have the following line for use by intltoolize:
+ # INTLTOOL_MAKEFILE
+@@ -133,7 +133,7 @@
+ dvi info tags TAGS ID:
+
+ # Define this as empty until I found a useful application.
+-installcheck:
++install-exec installcheck:
+
+ uninstall:
+ linguas="$(USE_LINGUAS)"; \
+diff -urNad f-spot~/semweb/Makefile.in f-spot/semweb/Makefile.in
+--- f-spot~/semweb/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/semweb/Makefile.in 2008-03-09 00:24:05.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,7 +86,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -154,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -176,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -288,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad trunk~/src/Makefile.in trunk/src/Makefile.in
---- trunk~/src/Makefile.in 2007-12-04 12:20:33.000000000 +0000
-+++ trunk/src/Makefile.in 2008-01-13 17:09:56.000000000 +0000
-@@ -286,15 +286,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urNad f-spot~/src/Makefile.in f-spot/src/Makefile.in
+--- f-spot~/src/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/src/Makefile.in 2008-03-09 00:24:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -90,7 +90,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -139,14 +141,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -158,7 +158,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -180,13 +179,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -292,9 +294,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-@@ -307,7 +307,7 @@
- CSC_LIB = $(CSC) -target:library
+ LINK_TAO = \
+@@ -306,7 +308,7 @@
+ CSC_LIB = gmcs $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
-EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
+EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
- F_SPOT_CSDISTFILES = \
- $(srcdir)/Cairo/Antialias.cs \
- $(srcdir)/Cairo/Cairo.cs \
-@@ -561,7 +561,6 @@
- -r:Mono.Posix \
- -r:Mono.Security \
- -r:ICSharpCode.SharpZipLib \
+ CMS_CSDISTFILES = \
+ $(srcdir)/Cms/Cms.cs \
+ $(srcdir)/Cms/CctTable.cs
+@@ -573,7 +575,6 @@
+
+ @NOGCONF_FALSE at GCONF_PKG = -pkg:gconf-sharp-2.0
+ CMS_ASSEMBLIES = \
- $(NUNIT_PKG) \
- -pkg:gtkhtml-sharp-2.0 \
+ -pkg:gtk-sharp-2.0
+
+ CORE_ASSEMBLIES = \
+@@ -615,7 +616,6 @@
+ -r:FSpot.Query.dll \
+ -r:FSpot.Utils.dll \
+ -r:Cms.dll \
+- $(NUNIT_PKG) \
+ $(GCONF_PKG) \
+ $(GTKHTML_SHARP_PKG) \
-pkg:glade-sharp-2.0 \
- -pkg:gnome-vfs-sharp-2.0 \
+diff -urNad f-spot~/tools/Makefile.in f-spot/tools/Makefile.in
+--- f-spot~/tools/Makefile.in 2008-03-09 00:21:03.000000000 +0000
++++ f-spot/tools/Makefile.in 2008-03-09 00:24:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -90,7 +90,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -139,14 +141,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -158,7 +158,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -180,13 +179,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
More information about the Pkg-cli-apps-commits
mailing list