[Pkg-cli-apps-commits] r3914 - in /packages/f-spot/trunk/debian: ./ patches/
diocles-guest at users.alioth.debian.org
diocles-guest at users.alioth.debian.org
Thu May 1 01:32:08 UTC 2008
Author: diocles-guest
Date: Thu May 1 01:32:07 2008
New Revision: 3914
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3914
Log:
Package f-spot 0.4.3.1-1.
Removed:
packages/f-spot/trunk/debian/patches/stable-042-3692_cms-linkage.dpatch
packages/f-spot/trunk/debian/patches/stable-042-3748_v8-db-updater.dpatch
packages/f-spot/trunk/debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch
packages/f-spot/trunk/debian/patches/stable-042-3833_protected-nodeattributes.dpatch
packages/f-spot/trunk/debian/patches/stable-042-3834_gphoto2-cameralist.dpatch
packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch
packages/f-spot/trunk/debian/patches/svn-042-3700_bashisms.dpatch
packages/f-spot/trunk/debian/patches/svn-042-3743_gallery-extension-install-hook.dpatch
packages/f-spot/trunk/debian/patches/svn-042-3754_deleting-1000-photos.dpatch
packages/f-spot/trunk/debian/patches/svn-042-3817_importdialog-missing-icon.dpatch
packages/f-spot/trunk/debian/patches/svn-042-3821_tag-icon-from-external-file.dpatch
packages/f-spot/trunk/debian/patches/svn-042-3842_x-content-mimetype.dpatch
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/patches/00list
packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3914&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Thu May 1 01:32:07 2008
@@ -1,34 +1,27 @@
-f-spot (0.4.2-2) unstable; urgency=low
-
- * Rename patches to have different prefixes depending on their upstream
- status; svn-042-* are on upstream SVN trunk, stable-042-* are from the
- upstream stable SVN branch, and debian_* patches are not upstream.
+f-spot (0.4.3.1-1) unstable; urgency=low
+
+ * New upstream version.
+ + Shows a 'missing icon' image in the import dialog rather than
+ throwing an exception when f-spot icon is not found. (Closes: #459261)
+ + Fixes crash in tag icon file chooser. (Closes: #470787)
+ + Fixes bug in gphoto2 bindings when using Mono 1.9. (Closes: #475662)
+ + Remove patches now included upstream: fix_cms_linkage, fix_v8_db_update,
+ gtkhtml-sharp-3.14_port, fix_gnome-sharp_typo, fix_bashisms,
+ fix_gallery_extension_install_hook, fix_deleting_1000_photos.
+ * Now prefix all remaining patch names with 'debian_' where they are not
+ included in the upstream SVN repository, to make them easier to track.
* debian/patches/debian_link-system-mono-addins.dpatch,
debian/patches/debian_link-system-flickrnet.dpatch:
+ Remove configure.in entries so that Makefiles aren't generated.
- * debian/patches/svn-042-3817_importdialog-missing-icon.dpatch:
- + Show a 'missing icon' image in the import dialog rather than
- throwing an exception when f-spot icon is not found. (Closes: #459261)
- * debian/patches/svn-042-3821_tag-icon-from-external-file.dpatch:
- + Fix from upstream SVN for crash in tag icon file chooser.
- (Closes: #470787)
- * debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch:
- + Use upstream's version of the gtkhtml-sharp-3.14 port, and remove
- debian/patches/gtkhtml-sharp-3.14_port.dpatch.
- * debian/patches/stable-042-3833_protected-nodeattributes.dpatch:
- + Patch from upstream stable SVN branch for protected node attributes.
- * debian/patches/stable-042-3834_gphoto2-cameralist.dpatch:
- + Patch from upstream stable SVN branch for bug in gphoto2 bindings.
- (Closes: #475662)
- * debian/patches/svn-042-3842_x-content-mimetype.dpatch:
- + Patch from upstream SVN for x-content mimetype .desktop file.
+ * debian/patches/debian_link-system-flickrnet.dpatch:
+ + Update to account for Makefile.am change.
* debian/patches/11_screensaver_path.dpatch:
+ Remove - there is no point hardcoding a full path.
* debian/control:
+ Add line breaks to Build-Depends.
* debian/update_src_to_use_system_libs.sh: Remove unused script.
- -- Tim Retout <tim at retout.co.uk> Fri, 25 Apr 2008 01:10:07 +0100
+ -- Tim Retout <tim at retout.co.uk> Thu, 01 May 2008 02:08:17 +0100
f-spot (0.4.2-1) unstable; urgency=low
Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3914&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Thu May 1 01:32:07 2008
@@ -1,19 +1,3 @@
-# Patches from upstream stable SVN branch.
-stable-042-3692_cms-linkage
-stable-042-3748_v8-db-updater
-stable-042-3782_gtkhtml-sharp-3.14
-stable-042-3833_protected-nodeattributes
-stable-042-3834_gphoto2-cameralist
-stable-042-3835_gnome-sharp-typo
-
-# Patches from upstream SVN trunk.
-svn-042-3700_bashisms
-svn-042-3743_gallery-extension-install-hook
-svn-042-3754_deleting-1000-photos
-svn-042-3817_importdialog-missing-icon
-svn-042-3821_tag-icon-from-external-file
-svn-042-3842_x-content-mimetype
-
# Patches that haven't been applied upstream yet.
debian_libfspot-linkage
debian_libfspoteog-linkage
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=3914&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Thu May 1 01:32:07 2008
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
---- f-spot~/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/Makefile.in 2008-04-16 22:18:21.000000000 +0100
+--- f-spot~/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -19,25 +19,7 @@
# 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.
-@@ -35,6 +35,7 @@
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-+ $(srcdir)/f-spot-import.desktop.in.in \
- $(srcdir)/f-spot-view.desktop.in.in \
- $(srcdir)/f-spot.desktop.in.in $(srcdir)/f-spot.pc.in \
- $(srcdir)/f-spot.spec.in $(top_srcdir)/configure \
-@@ -51,7 +52,8 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = src/Core/Defines.cs f-spot.pc f-spot.spec \
-- f-spot.desktop.in f-spot-view.desktop.in
-+ f-spot.desktop.in f-spot-view.desktop.in \
-+ f-spot-import.desktop.in
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -118,7 +120,9 @@
+@@ -120,7 +120,9 @@
DEPDIR = @DEPDIR@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
@@ -47,7 +29,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -167,14 +171,12 @@
+@@ -169,14 +171,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -63,7 +45,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -186,7 +188,6 @@
+@@ -188,7 +188,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -71,7 +53,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -208,13 +209,16 @@
+@@ -210,13 +209,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -88,7 +70,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -311,7 +315,6 @@
+@@ -246,6 +248,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -312,7 +315,6 @@
libgphoto2-sharp \
semweb \
Tao \
@@ -96,7 +86,7 @@
tools \
po \
src \
-@@ -330,7 +333,6 @@
+@@ -331,7 +333,6 @@
libgphoto2-sharp \
semweb \
Tao \
@@ -104,34 +94,15 @@
tools \
po \
src \
-@@ -338,7 +340,8 @@
-
- desktop_in_files = \
- f-spot.desktop.in \
-- f-spot-view.desktop.in
-+ f-spot-view.desktop.in \
-+ f-spot-import.desktop.in
-
- desktop_files = $(desktop_in_files:.desktop.in=.desktop)
- pkgconfigdir = $(libdir)/pkgconfig
-@@ -370,7 +373,6 @@
+@@ -372,7 +373,6 @@
gnome-doc-utils.make \
$(desktop_files)
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-@@ -435,6 +437,8 @@
- cd $(top_builddir) && $(SHELL) ./config.status $@
- f-spot-view.desktop.in: $(top_builddir)/config.status $(srcdir)/f-spot-view.desktop.in.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-+f-spot-import.desktop.in: $(top_builddir)/config.status $(srcdir)/f-spot-import.desktop.in.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $@
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -554,8 +558,8 @@
+ UPDATE_DESKTOP = \
+ if [ -f $(DESTDIR)$(datadir)/applications/defaults.list ] ; then \
+ if which update-desktop-database>/dev/null 2>&1 ; then \
+@@ -565,8 +565,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -142,7 +113,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -580,8 +584,8 @@
+@@ -591,8 +591,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -153,7 +124,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -591,13 +595,12 @@
+@@ -602,13 +602,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -169,7 +140,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -668,6 +671,10 @@
+@@ -679,6 +678,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -180,7 +151,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -694,6 +701,8 @@
+@@ -705,6 +708,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -189,7 +160,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -850,8 +859,8 @@
+@@ -865,8 +870,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 \
@@ -201,8 +172,8 @@
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-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Makefile.in 2008-04-16 22:18:17.000000000 +0100
+--- f-spot~/Tao/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/Tao/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -265,7 +236,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -388,8 +390,8 @@
+@@ -213,6 +215,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -387,8 +390,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -276,7 +255,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -414,8 +416,8 @@
+@@ -413,8 +416,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -287,7 +266,7 @@
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 @@
+@@ -424,13 +427,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -304,8 +283,8 @@
|| $(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-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-04-16 22:18:17.000000000 +0100
+--- f-spot~/Tao/Tao.GlPostProcess/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -368,7 +347,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -278,9 +280,9 @@
+@@ -202,6 +204,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -277,9 +280,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -382,8 +369,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.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-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-04-16 22:18:17.000000000 +0100
+--- f-spot~/Tao/Tao.OpenGl/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -446,7 +433,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -460,8 +455,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.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-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-16 22:18:17.000000000 +0100
+--- f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -524,7 +519,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -538,8 +541,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.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-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-16 22:18:17.000000000 +0100
+--- f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -602,7 +605,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -616,8 +627,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/aclocal.m4 f-spot/aclocal.m4
---- f-spot~/aclocal.m4 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/aclocal.m4 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/aclocal.m4 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/aclocal.m4 2008-05-01 02:16:49.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -646,7 +657,43 @@
dnl AM_GCONF_SOURCE_2
dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-@@ -623,6 +626,18 @@
+@@ -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 or
+-dnl gthread is specified in MODULES, pass to pkg-config
++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
+ AC_DEFUN([AM_PATH_GLIB_2_0],
+ [dnl
+@@ -86,10 +89,13 @@
+ gthread)
+ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
++ gio*)
++ pkg_config_args="$pkg_config_args $module-2.0"
++ ;;
+ esac
+ done
+
+- PKG_PROG_PKG_CONFIG([0.7])
++ PKG_PROG_PKG_CONFIG([0.16])
+
+ no_glib=""
+
+@@ -368,8 +374,7 @@
+ #-----------------
+ glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+- USE_NLS=yes
++ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
+
+ gt_cv_have_gettext=no
+@@ -621,6 +626,18 @@
fi
fi
@@ -665,7 +712,156 @@
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 +874,10 @@
+@@ -687,6 +704,148 @@
+ fi])
+
+
++dnl GNOME_COMPILE_WARNINGS
++dnl Turn on many useful compiler warnings
++dnl For now, only works on GCC
++AC_DEFUN([GNOME_COMPILE_WARNINGS],[
++ dnl ******************************
++ dnl More compiler warnings
++ dnl ******************************
++
++ AC_ARG_ENABLE(compile-warnings,
++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++ [Turn on compiler warnings]),,
++ [enable_compile_warnings="m4_default([$1],[yes])"])
++
++ warnCFLAGS=
++ if test "x$GCC" != xyes; then
++ enable_compile_warnings=no
++ fi
++
++ warning_flags=
++ realsave_CFLAGS="$CFLAGS"
++
++ case "$enable_compile_warnings" in
++ no)
++ warning_flags=
++ ;;
++ minimum)
++ warning_flags="-Wall"
++ ;;
++ yes)
++ warning_flags="-Wall -Wmissing-prototypes"
++ ;;
++ maximum|error)
++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
++ CFLAGS="$warning_flags $CFLAGS"
++ for option in -Wno-sign-compare; do
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS $option"
++ AC_MSG_CHECKING([whether gcc understands $option])
++ AC_TRY_COMPILE([], [],
++ has_option=yes,
++ has_option=no,)
++ CFLAGS="$SAVE_CFLAGS"
++ AC_MSG_RESULT($has_option)
++ if test $has_option = yes; then
++ warning_flags="$warning_flags $option"
++ fi
++ unset has_option
++ unset SAVE_CFLAGS
++ done
++ unset option
++ if test "$enable_compile_warnings" = "error" ; then
++ warning_flags="$warning_flags -Werror"
++ fi
++ ;;
++ *)
++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
++ ;;
++ esac
++ CFLAGS="$realsave_CFLAGS"
++ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
++ AC_MSG_RESULT($warning_flags)
++
++ AC_ARG_ENABLE(iso-c,
++ AC_HELP_STRING([--enable-iso-c],
++ [Try to warn if code is not ISO C ]),,
++ [enable_iso_c=no])
++
++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
++ complCFLAGS=
++ if test "x$enable_iso_c" != "xno"; then
++ if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -ansi" ;;
++ esac
++ case " $CFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCFLAGS)
++
++ WARN_CFLAGS="$warning_flags $complCFLAGS"
++ AC_SUBST(WARN_CFLAGS)
++])
++
++dnl For C++, do basically the same thing.
++
++AC_DEFUN([GNOME_CXX_WARNINGS],[
++ AC_ARG_ENABLE(cxx-warnings,
++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
++ [Turn on compiler warnings.]),,
++ [enable_cxx_warnings="m4_default([$1],[minimum])"])
++
++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
++ warnCXXFLAGS=
++ if test "x$GXX" != xyes; then
++ enable_cxx_warnings=no
++ fi
++ if test "x$enable_cxx_warnings" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-Wall[\ \ ]*) ;;
++ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
++ esac
++
++ ## -W is not all that useful. And it cannot be controlled
++ ## with individual -Wno-xxx flags, unlike -Wall
++ if test "x$enable_cxx_warnings" = "xyes"; then
++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
++ fi
++ fi
++ fi
++ AC_MSG_RESULT($warnCXXFLAGS)
++
++ AC_ARG_ENABLE(iso-cxx,
++ AC_HELP_STRING([--enable-iso-cxx],
++ [Try to warn if code is not ISO C++ ]),,
++ [enable_iso_cxx=no])
++
++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
++ complCXXFLAGS=
++ if test "x$enable_iso_cxx" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
++ esac
++
++ case " $CXXFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCXXFLAGS)
++
++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
++ AC_SUBST(WARN_CXXFLAGS)
++])
++
+ dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
+ dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
+ AC_DEFUN([GNOME_DOC_DEFINES],
+@@ -715,6 +874,10 @@
enable_scrollkeeper=yes)
AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
@@ -676,7 +872,7 @@
AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
])
-@@ -882,7 +901,7 @@
+@@ -738,7 +901,7 @@
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
@@ -685,7 +881,7 @@
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -895,7 +914,7 @@
+@@ -751,7 +914,7 @@
esac
if test -n "$1"; then
@@ -694,7 +890,7 @@
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 +943,7 @@
+@@ -780,6 +943,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 $< [$]@'
@@ -702,7 +898,7 @@
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -943,6 +963,21 @@
+@@ -799,6 +963,21 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
@@ -724,7 +920,7 @@
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -965,19 +1000,16 @@
+@@ -821,19 +1000,16 @@
fi
fi
@@ -748,7 +944,7 @@
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
-@@ -1018,10 +1050,6 @@
+@@ -874,10 +1050,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" \
@@ -759,7 +955,7 @@
-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 +1064,7 @@
+@@ -892,9 +1064,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -770,7 +966,7 @@
])
-@@ -1087,7 +1113,7 @@
+@@ -943,7 +1113,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -779,7 +975,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1175,7 +1201,6 @@
+@@ -1031,7 +1201,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
@@ -787,7 +983,7 @@
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
-@@ -1277,6 +1302,8 @@
+@@ -1133,6 +1302,8 @@
;;
esac
@@ -796,7 +992,7 @@
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 +1383,80 @@
+@@ -1212,9 +1383,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`
@@ -878,7 +1074,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
-@@ -1683,7 +1781,11 @@
+@@ -1539,7 +1781,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -891,7 +1087,7 @@
esac
;;
esac
-@@ -1776,7 +1878,7 @@
+@@ -1632,7 +1878,7 @@
$2=yes
fi
fi
@@ -900,7 +1096,7 @@
LDFLAGS="$save_LDFLAGS"
])
-@@ -2047,7 +2149,7 @@
+@@ -1903,7 +2149,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
@@ -909,7 +1105,7 @@
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
-@@ -2055,7 +2157,7 @@
+@@ -1911,7 +2157,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
@@ -918,7 +1114,7 @@
])
])
])
-@@ -2372,7 +2474,7 @@
+@@ -2228,7 +2474,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -927,7 +1123,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2713,6 +2815,18 @@
+@@ -2569,6 +2815,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -946,7 +1142,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -2893,6 +3007,13 @@
+@@ -2749,6 +3007,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -960,7 +1156,7 @@
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 +3513,7 @@
+@@ -3248,7 +3513,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -969,7 +1165,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3487,7 +3608,7 @@
+@@ -3343,7 +3608,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -978,7 +1174,7 @@
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 +3949,7 @@
+@@ -3684,7 +3949,7 @@
fi
;;
@@ -987,7 +1183,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -3885,6 +4006,7 @@
+@@ -3741,6 +4006,7 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
@@ -995,7 +1191,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -3994,7 +4116,7 @@
+@@ -3850,7 +4116,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -1004,7 +1200,7 @@
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 +4129,7 @@
+@@ -3863,7 +4129,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.
@@ -1013,7 +1209,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -4153,51 +4275,23 @@
+@@ -4009,51 +4275,23 @@
fi
;;
darwin* | rhapsody*)
@@ -1074,7 +1270,7 @@
else
case $cc_basename in
xlc*)
-@@ -4448,7 +4542,7 @@
+@@ -4304,7 +4542,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'
;;
@@ -1083,7 +1279,7 @@
# 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 +4615,7 @@
+@@ -4377,7 +4615,7 @@
;;
esac
;;
@@ -1092,7 +1288,7 @@
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 +4977,8 @@
+@@ -4739,7 +4977,8 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -1102,7 +1298,7 @@
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 +5103,11 @@
+@@ -4864,6 +5103,11 @@
$rm -f confest.$objext
@@ -1114,7 +1310,7 @@
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
-@@ -5064,7 +5164,6 @@
+@@ -4920,7 +5164,6 @@
;;
esac
])
@@ -1122,7 +1318,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -5149,7 +5248,7 @@
+@@ -5005,7 +5248,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1131,7 +1327,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -5326,6 +5425,7 @@
+@@ -5182,6 +5425,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -1139,7 +1335,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -5388,7 +5488,7 @@
+@@ -5244,7 +5488,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -1148,7 +1344,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -5625,6 +5725,10 @@
+@@ -5481,6 +5725,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
@@ -1159,7 +1355,7 @@
# 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 +6078,7 @@
+@@ -5830,7 +6078,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
@@ -1168,7 +1364,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -6031,7 +6135,8 @@
+@@ -5887,7 +6135,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
@@ -1178,7 +1374,7 @@
;;
darwin* | rhapsody*)
# PIC is the default on this platform
-@@ -6068,7 +6173,7 @@
+@@ -5924,7 +6173,7 @@
esac
else
case $host_os in
@@ -1187,7 +1383,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -6164,7 +6269,7 @@
+@@ -6020,7 +6269,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
@@ -1196,7 +1392,7 @@
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -6202,7 +6307,7 @@
+@@ -6058,7 +6307,7 @@
;;
esac
;;
@@ -1205,7 +1401,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6315,7 +6420,8 @@
+@@ -6171,7 +6420,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
@@ -1215,7 +1411,7 @@
;;
darwin* | rhapsody*)
-@@ -6385,7 +6491,8 @@
+@@ -6241,7 +6491,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).
@@ -1225,7 +1421,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -6522,7 +6629,7 @@
+@@ -6378,7 +6629,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],
@@ -1234,7 +1430,7 @@
[$_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 +6653,7 @@
+@@ -6402,7 +6653,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],
@@ -1243,7 +1439,7 @@
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -6562,7 +6669,7 @@
+@@ -6418,7 +6669,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
@@ -1252,7 +1448,7 @@
# 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 +6684,14 @@
+@@ -6433,10 +6684,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'
;;
@@ -1267,7 +1463,7 @@
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -6611,12 +6722,14 @@
+@@ -6467,12 +6722,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'.
@@ -1283,7 +1479,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
-@@ -6666,7 +6779,7 @@
+@@ -6522,7 +6779,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1292,7 +1488,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -6782,12 +6895,13 @@
+@@ -6638,12 +6895,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
@@ -1307,7 +1503,7 @@
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 +6999,7 @@
+@@ -6741,7 +6999,7 @@
fi
;;
@@ -1316,7 +1512,7 @@
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 +7019,7 @@
+@@ -6761,7 +7019,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.
@@ -1325,7 +1521,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -7065,11 +7179,10 @@
+@@ -6921,11 +7179,10 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1341,7 +1537,7 @@
else
case $cc_basename in
xlc*)
-@@ -7219,7 +7332,7 @@
+@@ -7075,7 +7332,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1350,7 +1546,7 @@
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 +7911,7 @@
+@@ -7654,7 +7911,7 @@
_PKG_TEXT
@@ -1359,7 +1555,7 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -7808,7 +7921,7 @@
+@@ -7664,7 +7921,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
@@ -1368,7 +1564,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -7823,7 +7936,7 @@
+@@ -7679,7 +7936,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.
@@ -1377,7 +1573,7 @@
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-@@ -7839,8 +7952,10 @@
+@@ -7695,8 +7952,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],
@@ -1390,7 +1586,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-@@ -8112,7 +8227,7 @@
+@@ -7968,7 +8227,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.
@@ -1399,7 +1595,7 @@
dirpart=`AS_DIRNAME("$mf")`
else
continue
-@@ -8172,13 +8287,13 @@
+@@ -8028,13 +8287,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -1415,7 +1611,7 @@
# 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 +8398,17 @@
+@@ -8139,16 +8398,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
@@ -1435,7 +1631,7 @@
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
-@@ -8610,7 +8726,7 @@
+@@ -8466,7 +8726,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -1445,8 +1641,8 @@
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urNad f-spot~/configure f-spot/configure
---- f-spot~/configure 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/configure 2008-04-16 22:18:16.000000000 +0100
+--- f-spot~/configure 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/configure 2008-05-01 02:16:49.000000000 +0100
@@ -847,14 +847,14 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
@@ -1475,7 +1671,15 @@
CXX
CXXFLAGS
ac_ct_CXX
-@@ -914,6 +916,7 @@
+@@ -900,6 +902,7 @@
+ FFLAGS
+ ac_ct_F77
+ LIBTOOL
++WARN_CFLAGS
+ PKG_CONFIG
+ GLIB_CFLAGS
+ GLIB_LIBS
+@@ -913,6 +916,7 @@
DOC_USER_FORMATS
ENABLE_SK_TRUE
ENABLE_SK_FALSE
@@ -1483,7 +1687,7 @@
HAVE_GNOME_DOC_UTILS_TRUE
HAVE_GNOME_DOC_UTILS_FALSE
F_CFLAGS
-@@ -969,10 +972,8 @@
+@@ -968,10 +972,8 @@
ICONS_DIRECTORY
GETTEXT_PACKAGE
USE_NLS
@@ -1494,7 +1698,7 @@
CATALOGS
CATOBJEXT
GMOFILES
-@@ -982,6 +983,7 @@
+@@ -981,6 +983,7 @@
PO_IN_DATADIR_FALSE
POFILES
POSUB
@@ -1502,7 +1706,17 @@
LIBJPEG
CSC
expanded_libdir
-@@ -3862,6 +3864,7 @@
+@@ -1618,6 +1621,9 @@
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+ --disable-libtool-lock avoid locking (might break parallel builds)
++ --enable-compile-warnings=[no/minimum/yes/maximum/error]
++ Turn on compiler warnings
++ --enable-iso-c Try to warn if code is not ISO C
+ --disable-glibtest do not try to compile and run a test GLIB program
+ --disable-scrollkeeper do not make updates to the scrollkeeper database
+ --disable-gconf build without gconf preference backend
+@@ -3858,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 $< $@'
@@ -1510,18 +1724,18 @@
-@@ -3882,24 +3885,18 @@
+@@ -3878,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
@@ -1541,7 +1755,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -3909,7 +3906,7 @@
+@@ -3905,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
@@ -1550,7 +1764,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -3920,49 +3917,26 @@
+@@ -3916,49 +3917,26 @@
;;
esac
fi
@@ -1609,7 +1823,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -3972,7 +3946,7 @@
+@@ -3968,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
@@ -1618,7 +1832,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -3980,14 +3954,13 @@
+@@ -3976,14 +3954,13 @@
done
IFS=$as_save_IFS
@@ -1637,7 +1851,7 @@
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-@@ -3998,12 +3971,12 @@
+@@ -3994,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; }
@@ -1653,7 +1867,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4013,7 +3986,7 @@
+@@ -4009,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
@@ -1662,7 +1876,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4021,71 +3994,51 @@
+@@ -4017,71 +3994,51 @@
done
IFS=$as_save_IFS
@@ -1761,7 +1975,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4095,7 +4048,7 @@
+@@ -4091,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
@@ -1770,7 +1984,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4103,20 +4056,41 @@
+@@ -4099,20 +4056,41 @@
done
IFS=$as_save_IFS
@@ -1817,7 +2031,7 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-@@ -4135,7 +4109,7 @@
+@@ -4131,7 +4109,7 @@
main ()
{
extern int _nl_msg_cat_cntr;
@@ -1826,7 +2040,7 @@
;
return 0;
}
-@@ -6136,7 +6110,7 @@
+@@ -6132,7 +6110,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -1835,7 +2049,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6231,7 +6205,7 @@
+@@ -6227,7 +6205,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1844,16 +2058,16 @@
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 @@
+@@ -6347,7 +6325,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6354 "configure"' > conftest.$ac_ext
+- echo '#line 6350 "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 @@
+@@ -6519,7 +6497,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -1866,7 +2080,7 @@
esac
;;
esac
-@@ -7715,7 +7693,6 @@
+@@ -7711,7 +7693,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -1874,7 +2088,7 @@
# 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 @@
+@@ -8026,7 +8007,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -1883,7 +2097,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -8590,6 +8567,318 @@
+@@ -8586,6 +8567,318 @@
;;
esac
@@ -2202,7 +2416,7 @@
enable_dlopen=no
enable_win32_dll=no
-@@ -8655,7 +8944,7 @@
+@@ -8651,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`
@@ -2211,21 +2425,21 @@
-@@ -8683,11 +8972,11 @@
+@@ -8679,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:8682: $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:8686: \$? = $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 @@
+@@ -8953,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; }
@@ -2238,16 +2452,16 @@
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 @@
+@@ -8969,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:8972: $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:8976: \$? = $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
@@ -2272,7 +2486,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -9020,10 +9309,10 @@
+@@ -9016,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; }
@@ -2285,7 +2499,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -9036,20 +9325,20 @@
+@@ -9032,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
@@ -2312,21 +2526,21 @@
:
else
lt_prog_compiler_static=
-@@ -9077,11 +9366,11 @@
+@@ -9073,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:9076: $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:9080: \$? = $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 @@
+@@ -9157,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'.
@@ -2341,7 +2555,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -9225,7 +9515,7 @@
+@@ -9221,7 +9515,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -2350,7 +2564,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -9341,12 +9631,13 @@
+@@ -9337,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
@@ -2365,7 +2579,7 @@
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 @@
+@@ -9440,7 +9735,7 @@
fi
;;
@@ -2374,7 +2588,7 @@
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 @@
+@@ -9460,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.
@@ -2383,7 +2597,7 @@
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 @@
+@@ -9732,11 +10027,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -2399,7 +2613,7 @@
else
case $cc_basename in
xlc*)
-@@ -9890,7 +10180,7 @@
+@@ -9886,7 +10180,7 @@
link_all_deplibs=yes
;;
@@ -2408,7 +2622,7 @@
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 @@
+@@ -10256,7 +10550,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2417,7 +2631,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10601,6 +10891,18 @@
+@@ -10597,6 +10891,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2436,7 +2650,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10782,6 +11084,21 @@
+@@ -10778,6 +11084,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2458,7 +2672,7 @@
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 @@
+@@ -11097,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
@@ -2467,7 +2681,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -11377,7 +11694,7 @@
+@@ -11373,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
@@ -2476,25 +2690,25 @@
fi
-@@ -11426,7 +11743,7 @@
+@@ -11422,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 11425 "configure"
+#line 11746 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11526,7 +11843,7 @@
+@@ -11522,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 11525 "configure"
+#line 11846 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11653,7 +11970,7 @@
+@@ -11649,7 +11970,7 @@
fi
;;
@@ -2503,7 +2717,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11709,6 +12026,7 @@
+@@ -11705,6 +12026,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -2511,7 +2725,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -11769,7 +12087,7 @@
+@@ -11765,7 +12087,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -2520,7 +2734,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -12005,6 +12323,10 @@
+@@ -12001,6 +12323,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -2531,7 +2745,7 @@
# 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 @@
+@@ -12249,6 +12575,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -2539,7 +2753,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -12290,7 +12613,7 @@
+@@ -12286,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`
@@ -2548,7 +2762,7 @@
# Allow CC to be a program name with arguments.
-@@ -12497,7 +12820,7 @@
+@@ -12493,7 +12820,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -2557,7 +2771,7 @@
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 @@
+@@ -12506,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.
@@ -2566,7 +2780,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -12768,51 +13091,23 @@
+@@ -12764,51 +13091,23 @@
fi
;;
darwin* | rhapsody*)
@@ -2627,7 +2841,7 @@
else
case $cc_basename in
xlc*)
-@@ -13063,7 +13358,7 @@
+@@ -13059,7 +13358,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -2636,7 +2850,7 @@
# 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 @@
+@@ -13132,7 +13431,7 @@
;;
esac
;;
@@ -2645,7 +2859,7 @@
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 @@
+@@ -13466,7 +13765,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -2653,7 +2867,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -13572,6 +13866,11 @@
+@@ -13568,6 +13866,11 @@
$rm -f confest.$objext
@@ -2665,7 +2879,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
interix[3-9]*)
-@@ -13627,7 +13926,6 @@
+@@ -13623,7 +13926,6 @@
;;
esac
@@ -2673,7 +2887,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13703,7 +14001,7 @@
+@@ -13699,7 +14001,7 @@
esac
else
case $host_os in
@@ -2682,7 +2896,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -13799,7 +14097,7 @@
+@@ -13795,7 +14097,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -2691,7 +2905,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -13837,7 +14135,7 @@
+@@ -13833,7 +14135,7 @@
;;
esac
;;
@@ -2700,7 +2914,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13930,10 +14228,10 @@
+@@ -13926,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; }
@@ -2713,16 +2927,16 @@
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 @@
+@@ -13942,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:13945: $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:13949: \$? = $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
@@ -2747,7 +2961,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -13993,10 +14291,10 @@
+@@ -13989,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; }
@@ -2760,7 +2974,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -14009,20 +14307,20 @@
+@@ -14005,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
@@ -2787,21 +3001,21 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -14050,11 +14348,11 @@
+@@ -14046,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:14049: $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:14053: \$? = $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 @@
+@@ -14103,7 +14405,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -2810,7 +3024,7 @@
# 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 @@
+@@ -14118,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'
;;
@@ -2825,7 +3039,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -14227,7 +14529,7 @@
+@@ -14223,7 +14529,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2834,7 +3048,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14567,6 +14869,18 @@
+@@ -14563,6 +14869,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2853,7 +3067,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14748,6 +15062,21 @@
+@@ -14744,6 +15062,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2875,7 +3089,7 @@
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 @@
+@@ -14827,6 +15160,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -2883,7 +3097,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -15079,6 +15409,10 @@
+@@ -15075,6 +15409,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -2894,7 +3108,7 @@
# 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 @@
+@@ -15289,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`
@@ -2903,7 +3117,7 @@
# Allow CC to be a program name with arguments.
-@@ -15331,7 +15665,7 @@
+@@ -15327,7 +15665,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2912,7 +3126,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -15596,10 +15930,10 @@
+@@ -15592,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; }
@@ -2925,16 +3139,16 @@
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 @@
+@@ -15608,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:15611: $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:15615: \$? = $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
@@ -2959,7 +3173,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -15659,10 +15993,10 @@
+@@ -15655,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; }
@@ -2972,7 +3186,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -15675,20 +16009,20 @@
+@@ -15671,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
@@ -2999,21 +3213,21 @@
:
else
lt_prog_compiler_static_F77=
-@@ -15716,11 +16050,11 @@
+@@ -15712,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:15715: $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:15719: \$? = $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 @@
+@@ -15796,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'.
@@ -3028,7 +3242,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -15864,7 +16199,7 @@
+@@ -15860,7 +16199,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -3037,7 +3251,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -15980,12 +16315,13 @@
+@@ -15976,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
@@ -3052,7 +3266,7 @@
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 @@
+@@ -16079,7 +16419,7 @@
fi
;;
@@ -3061,7 +3275,7 @@
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 @@
+@@ -16099,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.
@@ -3070,7 +3284,7 @@
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 @@
+@@ -16351,11 +16691,10 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -3086,7 +3300,7 @@
else
case $cc_basename in
xlc*)
-@@ -16509,7 +16844,7 @@
+@@ -16505,7 +16844,7 @@
link_all_deplibs_F77=yes
;;
@@ -3095,7 +3309,7 @@
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 @@
+@@ -16824,7 +17163,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -3104,7 +3318,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17168,6 +17503,18 @@
+@@ -17164,6 +17503,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3123,7 +3337,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17349,6 +17696,21 @@
+@@ -17345,6 +17696,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -3145,7 +3359,7 @@
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 @@
+@@ -17428,6 +17794,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -3153,7 +3367,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -17680,6 +18043,10 @@
+@@ -17676,6 +18043,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -3164,7 +3378,7 @@
# 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 @@
+@@ -17850,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`
@@ -3173,21 +3387,21 @@
# Allow CC to be a program name with arguments.
-@@ -17903,11 +18270,11 @@
+@@ -17899,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:17902: $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:17906: \$? = $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 @@
+@@ -17963,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
@@ -3196,7 +3410,7 @@
;;
darwin* | rhapsody*)
-@@ -18037,7 +18404,7 @@
+@@ -18033,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).
@@ -3205,7 +3419,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -18177,10 +18544,10 @@
+@@ -18173,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; }
@@ -3218,16 +3432,16 @@
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 @@
+@@ -18189,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:18192: $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:18196: \$? = $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
@@ -3252,7 +3466,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -18240,10 +18607,10 @@
+@@ -18236,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; }
@@ -3265,7 +3479,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -18256,20 +18623,20 @@
+@@ -18252,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
@@ -3292,21 +3506,21 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -18297,11 +18664,11 @@
+@@ -18293,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:18296: $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:18300: \$? = $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 @@
+@@ -18377,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'.
@@ -3321,7 +3535,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -18445,7 +18813,7 @@
+@@ -18441,7 +18813,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -3330,7 +3544,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -18561,12 +18929,13 @@
+@@ -18557,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
@@ -3345,7 +3559,7 @@
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 @@
+@@ -18660,7 +19033,7 @@
fi
;;
@@ -3354,7 +3568,7 @@
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 @@
+@@ -18680,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.
@@ -3363,7 +3577,7 @@
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 @@
+@@ -18952,11 +19325,10 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -3379,7 +3593,7 @@
else
case $cc_basename in
xlc*)
-@@ -19110,7 +19478,7 @@
+@@ -19106,7 +19478,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -3388,7 +3602,7 @@
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 @@
+@@ -19425,7 +19797,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -3397,7 +3611,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19769,6 +20137,18 @@
+@@ -19765,6 +20137,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3416,7 +3630,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19950,6 +20330,21 @@
+@@ -19946,6 +20330,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -3438,7 +3652,7 @@
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 @@
+@@ -20029,6 +20428,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -3446,7 +3660,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -20281,6 +20677,10 @@
+@@ -20277,6 +20677,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -3457,7 +3671,7 @@
# 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 @@
+@@ -20450,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`
@@ -3466,7 +3680,7 @@
# Allow CC to be a program name with arguments.
-@@ -20514,6 +20914,7 @@
+@@ -20510,6 +20914,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -3474,7 +3688,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -20762,6 +21163,10 @@
+@@ -20758,6 +21163,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -3485,7 +3699,166 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -21651,6 +22056,9 @@
+@@ -20946,7 +21355,138 @@
+
+
+
+-GNOME_COMPILE_WARNINGS
++
++
++ # Check whether --enable-compile-warnings was given.
++if test "${enable_compile_warnings+set}" = set; then
++ enableval=$enable_compile_warnings;
++else
++ enable_compile_warnings="yes"
++fi
++
++
++ warnCFLAGS=
++ if test "x$GCC" != xyes; then
++ enable_compile_warnings=no
++ fi
++
++ warning_flags=
++ realsave_CFLAGS="$CFLAGS"
++
++ case "$enable_compile_warnings" in
++ no)
++ warning_flags=
++ ;;
++ minimum)
++ warning_flags="-Wall"
++ ;;
++ yes)
++ warning_flags="-Wall -Wmissing-prototypes"
++ ;;
++ maximum|error)
++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
++ CFLAGS="$warning_flags $CFLAGS"
++ for option in -Wno-sign-compare; do
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS $option"
++ { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
++echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
++ 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
++if { (ac_try="$ac_compile"
++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_compile") 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_objext; then
++ has_option=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ has_option=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ CFLAGS="$SAVE_CFLAGS"
++ { echo "$as_me:$LINENO: result: $has_option" >&5
++echo "${ECHO_T}$has_option" >&6; }
++ if test $has_option = yes; then
++ warning_flags="$warning_flags $option"
++ fi
++ unset has_option
++ unset SAVE_CFLAGS
++ done
++ unset option
++ if test "$enable_compile_warnings" = "error" ; then
++ warning_flags="$warning_flags -Werror"
++ fi
++ ;;
++ *)
++ { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
++echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
++ { (exit 1); exit 1; }; }
++ ;;
++ esac
++ CFLAGS="$realsave_CFLAGS"
++ { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
++echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: result: $warning_flags" >&5
++echo "${ECHO_T}$warning_flags" >&6; }
++
++ # Check whether --enable-iso-c was given.
++if test "${enable_iso_c+set}" = set; then
++ enableval=$enable_iso_c;
++else
++ enable_iso_c=no
++fi
++
++
++ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
++echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
++ complCFLAGS=
++ if test "x$enable_iso_c" != "xno"; then
++ if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *\ \ -ansi\ \ *) ;;
++ *) complCFLAGS="$complCFLAGS -ansi" ;;
++ esac
++ case " $CFLAGS " in
++ *\ \ -pedantic\ \ *) ;;
++ *) complCFLAGS="$complCFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
++echo "${ECHO_T}$complCFLAGS" >&6; }
++
++ WARN_CFLAGS="$warning_flags $complCFLAGS"
++
++
+ # Check whether --enable-glibtest was given.
+ if test "${enable_glibtest+set}" = set; then
+ enableval=$enable_glibtest;
+@@ -20971,6 +21511,9 @@
+ gthread)
+ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
++ gio*)
++ pkg_config_args="$pkg_config_args $module-2.0"
++ ;;
+ esac
+ done
+
+@@ -21081,7 +21624,7 @@
+
+ fi
+ if test -n "$PKG_CONFIG"; then
+- _pkg_min_version=0.7
++ _pkg_min_version=0.16
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+ echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+@@ -21513,6 +22056,9 @@
fi
@@ -3495,7 +3868,7 @@
if test "$gdu_cv_have_gdu" = "yes"; then
HAVE_GNOME_DOC_UTILS_TRUE=
HAVE_GNOME_DOC_UTILS_FALSE='#'
-@@ -21794,7 +22202,7 @@
+@@ -21656,7 +22202,7 @@
and F_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3504,7 +3877,7 @@
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 +22212,7 @@
+@@ -21666,7 +22212,7 @@
and F_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3513,15 +3886,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21817,6 +22225,7 @@
-
-
-
-+CSC_DEFINES=""
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GNOME_SHARP" >&5
-@@ -21908,7 +22317,7 @@
+@@ -21771,7 +22317,7 @@
and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3530,7 +3895,7 @@
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 +22327,7 @@
+@@ -21781,7 +22327,7 @@
and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3539,16 +3904,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21928,7 +22337,7 @@
- echo "${ECHO_T}yes" >&6; }
- :
- fi
--if pkg-config --atleast-version=2.19.90 gnome-sharp; then
-+if pkg-config --atleast-version=2.19.90 gnome-sharp-2.0; then
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GTKHTML_SHARP" >&5
-@@ -22020,7 +22429,7 @@
+@@ -21883,7 +22429,7 @@
and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3557,7 +3913,7 @@
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 +22439,7 @@
+@@ -21893,7 +22439,7 @@
and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3566,17 +3922,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22040,7 +22449,8 @@
- echo "${ECHO_T}yes" >&6; }
- :
- fi
-- GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14"
-+ GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14 -pkg:gnome-sharp-2.0"
-+ CSC_DEFINES="$CSC_DEFINES -d:GTKHTML_3_14"
- else
-
- pkg_failed=no
-@@ -22133,7 +22543,7 @@
+@@ -21997,7 +22543,7 @@
and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3585,7 +3931,7 @@
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 +22553,7 @@
+@@ -22007,7 +22553,7 @@
and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3594,22 +3940,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22157,12 +22567,11 @@
- fi
-
-
--CSC_DEFINES=""
- if pkg-config --atleast-version=2.10 gtk-sharp-2.0; then
-- CSC_DEFINES="-d:GTK_2_10"
-+ CSC_DEFINES="$CSC_DEFINES -d:GTK_2_10"
- fi
- if pkg-config --atleast-version=2.11 gtk-sharp-2.0; then
-- CSC_DEFINES="-d:GTK_2_11"
-+ CSC_DEFINES="$CSC_DEFINES -d:GTK_2_11"
- fi
-
- # Check whether --enable-gconf was given.
-@@ -22274,7 +22683,7 @@
+@@ -22144,7 +22690,7 @@
and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3618,7 +3949,7 @@
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 +22693,7 @@
+@@ -22154,7 +22700,7 @@
and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3627,7 +3958,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23925,7 +24334,7 @@
+@@ -23795,7 +24341,7 @@
and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3636,7 +3967,7 @@
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 +24344,7 @@
+@@ -23805,7 +24351,7 @@
and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3645,7 +3976,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24039,7 +24448,7 @@
+@@ -23909,7 +24455,7 @@
and EXIF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3654,7 +3985,7 @@
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 +24458,7 @@
+@@ -23919,7 +24465,7 @@
and EXIF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3663,7 +3994,16 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -25686,6 +26095,15 @@
+@@ -24264,7 +24810,7 @@
+
+ fi
+ fi
+- USE_NLS=yes
++ USE_NLS=yes
+
+
+ gt_cv_have_gettext=no
+@@ -25556,6 +26102,15 @@
fi
fi
@@ -3679,16 +4019,16 @@
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -25723,7 +26141,7 @@
+@@ -25593,7 +26148,7 @@
GNOME_ICON_THEME_PREFIX=`$PKG_CONFIG --variable=prefix gnome-icon-theme`
--ac_config_files="$ac_config_files Makefile dbus-sharp/Makefile dbus-sharp-glib/Makefile docs/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile mono-addins/Makefile mono-addins/Mono.Addins/Makefile mono-addins/Mono.Addins.Gui/Makefile mono-addins/Mono.Addins.Setup/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Makefile glitz-sharp/Makefile glitz-sharp/src/Makefile Tao/Makefile Tao/Tao.OpenGl/Makefile Tao/Tao.OpenGl.Glu/Makefile Tao/Tao.GlPostProcess/Makefile Tao/Tao.OpenGl.ExtensionLoader/Makefile extensions/Makefile extensions/CDExport/Makefile extensions/DefaultExporters/Makefile extensions/FlickrExport/Makefile extensions/FlickrExport/FlickrNet/Makefile extensions/GalleryExport/Makefile extensions/FolderExport/Makefile extensions/SmugMugExport/SmugMugNet/Makefile extensions/SmugMugExport/Makefile extensions/PicasaWebExport/Makefile extensions/PicasaWebExport/google-sharp/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in"
+-ac_config_files="$ac_config_files Makefile dbus-sharp/Makefile dbus-sharp-glib/Makefile docs/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile mono-addins/Makefile mono-addins/Mono.Addins/Makefile mono-addins/Mono.Addins.Gui/Makefile mono-addins/Mono.Addins.Setup/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Cms.dll.config src/Makefile glitz-sharp/Makefile glitz-sharp/src/Makefile Tao/Makefile Tao/Tao.OpenGl/Makefile Tao/Tao.OpenGl.Glu/Makefile Tao/Tao.GlPostProcess/Makefile Tao/Tao.OpenGl.ExtensionLoader/Makefile extensions/Makefile extensions/CDExport/Makefile extensions/DefaultExporters/Makefile extensions/FlickrExport/Makefile extensions/FlickrExport/FlickrNet/Makefile extensions/GalleryExport/Makefile extensions/FolderExport/Makefile extensions/SmugMugExport/SmugMugNet/Makefile extensions/SmugMugExport/Makefile extensions/PicasaWebExport/Makefile extensions/PicasaWebExport/google-sharp/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in f-spot-import.desktop.in"
+ac_config_files="$ac_config_files Makefile dbus-sharp/Makefile dbus-sharp-glib/Makefile docs/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Cms.dll.config src/Makefile glitz-sharp/Makefile glitz-sharp/src/Makefile Tao/Makefile Tao/Tao.OpenGl/Makefile Tao/Tao.OpenGl.Glu/Makefile Tao/Tao.GlPostProcess/Makefile Tao/Tao.OpenGl.ExtensionLoader/Makefile extensions/Makefile extensions/CDExport/Makefile extensions/DefaultExporters/Makefile extensions/FlickrExport/Makefile extensions/GalleryExport/Makefile extensions/FolderExport/Makefile extensions/SmugMugExport/SmugMugNet/Makefile extensions/SmugMugExport/Makefile extensions/PicasaWebExport/Makefile extensions/PicasaWebExport/google-sharp/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in f-spot-import.desktop.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -26355,9 +26773,7 @@
+@@ -26225,9 +26780,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"
@@ -3699,7 +4039,7 @@
_ACEOF
-@@ -26384,16 +26800,13 @@
+@@ -26254,10 +26807,6 @@
"libjpegtran/Makefile") CONFIG_FILES="$CONFIG_FILES libjpegtran/Makefile" ;;
"libfspot/Makefile") CONFIG_FILES="$CONFIG_FILES libfspot/Makefile" ;;
"libgphoto2-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES libgphoto2-sharp/Makefile" ;;
@@ -3710,14 +4050,7 @@
"semweb/Makefile") CONFIG_FILES="$CONFIG_FILES semweb/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "src/Core/Defines.cs") CONFIG_FILES="$CONFIG_FILES src/Core/Defines.cs" ;;
- "src/AssemblyInfo.cs") CONFIG_FILES="$CONFIG_FILES src/AssemblyInfo.cs" ;;
- "src/f-spot.exe.config") CONFIG_FILES="$CONFIG_FILES src/f-spot.exe.config" ;;
-+ "src/Cms.dll.config") CONFIG_FILES="$CONFIG_FILES src/Cms.dll.config" ;;
- "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "glitz-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES glitz-sharp/Makefile" ;;
- "glitz-sharp/src/Makefile") CONFIG_FILES="$CONFIG_FILES glitz-sharp/src/Makefile" ;;
-@@ -26406,7 +26819,6 @@
+@@ -26277,7 +26826,6 @@
"extensions/CDExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/CDExport/Makefile" ;;
"extensions/DefaultExporters/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/DefaultExporters/Makefile" ;;
"extensions/FlickrExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/FlickrExport/Makefile" ;;
@@ -3725,15 +4058,7 @@
"extensions/GalleryExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/GalleryExport/Makefile" ;;
"extensions/FolderExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/FolderExport/Makefile" ;;
"extensions/SmugMugExport/SmugMugNet/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/SmugMugExport/SmugMugNet/Makefile" ;;
-@@ -26417,6 +26829,7 @@
- "f-spot.spec") CONFIG_FILES="$CONFIG_FILES f-spot.spec" ;;
- "f-spot.desktop.in") CONFIG_FILES="$CONFIG_FILES f-spot.desktop.in" ;;
- "f-spot-view.desktop.in") CONFIG_FILES="$CONFIG_FILES f-spot-view.desktop.in" ;;
-+ "f-spot-import.desktop.in") CONFIG_FILES="$CONFIG_FILES f-spot-import.desktop.in" ;;
- "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-@@ -26560,14 +26973,14 @@
+@@ -26432,14 +26980,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
@@ -3752,7 +4077,7 @@
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
-@@ -26643,6 +27056,8 @@
+@@ -26515,6 +27063,8 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
@@ -3761,7 +4086,15 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -26668,6 +27083,7 @@
+@@ -26526,6 +27076,7 @@
+ FFLAGS!$FFLAGS$ac_delim
+ ac_ct_F77!$ac_ct_F77$ac_delim
+ LIBTOOL!$LIBTOOL$ac_delim
++WARN_CFLAGS!$WARN_CFLAGS$ac_delim
+ PKG_CONFIG!$PKG_CONFIG$ac_delim
+ GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
+ GLIB_LIBS!$GLIB_LIBS$ac_delim
+@@ -26539,6 +27090,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
@@ -3769,27 +4102,29 @@
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 +27128,6 @@
+@@ -26583,10 +27135,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
+-WITH_TURTLE_TRUE!$WITH_TURTLE_TRUE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26756,6 +27169,9 @@
+@@ -26628,6 +27176,10 @@
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_TRUE!$WITH_TURTLE_TRUE$ac_delim
WITH_TURTLE_FALSE!$WITH_TURTLE_FALSE$ac_delim
TURTLEDIR!$TURTLEDIR$ac_delim
-@@ -26764,10 +27180,8 @@
+ GNOME_SCREENSAVER_SAVERDIR!$GNOME_SCREENSAVER_SAVERDIR$ac_delim
+@@ -26635,10 +27187,8 @@
ICONS_DIRECTORY!$ICONS_DIRECTORY$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
@@ -3800,7 +4135,7 @@
CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
GMOFILES!$GMOFILES$ac_delim
-@@ -26777,6 +27191,7 @@
+@@ -26648,6 +27198,7 @@
PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
@@ -3808,16 +4143,16 @@
LIBJPEG!$LIBJPEG$ac_delim
CSC!$CSC$ac_delim
expanded_libdir!$expanded_libdir$ac_delim
-@@ -26785,7 +27200,7 @@
+@@ -26656,7 +27207,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` = 26; 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 +27601,22 @@
+@@ -27057,21 +27608,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -3847,7 +4182,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27237,7 +27653,7 @@
+@@ -27108,7 +27660,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.
@@ -3856,7 +4191,7 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -27356,10 +27772,6 @@
+@@ -27227,10 +27779,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" \
@@ -3868,8 +4203,8 @@
< ${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-04-16 22:07:51.000000000 +0100
-+++ f-spot/dbus-sharp/Makefile.in 2008-04-16 22:18:18.000000000 +0100
+--- f-spot~/dbus-sharp/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/dbus-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -3932,7 +4267,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -3946,8 +4289,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.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-04-16 22:07:51.000000000 +0100
-+++ f-spot/dbus-sharp-glib/Makefile.in 2008-04-16 22:18:17.000000000 +0100
+--- f-spot~/dbus-sharp-glib/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/dbus-sharp-glib/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -4010,7 +4353,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -4024,8 +4375,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/docs/Makefile.in f-spot/docs/Makefile.in
---- f-spot~/docs/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/docs/Makefile.in 2008-04-16 22:18:18.000000000 +0100
+--- f-spot~/docs/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/docs/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -4088,9 +4439,17 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -226,6 +228,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
diff -urNad f-spot~/extensions/CDExport/Makefile.in f-spot/extensions/CDExport/Makefile.in
---- f-spot~/extensions/CDExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/CDExport/Makefile.in 2008-04-16 22:18:18.000000000 +0100
+--- f-spot~/extensions/CDExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/CDExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -4153,7 +4512,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -4167,8 +4534,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/extensions/DefaultExporters/Makefile.in f-spot/extensions/DefaultExporters/Makefile.in
---- f-spot~/extensions/DefaultExporters/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/DefaultExporters/Makefile.in 2008-04-16 22:18:18.000000000 +0100
+--- f-spot~/extensions/DefaultExporters/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/DefaultExporters/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -4231,7 +4598,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -4245,8 +4620,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.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-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -4309,7 +4684,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -287,9 +289,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -4323,8 +4698,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/extensions/FlickrExport/Makefile.in f-spot/extensions/FlickrExport/Makefile.in
---- f-spot~/extensions/FlickrExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/FlickrExport/Makefile.in 2008-04-16 22:18:18.000000000 +0100
+--- f-spot~/extensions/FlickrExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/FlickrExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -4413,7 +4788,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -300,9 +290,9 @@
+@@ -224,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -299,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -4426,7 +4809,7 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-@@ -326,16 +316,13 @@
+@@ -325,16 +316,13 @@
-r:../../src/FSpot.Core.dll \
-r:../../src/FSpot.Utils.dll \
-r:../../semweb/SemWeb.dll \
@@ -4444,7 +4827,7 @@
RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
-resource:$(srcdir)/$(PLUGIN_NAME).glade
-@@ -354,7 +341,7 @@
+@@ -353,7 +341,7 @@
$(PLUGIN_ASSEMBLY).mdb \
*.mpack
@@ -4453,7 +4836,7 @@
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
-@@ -409,137 +396,12 @@
+@@ -408,137 +396,12 @@
echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
rm -f "$(DESTDIR)$(plugindir)/$$f"; \
done
@@ -4593,7 +4976,7 @@
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-@@ -567,40 +429,22 @@
+@@ -566,40 +429,22 @@
|| exit 1; \
fi; \
done
@@ -4641,7 +5024,7 @@
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-@@ -617,21 +461,21 @@
+@@ -616,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."
@@ -4669,7 +5052,7 @@
info-am:
-@@ -639,57 +483,53 @@
+@@ -638,57 +483,53 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -4747,9 +5130,17 @@
all: $(PLUGIN_ASSEMBLY)
+@@ -697,7 +538,6 @@
+ mautil p $(PLUGIN_ASSEMBLY)
+
+ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+- $(MAKE) -C $(SUBDIRS)
+ $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+
+ install-data-hook:
diff -urNad f-spot~/extensions/FolderExport/Makefile.in f-spot/extensions/FolderExport/Makefile.in
---- f-spot~/extensions/FolderExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/FolderExport/Makefile.in 2008-04-16 22:18:18.000000000 +0100
+--- f-spot~/extensions/FolderExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/FolderExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -4812,7 +5203,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -4826,8 +5225,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/extensions/GalleryExport/Makefile.in f-spot/extensions/GalleryExport/Makefile.in
---- f-spot~/extensions/GalleryExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/GalleryExport/Makefile.in 2008-04-16 22:18:18.000000000 +0100
+--- f-spot~/extensions/GalleryExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/GalleryExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -4890,7 +5289,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -4903,18 +5310,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
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-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/Makefile.in 2008-04-16 22:18:18.000000000 +0100
+--- f-spot~/extensions/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -4977,7 +5375,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -420,8 +422,8 @@
+@@ -223,6 +225,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -419,8 +422,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4988,7 +5394,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -446,8 +448,8 @@
+@@ -445,8 +448,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4999,7 +5405,7 @@
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 @@
+@@ -456,13 +459,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -5016,8 +5422,8 @@
|| $(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-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-04-16 22:18:19.000000000 +0100
+--- f-spot~/extensions/PicasaWebExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -5080,7 +5486,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -300,9 +302,9 @@
+@@ -224,6 +226,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -299,9 +302,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -5093,7 +5507,7 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-@@ -487,8 +489,8 @@
+@@ -486,8 +489,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -5104,7 +5518,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -513,8 +515,8 @@
+@@ -512,8 +515,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -5115,7 +5529,7 @@
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 @@
+@@ -523,13 +526,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -5132,8 +5546,8 @@
|| $(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-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-16 22:18:19.000000000 +0100
+--- f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -5196,7 +5610,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -5210,8 +5632,8 @@
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-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/Makefile.in 2008-04-16 22:18:19.000000000 +0100
+--- f-spot~/extensions/SmugMugExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/SmugMugExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -5274,7 +5696,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -300,9 +302,9 @@
+@@ -224,6 +226,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -299,9 +302,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -5287,7 +5717,7 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-@@ -485,8 +487,8 @@
+@@ -484,8 +487,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -5298,7 +5728,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -511,8 +513,8 @@
+@@ -510,8 +513,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -5309,7 +5739,7 @@
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 @@
+@@ -521,13 +524,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -5326,8 +5756,8 @@
|| $(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-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-16 22:18:19.000000000 +0100
+--- f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -5390,7 +5820,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -5404,8 +5842,8 @@
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-04-16 22:07:51.000000000 +0100
-+++ f-spot/glitz-sharp/Makefile.in 2008-04-16 22:18:19.000000000 +0100
+--- f-spot~/glitz-sharp/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/glitz-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -5468,7 +5906,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -383,8 +385,8 @@
+@@ -213,6 +215,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -382,8 +385,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -5479,7 +5925,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -409,8 +411,8 @@
+@@ -408,8 +411,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -5490,7 +5936,7 @@
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 @@
+@@ -419,13 +422,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -5507,8 +5953,8 @@
|| $(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-04-16 22:07:51.000000000 +0100
-+++ f-spot/glitz-sharp/src/Makefile.in 2008-04-16 22:18:19.000000000 +0100
+--- f-spot~/glitz-sharp/src/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/glitz-sharp/src/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -5571,7 +6017,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -5585,8 +6039,8 @@
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-04-16 22:07:51.000000000 +0100
-+++ f-spot/gnome-keyring-sharp/Makefile.in 2008-04-16 22:18:19.000000000 +0100
+--- f-spot~/gnome-keyring-sharp/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/gnome-keyring-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -5649,7 +6103,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -5663,8 +6125,8 @@
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-04-16 22:07:51.000000000 +0100
-+++ f-spot/icons/Makefile.in 2008-04-16 22:18:19.000000000 +0100
+--- f-spot~/icons/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/icons/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -5727,7 +6189,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -313,11 +315,6 @@
+@@ -201,6 +203,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -312,11 +315,6 @@
actions,view-restore-22.png \
actions,view-restore-24.png \
actions,view-restore-32.png \
@@ -5740,8 +6210,8 @@
devices,camera-photo-22.png \
devices,camera-photo-24.png \
diff -urNad f-spot~/intltool-extract.in f-spot/intltool-extract.in
---- f-spot~/intltool-extract.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/intltool-extract.in 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/intltool-extract.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/intltool-extract.in 2008-05-01 02:16:49.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -5800,8 +6270,8 @@
### For translatable Glade XML files ###
diff -urNad f-spot~/intltool-merge.in f-spot/intltool-merge.in
---- f-spot~/intltool-merge.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/intltool-merge.in 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/intltool-merge.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/intltool-merge.in 2008-05-01 02:16:49.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -6113,8 +6583,8 @@
}
close OUTPUT;
diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
---- f-spot~/intltool-update.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/intltool-update.in 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/intltool-update.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/intltool-update.in 2008-05-01 02:16:49.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
@@ -6373,8 +6843,8 @@
return $keywords;
diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
---- f-spot~/libeog/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/libeog/Makefile.in 2008-04-16 22:18:20.000000000 +0100
+--- f-spot~/libeog/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/libeog/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -6395,9 +6865,9 @@
+libfspoteog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
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 \
- libeog-marshal.lo uta.lo cursors.lo ui-image.lo zoom.lo
+ accessible-image-view.lo eog-image.lo eog-pixbuf-util.lo \
+ eog-scroll-view.lo image-view.lo 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@
@@ -6456,7 +6926,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -338,6 +342,7 @@
+@@ -242,6 +246,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -335,6 +340,7 @@
zoom.h
libfspoteog_la_SOURCES = $(libfspoteog_files)
@@ -6464,7 +6942,7 @@
MARSHAL_GENERATED = libeog-marshal.c libeog-marshal.h
BUILT_SOURCES = $(MARSHAL_GENERATED)
EXTRA_DIST = libeog-marshal.list
-@@ -381,8 +386,8 @@
+@@ -378,8 +384,8 @@
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -6475,7 +6953,7 @@
else :; fi; \
done
-@@ -390,8 +395,8 @@
+@@ -387,8 +393,8 @@
@$(NORMAL_UNINSTALL)
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -6486,7 +6964,7 @@
done
clean-fspotlibLTLIBRARIES:
-@@ -527,8 +532,8 @@
+@@ -523,8 +529,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6497,7 +6975,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -553,8 +558,8 @@
+@@ -549,8 +555,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6508,7 +6986,7 @@
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 @@
+@@ -560,13 +566,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -6525,8 +7003,8 @@
|| $(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-04-16 22:07:51.000000000 +0100
-+++ f-spot/libeog/cursors/Makefile.in 2008-04-16 22:18:20.000000000 +0100
+--- f-spot~/libeog/cursors/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/libeog/cursors/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -6589,9 +7067,17 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -201,6 +203,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
diff -urNad f-spot~/libfspot/Makefile.in f-spot/libfspot/Makefile.in
---- f-spot~/libfspot/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/libfspot/Makefile.in 2008-04-16 22:18:20.000000000 +0100
+--- f-spot~/libfspot/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/libfspot/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -6670,7 +7156,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -318,6 +321,8 @@
+@@ -233,6 +236,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -317,6 +321,8 @@
f-utils.h
libfspot_la_LIBADD = \
@@ -6679,7 +7173,7 @@
$(LCMS_LIBS) \
$(EXIF_LIBS) \
$(top_builddir)/libjpegtran/libfspotjpegtran.la \
-@@ -370,8 +375,8 @@
+@@ -369,8 +375,8 @@
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -6690,7 +7184,7 @@
else :; fi; \
done
-@@ -379,8 +384,8 @@
+@@ -378,8 +384,8 @@
@$(NORMAL_UNINSTALL)
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -6701,7 +7195,7 @@
done
clean-fspotlibLTLIBRARIES:
-@@ -442,8 +447,8 @@
+@@ -441,8 +447,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6712,7 +7206,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -455,8 +460,8 @@
+@@ -454,8 +460,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6723,7 +7217,7 @@
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 @@
+@@ -465,13 +471,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -6740,8 +7234,8 @@
|| $(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-04-16 22:07:51.000000000 +0100
-+++ f-spot/libgphoto2-sharp/Makefile.in 2008-04-16 22:18:20.000000000 +0100
+--- f-spot~/libgphoto2-sharp/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/libgphoto2-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -6804,7 +7298,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -6818,8 +7320,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/libjpegtran/Makefile.in f-spot/libjpegtran/Makefile.in
---- f-spot~/libjpegtran/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/libjpegtran/Makefile.in 2008-04-16 22:18:20.000000000 +0100
+--- f-spot~/libjpegtran/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/libjpegtran/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -6897,7 +7399,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -302,6 +305,7 @@
+@@ -229,6 +232,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -301,6 +305,7 @@
libfspotjpegtran_la_SOURCES = \
$(libfspotjpegtran_files)
@@ -6905,7 +7415,7 @@
EXTRA_DIST = README
all: all-am
-@@ -342,8 +346,8 @@
+@@ -341,8 +346,8 @@
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -6916,7 +7426,7 @@
else :; fi; \
done
-@@ -351,8 +355,8 @@
+@@ -350,8 +355,8 @@
@$(NORMAL_UNINSTALL)
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -6927,7 +7437,7 @@
done
clean-fspotlibLTLIBRARIES:
-@@ -409,8 +413,8 @@
+@@ -408,8 +413,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6938,7 +7448,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -422,8 +426,8 @@
+@@ -421,8 +426,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6949,7 +7459,7 @@
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 @@
+@@ -432,13 +437,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -6966,8 +7476,8 @@
|| $(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-04-16 22:07:51.000000000 +0100
-+++ f-spot/mono-addins/Makefile.in 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/mono-addins/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/mono-addins/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -7030,7 +7540,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -386,8 +388,8 @@
+@@ -385,8 +387,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7041,7 +7551,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -412,8 +414,8 @@
+@@ -411,8 +413,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7052,7 +7562,7 @@
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 @@
+@@ -422,13 +424,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -7069,8 +7579,8 @@
|| $(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-04-16 22:07:51.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/mono-addins/Mono.Addins/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -7133,7 +7643,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -287,9 +289,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -7147,8 +7657,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.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-04-16 22:07:51.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -7211,7 +7721,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -287,9 +289,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -7225,8 +7735,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.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-04-16 22:07:51.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -7289,7 +7799,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -287,9 +289,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -7303,8 +7813,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/po/Makefile.in.in f-spot/po/Makefile.in.in
---- f-spot~/po/Makefile.in.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/po/Makefile.in.in 2008-04-16 22:18:02.000000000 +0100
+--- f-spot~/po/Makefile.in.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/po/Makefile.in.in 2008-05-01 02:16:49.000000000 +0100
@@ -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>
@@ -7338,8 +7848,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
diff -urNad f-spot~/semweb/Makefile.in f-spot/semweb/Makefile.in
---- f-spot~/semweb/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/semweb/Makefile.in 2008-04-16 22:18:20.000000000 +0100
+--- f-spot~/semweb/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/semweb/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -7402,7 +7912,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -288,9 +290,9 @@
+@@ -212,6 +214,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -287,9 +290,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -7416,8 +7934,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/src/Makefile.in f-spot/src/Makefile.in
---- f-spot~/src/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/src/Makefile.in 2008-04-16 22:18:20.000000000 +0100
+--- f-spot~/src/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/src/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -7429,31 +7947,7 @@
# 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.
-@@ -33,9 +33,10 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--DIST_COMMON = $(srcdir)/AssemblyInfo.cs.in $(srcdir)/Makefile.am \
-- $(srcdir)/Makefile.in $(srcdir)/f-spot.exe.config.in \
-- $(srcdir)/f-spot.in $(top_srcdir)/Makefile.include
-+DIST_COMMON = $(srcdir)/AssemblyInfo.cs.in $(srcdir)/Cms.dll.config.in \
-+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+ $(srcdir)/f-spot.exe.config.in $(srcdir)/f-spot.in \
-+ $(top_srcdir)/Makefile.include
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-@@ -44,7 +45,8 @@
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES = f-spot AssemblyInfo.cs f-spot.exe.config
-+CONFIG_CLEAN_FILES = f-spot AssemblyInfo.cs f-spot.exe.config \
-+ Cms.dll.config
- am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(fspotlibdir)"
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(bin_SCRIPTS)
-@@ -90,7 +92,9 @@
+@@ -92,7 +92,9 @@
DEPDIR = @DEPDIR@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
@@ -7463,7 +7957,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -139,14 +143,12 @@
+@@ -141,14 +143,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7479,7 +7973,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -158,7 +160,6 @@
+@@ -160,7 +160,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7487,7 +7981,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -180,13 +181,16 @@
+@@ -182,13 +181,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -7504,7 +7998,15 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -292,9 +296,9 @@
+@@ -218,6 +220,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -293,9 +296,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -7517,7 +8019,7 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-@@ -306,7 +310,7 @@
+@@ -307,7 +310,7 @@
CSC_LIB = gmcs $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
RUNTIME = mono $(MONO_DEBUGFLAGS)
@@ -7526,7 +8028,7 @@
CMS_CSDISTFILES = \
$(srcdir)/Cms/Cms.cs \
$(srcdir)/Cms/CctTable.cs
-@@ -573,7 +577,6 @@
+@@ -578,7 +581,6 @@
@NOGCONF_FALSE at GCONF_PKG = -pkg:gconf-sharp-2.0
CMS_ASSEMBLIES = \
@@ -7534,7 +8036,7 @@
-pkg:gtk-sharp-2.0
CORE_ASSEMBLIES = \
-@@ -615,7 +618,6 @@
+@@ -622,7 +624,6 @@
-r:FSpot.Query.dll \
-r:FSpot.Utils.dll \
-r:Cms.dll \
@@ -7542,37 +8044,9 @@
$(GCONF_PKG) \
$(GTKHTML_SHARP_PKG) \
-pkg:glade-sharp-2.0 \
-@@ -660,7 +662,7 @@
- $(F_SPOT_DISTRESOURCES) \
- f-spot.exe.config.in \
- f-spot.in \
-- Cms.dll.config
-+ Cms.dll.config.in
-
- CLEANFILES = \
- f-spot.exe.config \
-@@ -674,7 +676,8 @@
- FSpot.Query.dll \
- FSpot.Query.dll.mdb \
- FSpot.Core.dll.mdb \
-- FSpot.Core.dll
-+ FSpot.Core.dll \
-+ Cms.dll.config
-
- DISTCLEANFILES = \
- Makefile
-@@ -717,6 +720,8 @@
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- f-spot.exe.config: $(top_builddir)/config.status $(srcdir)/f-spot.exe.config.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-+Cms.dll.config: $(top_builddir)/config.status $(srcdir)/Cms.dll.config.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- install-binSCRIPTS: $(bin_SCRIPTS)
- @$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
diff -urNad f-spot~/tools/Makefile.in f-spot/tools/Makefile.in
---- f-spot~/tools/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/tools/Makefile.in 2008-04-16 22:18:20.000000000 +0100
+--- f-spot~/tools/Makefile.in 2008-05-01 02:15:55.000000000 +0100
++++ f-spot/tools/Makefile.in 2008-05-01 02:16:49.000000000 +0100
@@ -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.
@@ -7635,3 +8109,11 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -216,6 +218,7 @@
+ TURTLEDIR = @TURTLEDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
Modified: packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch?rev=3914&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch Thu May 1 01:32:07 2008
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad f-spot~/configure.in f-spot/configure.in
---- f-spot~/configure.in 2008-04-16 22:16:06.000000000 +0100
-+++ f-spot/configure.in 2008-04-16 22:16:55.000000000 +0100
-@@ -302,7 +302,6 @@
+--- f-spot~/configure.in 2008-05-01 02:14:09.000000000 +0100
++++ f-spot/configure.in 2008-05-01 02:14:10.000000000 +0100
+@@ -309,7 +309,6 @@
extensions/CDExport/Makefile
extensions/DefaultExporters/Makefile
extensions/FlickrExport/Makefile
@@ -17,8 +17,8 @@
extensions/FolderExport/Makefile
extensions/SmugMugExport/SmugMugNet/Makefile
diff -urNad f-spot~/extensions/FlickrExport/Makefile.am f-spot/extensions/FlickrExport/Makefile.am
---- f-spot~/extensions/FlickrExport/Makefile.am 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/FlickrExport/Makefile.am 2008-04-16 22:16:07.000000000 +0100
+--- f-spot~/extensions/FlickrExport/Makefile.am 2008-05-01 02:13:04.000000000 +0100
++++ f-spot/extensions/FlickrExport/Makefile.am 2008-05-01 02:14:23.000000000 +0100
@@ -15,16 +15,13 @@
-r:../../src/FSpot.Core.dll \
-r:../../src/FSpot.Utils.dll \
@@ -37,3 +37,11 @@
RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
-resource:$(srcdir)/$(PLUGIN_NAME).glade
+@@ -35,7 +32,6 @@
+ mautil p $(PLUGIN_ASSEMBLY)
+
+ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+- $(MAKE) -C $(SUBDIRS)
+ $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+
+ plugindir = $(pkglibdir)/extensions
More information about the Pkg-cli-apps-commits
mailing list