rev 5209 - kde-extras/kipi-plugins/branches/experimental/debian/patches

Achim Bohnet ach-guest at alioth.debian.org
Sun Dec 31 17:13:33 CET 2006


Author: ach-guest
Date: 2006-12-31 17:08:07 +0100 (Sun, 31 Dec 2006)
New Revision: 5209

Modified:
   kde-extras/kipi-plugins/branches/experimental/debian/patches/98_buildprep.diff
Log:
kipi-plugins: updated buildpref

Modified: kde-extras/kipi-plugins/branches/experimental/debian/patches/98_buildprep.diff
===================================================================
--- kde-extras/kipi-plugins/branches/experimental/debian/patches/98_buildprep.diff	2006-12-31 15:54:06 UTC (rev 5208)
+++ kde-extras/kipi-plugins/branches/experimental/debian/patches/98_buildprep.diff	2006-12-31 16:08:07 UTC (rev 5209)
@@ -1,5 +1,629 @@
 #DPATCHLEVEL=0
 # vi: ft=diff
+--- Makefile.in
++++ Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = .
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,55 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
++	$(srcdir)/Makefile.in $(srcdir)/admin/Doxyfile.am \
++	$(srcdir)/admin/deps.am $(srcdir)/config.h.in \
++	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
++	TODO admin/compile admin/config.guess admin/config.sub \
++	admin/depcomp admin/install-sh admin/ltmain.sh admin/missing \
++	admin/mkinstalldirs admin/ylwrap
++subdir = .
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno configure.status.lineno
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++distdir = $(PACKAGE)-$(VERSION)
++top_distdir = $(distdir)
++am__remove_distdir = \
++  { test ! -d $(distdir) \
++    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++         && rm -fr $(distdir); }; }
++DIST_ARCHIVES = $(distdir).tar.gz
++GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +134,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +223,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +264,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +272,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +284,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +305,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +353,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,63 +382,64 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ AUTOMAKE_OPTIONS = foreign 1.6.1
+-
+ COMPILE_FIRST = libkipi
+ SUBDIRS = $(TOPSUBDIRS)
+-subdir = .
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/admin/Doxyfile.am \
+-	$(srcdir)/admin/deps.am $(srcdir)/configure AUTHORS COPYING \
+-	ChangeLog INSTALL Makefile.am NEWS TODO acinclude.m4 aclocal.m4 \
+-	admin/compile admin/config.guess admin/config.sub admin/depcomp \
+-	admin/install-sh admin/ltmain.sh admin/missing \
+-	admin/mkinstalldirs admin/ylwrap config.h.in configure \
+-	configure.in
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: config.h
+ #>+ 1
+ all: docs-am  config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ .SUFFIXES:
+-
+-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno
+-$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++am--refresh:
++	@:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
++#>- 	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+ #>- 	  $(AUTOMAKE) --foreign  Makefile
+-#>+ 3
++#>+ 14
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
++ (  \
++	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
++	 ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd $(top_srcdir) && perl admin/am_edit && exit 0;  \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+ 	cd $(top_srcdir) && \
+ 	  $(AUTOMAKE) --foreign  Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    echo ' $(SHELL) ./config.status'; \
++	    $(SHELL) ./config.status;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++	esac;
+ 
+-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- 	cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ 	cd $(srcdir) && rm -f configure
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-
+-$(ACLOCAL_M4):  configure.in acinclude.m4
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+ config.h: stamp-h1
+@@ -391,10 +451,10 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-
+-$(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+-	touch $(srcdir)/config.h.in
++	rm -f stamp-h1
++	touch $@
+ 
+ distclean-hdr:
+ 	-rm -f config.h stamp-h1
+@@ -416,7 +476,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -428,7 +494,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -436,7 +502,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -457,7 +529,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -468,14 +540,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -484,19 +548,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -506,10 +573,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -532,26 +600,11 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = .
+-distdir = $(PACKAGE)-$(VERSION)
+-
+-am__remove_distdir = \
+-  { test ! -d $(distdir) \
+-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+-         && rm -fr $(distdir); }; }
+-
+-GZIP_ENV = --best
+-distuninstallcheck_listfiles = find . -type f -print
+-distcleancheck_listfiles = find . -type f -print
+ 
+ distdir: $(DISTFILES)
+ 	$(am__remove_distdir)
+ 	mkdir $(distdir)
+-	$(mkinstalldirs) $(distdir)/./admin $(distdir)/admin
++	$(mkdir_p) $(distdir)/admin
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -563,7 +616,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -578,15 +631,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -597,19 +652,46 @@
+ 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ 	|| chmod -R a+r $(distdir)
+ dist-gzip: distdir
+-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(am__remove_distdir)
++
++dist-bzip2: distdir
++	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++	$(am__remove_distdir)
++
++dist-tarZ: distdir
++	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
++	$(am__remove_distdir)
++
++dist-shar: distdir
++	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
++	$(am__remove_distdir)
++
++dist-zip: distdir
++	-rm -f $(distdir).zip
++	zip -rq $(distdir).zip $(distdir)
+ 	$(am__remove_distdir)
+ 
+ dist dist-all: distdir
+-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ 	$(am__remove_distdir)
+ 
+ # This target untars the dist file and tries a VPATH configuration.  Then
+ # it guarantees that the distribution is self-contained by making another
+ # tarfile.
+ distcheck: dist
+-	$(am__remove_distdir)
+-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
++	case '$(DIST_ARCHIVES)' in \
++	*.tar.gz*) \
++	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++	*.tar.bz2*) \
++	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++	*.tar.Z*) \
++	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
++	*.shar.gz*) \
++	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++	*.zip*) \
++	  unzip $(distdir).zip ;;\
++	esac
+ 	chmod -R a-w $(distdir); chmod a+w $(distdir)
+ 	mkdir $(distdir)/_build
+ 	mkdir $(distdir)/_inst
+@@ -629,19 +711,20 @@
+ 	        distuninstallcheck \
+ 	  && chmod -R a-w "$$dc_install_base" \
+ 	  && ({ \
+-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
++	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ 	  && rm -rf "$$dc_destdir" \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+-	  && rm -f $(distdir).tar.gz \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist \
++	  && rm -rf $(DIST_ARCHIVES) \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ 	$(am__remove_distdir)
+-	@echo "$(distdir).tar.gz is ready for distribution" | \
+-	  sed 'h;s/./=/g;p;x;p;x'
++	@(echo "$(distdir) archives ready for distribution: "; \
++	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
++	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ distuninstallcheck:
+ 	@cd $(distuninstallcheck_dir) \
+ 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -665,7 +748,6 @@
+ all-am: Makefile config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -685,7 +767,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -701,13 +783,15 @@
+ distclean: distclean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
+-	distclean-tags
++distclean-am: clean-am distclean-generic distclean-hdr \
++	distclean-libtool distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -744,24 +828,21 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
+-	ctags-recursive dist dist-all dist-gzip distcheck distclean \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
++	check-am clean clean-generic clean-libtool clean-recursive \
++	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
++	dist-shar dist-tarZ dist-zip distcheck distclean \
+ 	distclean-generic distclean-hdr distclean-libtool \
+ 	distclean-recursive distclean-tags distcleancheck distdir \
+-	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
+-	info-recursive install install-am install-data install-data-am \
+-	install-data-local install-data-recursive install-exec \
+-	install-exec-am install-exec-recursive install-info \
+-	install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-local uninstall-recursive
++	distuninstallcheck dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am \
++	install-data-local install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am uninstall-local
+ 
+ $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
+ 	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
+@@ -878,15 +959,16 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.files RELEASE.rev Makefile.cvs kipi-plugins.lsm configure.in.in PACKAGING Makefile.am.in 
++KDE_DIST=Mainpage.dox subdirs Makefile.in configure.files RELEASE.rev config.h.in configure.in Makefile.cvs kipi-plugins.lsm aclocal.m4 configure.in.in configure Makefile.am PACKAGING acinclude.m4 Makefile.am.in 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 7
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  Makefile
++	 \
++	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
++	
+ 	cd $(top_srcdir) && perl admin/am_edit Makefile.in
+ 
+ 
 --- acinclude.m4
 +++ acinclude.m4
 @@ -2144,9 +2144,6 @@
@@ -12,7 +636,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5973,30 +5970,15 @@
+@@ -5970,30 +5967,15 @@
    fi
  ])
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -48,7 +672,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6056,7 +6038,7 @@
+@@ -6053,7 +6035,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -57,7 +681,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6106,7 +6088,7 @@
+@@ -6103,7 +6085,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -66,7 +690,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -6126,7 +6108,7 @@
+@@ -6123,7 +6105,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -75,7 +699,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6146,6 +6128,7 @@
+@@ -6143,6 +6125,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -83,7 +707,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -6165,15 +6148,17 @@
+@@ -6162,15 +6145,17 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -103,7 +727,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -6214,11 +6199,56 @@
+@@ -6211,11 +6196,56 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -160,7 +784,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -6291,15 +6321,15 @@
+@@ -6288,15 +6318,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -179,7 +803,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -6468,14 +6498,13 @@
+@@ -6465,14 +6495,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -196,7 +820,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6487,7 +6516,6 @@
+@@ -6484,7 +6513,6 @@
        esac
        ;;
      *64-bit*)
@@ -204,7 +828,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6521,6 +6549,22 @@
+@@ -6518,6 +6546,22 @@
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -227,7 +851,7 @@
  AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
  [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6552,7 +6596,7 @@
+@@ -6549,7 +6593,7 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -236,7 +860,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6562,8 +6606,10 @@
+@@ -6559,8 +6603,10 @@
     echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
@@ -249,7 +873,7 @@
         $2=yes
       fi
     fi
-@@ -6589,11 +6635,16 @@
+@@ -6586,11 +6632,16 @@
     LDFLAGS="$LDFLAGS $3"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -267,7 +891,7 @@
       else
         $2=yes
       fi
-@@ -6617,7 +6668,7 @@
+@@ -6614,7 +6665,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -276,7 +900,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6646,20 +6697,70 @@
+@@ -6643,20 +6694,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -353,7 +977,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -6676,7 +6777,7 @@
+@@ -6673,7 +6774,7 @@
  
  
  # _LT_AC_CHECK_DLFCN
@@ -362,7 +986,7 @@
  AC_DEFUN([_LT_AC_CHECK_DLFCN],
  [AC_CHECK_HEADERS(dlfcn.h)dnl
  ])# _LT_AC_CHECK_DLFCN
-@@ -6684,7 +6785,7 @@
+@@ -6681,7 +6782,7 @@
  
  # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
  #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -371,7 +995,7 @@
  AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "$cross_compiling" = yes; then :
-@@ -6750,17 +6851,19 @@
+@@ -6747,17 +6848,19 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -393,7 +1017,7 @@
      esac
    else :
      # compilation failed
-@@ -6772,7 +6875,7 @@
+@@ -6769,7 +6872,7 @@
  
  
  # AC_LIBTOOL_DLOPEN_SELF
@@ -402,7 +1026,7 @@
  AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "x$enable_dlopen" != xyes; then
-@@ -6809,7 +6912,7 @@
+@@ -6806,7 +6909,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -411,7 +1035,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6843,7 +6946,7 @@
+@@ -6840,7 +6943,7 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -420,7 +1044,7 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6856,7 +6959,7 @@
+@@ -6853,7 +6956,7 @@
      ])
  
      if test "x$lt_cv_dlopen_self" = xyes; then
@@ -429,7 +1053,7 @@
        AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
      	  lt_cv_dlopen_self_static, [dnl
  	  _LT_AC_TRY_DLOPEN_SELF(
-@@ -6898,20 +7001,13 @@
+@@ -6895,20 +6998,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -451,7 +1075,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6923,13 +7019,18 @@
+@@ -6920,13 +7016,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
@@ -474,7 +1098,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6988,8 +7089,8 @@
+@@ -6985,8 +7086,8 @@
  [AC_MSG_CHECKING([how to hardcode library paths into programs])
  _LT_AC_TAGVAR(hardcode_action, $1)=
  if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -485,7 +1109,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7046,7 +7147,7 @@
+@@ -7043,7 +7144,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -494,7 +1118,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -7059,7 +7160,7 @@
+@@ -7056,7 +7157,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -503,7 +1127,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -7069,7 +7170,20 @@
+@@ -7066,7 +7167,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -525,7 +1149,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -7134,7 +7248,7 @@
+@@ -7131,7 +7245,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -534,7 +1158,7 @@
    ;;
  
  beos*)
-@@ -7143,7 +7257,7 @@
+@@ -7140,7 +7254,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -543,7 +1167,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7159,7 +7273,7 @@
+@@ -7156,7 +7270,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -552,7 +1176,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7171,7 +7285,8 @@
+@@ -7168,7 +7282,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -562,7 +1186,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -7201,7 +7316,7 @@
+@@ -7198,7 +7313,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -571,7 +1195,7 @@
        ;;
      esac
      ;;
-@@ -7224,7 +7339,7 @@
+@@ -7221,7 +7336,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -580,7 +1204,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7247,20 +7362,17 @@
+@@ -7244,20 +7359,17 @@
    dynamic_linker=no
    ;;
  
@@ -612,7 +1236,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7278,14 +7390,19 @@
+@@ -7275,14 +7387,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -634,7 +1258,7 @@
    esac
    ;;
  
-@@ -7305,9 +7422,9 @@
+@@ -7302,9 +7419,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -646,7 +1270,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7322,7 +7439,7 @@
+@@ -7319,7 +7436,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -655,7 +1279,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7333,7 +7450,7 @@
+@@ -7330,7 +7447,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -664,7 +1288,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7345,6 +7462,18 @@
+@@ -7342,6 +7459,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -683,7 +1307,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -7388,29 +7517,26 @@
+@@ -7385,29 +7514,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -720,7 +1344,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7420,6 +7546,18 @@
+@@ -7417,6 +7543,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -739,7 +1363,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7429,7 +7567,7 @@
+@@ -7426,7 +7564,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -748,7 +1372,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7457,8 +7595,13 @@
+@@ -7454,8 +7592,13 @@
  
  openbsd*)
    version_type=sunos
@@ -763,7 +1387,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7478,7 +7621,7 @@
+@@ -7475,7 +7618,7 @@
  
  os2*)
    libname_spec='$name'
@@ -772,7 +1396,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7496,13 +7639,6 @@
+@@ -7493,13 +7636,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -786,7 +1410,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -7528,7 +7664,7 @@
+@@ -7525,7 +7661,7 @@
    need_version=yes
    ;;
  
@@ -795,7 +1419,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -7561,6 +7697,29 @@
+@@ -7558,6 +7694,29 @@
    fi
    ;;
  
@@ -825,7 +1449,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7574,6 +7733,11 @@
+@@ -7571,6 +7730,11 @@
  esac
  AC_MSG_RESULT([$dynamic_linker])
  test "$dynamic_linker" = no && can_build_shared=no
@@ -837,7 +1461,7 @@
  ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
  
  
-@@ -7598,6 +7762,9 @@
+@@ -7595,6 +7759,9 @@
        AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
      fi
    fi
@@ -847,7 +1471,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -7624,7 +7791,9 @@
+@@ -7621,7 +7788,9 @@
  
        case $tagname in
        CXX)
@@ -858,7 +1482,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7686,7 +7855,7 @@
+@@ -7683,7 +7852,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -867,7 +1491,7 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -7724,7 +7893,7 @@
+@@ -7721,7 +7890,7 @@
  
  # AC_DISABLE_SHARED
  # -----------------
@@ -876,7 +1500,7 @@
  AC_DEFUN([AC_DISABLE_SHARED],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
  AC_ENABLE_SHARED(no)
-@@ -7860,7 +8029,7 @@
+@@ -7857,7 +8026,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -885,7 +1509,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -7970,7 +8139,7 @@
+@@ -7967,7 +8136,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -894,7 +1518,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -8002,7 +8171,7 @@
+@@ -7999,7 +8168,7 @@
  AC_DEFUN([AC_PROG_LD_GNU],
  [AC_REQUIRE([AC_PROG_EGREP])dnl
  AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -903,7 +1527,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -8029,6 +8198,15 @@
+@@ -8026,6 +8195,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -919,7 +1543,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -8062,44 +8240,36 @@
+@@ -8059,44 +8237,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -975,7 +1599,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -8115,7 +8285,7 @@
+@@ -8112,7 +8282,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -984,7 +1608,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -8131,43 +8301,27 @@
+@@ -8128,43 +8298,27 @@
    esac
    ;;
  
@@ -1041,7 +1665,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
-@@ -8186,32 +8340,22 @@
+@@ -8183,32 +8337,22 @@
    ;;
  
  openbsd*)
@@ -1077,7 +1701,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -8232,10 +8376,13 @@
+@@ -8229,10 +8373,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -1092,7 +1716,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -8255,36 +8402,43 @@
+@@ -8252,36 +8399,43 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -1160,7 +1784,7 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi])
  NM="$lt_cv_path_NM"
-@@ -8316,13 +8470,13 @@
+@@ -8313,13 +8467,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1181,7 +1805,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -8341,13 +8495,13 @@
+@@ -8338,13 +8492,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1202,7 +1826,7 @@
  # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
  AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8385,10 +8539,21 @@
+@@ -8382,10 +8536,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -1225,7 +1849,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8428,7 +8593,7 @@
+@@ -8425,7 +8590,7 @@
  
  
  # AC_LIBTOOL_RC
@@ -1234,7 +1858,7 @@
  # enable support for Windows resource files
  AC_DEFUN([AC_LIBTOOL_RC],
  [AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8461,36 +8626,9 @@
+@@ -8458,36 +8623,9 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -1274,7 +1898,7 @@
  
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
-@@ -8504,9 +8642,9 @@
+@@ -8501,9 +8639,9 @@
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
  AC_LIBTOOL_SYS_LIB_STRIP
@@ -1286,7 +1910,7 @@
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
  
-@@ -8515,7 +8653,7 @@
+@@ -8512,7 +8650,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1295,7 +1919,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -8524,48 +8662,11 @@
+@@ -8521,48 +8659,11 @@
    fi
    ;;
  
@@ -1346,7 +1970,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8590,7 +8691,7 @@
+@@ -8587,7 +8688,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -1355,7 +1979,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8602,6 +8703,7 @@
+@@ -8599,6 +8700,7 @@
  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1363,7 +1987,7 @@
  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
  _LT_AC_TAGVAR(module_cmds, $1)=
  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8619,7 +8721,7 @@
+@@ -8616,7 +8718,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1372,7 +1996,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -8629,11 +8731,15 @@
+@@ -8626,11 +8728,15 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -1389,7 +2013,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -8644,18 +8750,18 @@
+@@ -8641,18 +8747,18 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -1411,7 +2035,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -8673,8 +8779,8 @@
+@@ -8670,8 +8776,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -1422,7 +2046,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8700,7 +8806,7 @@
+@@ -8697,7 +8803,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -1431,7 +2055,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8730,8 +8836,23 @@
+@@ -8727,8 +8833,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1457,7 +2081,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8748,7 +8869,7 @@
+@@ -8745,7 +8866,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1466,7 +2090,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -8767,8 +8888,12 @@
+@@ -8764,8 +8885,12 @@
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	fi
@@ -1479,7 +2103,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -8777,15 +8902,16 @@
+@@ -8774,15 +8899,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1500,7 +2124,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -8794,13 +8920,12 @@
+@@ -8791,13 +8917,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -1516,7 +2140,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8809,16 +8934,26 @@
+@@ -8806,16 +8931,26 @@
  	# -berok will link without error, but may produce a broken library.
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1548,7 +2172,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -8832,12 +8967,12 @@
+@@ -8829,12 +8964,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1563,7 +2187,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8846,70 +8981,81 @@
+@@ -8843,70 +8978,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -1697,7 +2321,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8920,14 +9066,14 @@
+@@ -8917,14 +9063,14 @@
  	;;
      esac
      ;;
@@ -1714,7 +2338,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8944,12 +9090,12 @@
+@@ -8941,12 +9087,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1730,7 +2354,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8958,11 +9104,11 @@
+@@ -8955,11 +9101,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -1744,7 +2368,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,34 +9118,23 @@
+@@ -8969,34 +9115,23 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1786,7 +2410,7 @@
      *)
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9009,17 +9144,20 @@
+@@ -9006,17 +9141,20 @@
      esac
  
      case $cc_basename in
@@ -1813,7 +2437,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -9035,12 +9173,15 @@
+@@ -9032,12 +9170,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1833,7 +2457,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -9051,11 +9192,25 @@
+@@ -9048,11 +9189,25 @@
  	;;
      esac
      ;;
@@ -1861,7 +2485,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -9066,9 +9221,9 @@
+@@ -9063,9 +9218,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1873,7 +2497,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9077,16 +9232,16 @@
+@@ -9074,16 +9229,16 @@
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
      ;;
@@ -1894,7 +2518,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -9104,20 +9259,44 @@
+@@ -9101,20 +9256,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1945,7 +2569,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9145,7 +9324,7 @@
+@@ -9142,7 +9321,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1954,7 +2578,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9155,7 +9334,7 @@
+@@ -9152,7 +9331,7 @@
  	;;
      esac
      ;;
@@ -1963,7 +2587,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=
-@@ -9166,15 +9345,31 @@
+@@ -9163,15 +9342,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -1997,7 +2621,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9184,14 +9379,14 @@
+@@ -9181,14 +9376,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -2015,7 +2639,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9209,7 +9404,7 @@
+@@ -9206,7 +9401,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2024,7 +2648,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9228,13 +9423,13 @@
+@@ -9225,13 +9420,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -2040,7 +2664,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9243,17 +9438,17 @@
+@@ -9240,17 +9435,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -2062,7 +2686,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9272,7 +9467,7 @@
+@@ -9269,7 +9464,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2071,7 +2695,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9293,27 +9488,14 @@
+@@ -9290,27 +9485,14 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -2101,7 +2725,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9326,36 +9508,33 @@
+@@ -9323,36 +9505,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -2150,7 +2774,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9363,9 +9542,9 @@
+@@ -9360,9 +9539,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -2162,7 +2786,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9375,9 +9554,9 @@
+@@ -9372,9 +9551,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2174,7 +2798,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9386,9 +9565,9 @@
+@@ -9383,9 +9562,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -2186,7 +2810,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9401,12 +9580,63 @@
+@@ -9398,12 +9577,63 @@
  	;;
      esac
      ;;
@@ -2252,7 +2876,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9443,8 +9673,6 @@
+@@ -9440,8 +9670,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2261,7 +2885,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9462,7 +9690,7 @@
+@@ -9459,7 +9687,7 @@
  ])# AC_LIBTOOL_LANG_CXX_CONFIG
  
  # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2270,7 +2894,7 @@
  # Figure out "hidden" library dependencies from verbose
  # compiler output when linking a shared library.
  # Parse the compiler output and extract the necessary
-@@ -9516,7 +9744,7 @@
+@@ -9513,7 +9741,7 @@
    # The `*' in the case matches for architectures that use `case' in
    # $output_verbose_cmd can trigger glob expansion during the loop
    # eval without this substitution.
@@ -2279,7 +2903,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9556,7 +9784,7 @@
+@@ -9553,7 +9781,7 @@
         fi
         ;;
  
@@ -2288,7 +2912,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9592,13 +9820,37 @@
+@@ -9589,13 +9817,37 @@
  
  $rm -f confest.$objext
  
@@ -2327,7 +2951,7 @@
  # Ensure that the configuration vars for the C compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9642,12 +9894,16 @@
+@@ -9639,12 +9891,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2345,7 +2969,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9657,7 +9913,7 @@
+@@ -9654,7 +9910,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -2354,7 +2978,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9665,8 +9921,10 @@
+@@ -9662,8 +9918,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -2367,7 +2991,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9676,8 +9934,6 @@
+@@ -9673,8 +9931,6 @@
  test "$enable_shared" = yes || enable_static=yes
  AC_MSG_RESULT([$enable_static])
  
@@ -2376,7 +3000,7 @@
  _LT_AC_TAGVAR(GCC, $1)="$G77"
  _LT_AC_TAGVAR(LD, $1)="$LD"
  
-@@ -9687,8 +9943,6 @@
+@@ -9684,8 +9940,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2385,7 +3009,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9717,20 +9971,27 @@
+@@ -9714,20 +9968,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -2414,7 +3038,7 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -9742,8 +10003,6 @@
+@@ -9739,8 +10000,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2423,7 +3047,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9753,7 +10012,7 @@
+@@ -9750,7 +10009,7 @@
  
  
  # AC_LIBTOOL_LANG_RC_CONFIG
@@ -2432,7 +3056,7 @@
  # Ensure that the configuration vars for the Windows resource compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9777,11 +10036,16 @@
+@@ -9774,11 +10033,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2449,7 +3073,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9807,11 +10071,12 @@
+@@ -9804,11 +10068,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -2464,7 +3088,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9861,7 +10126,7 @@
+@@ -9858,7 +10123,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2473,7 +3097,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9927,11 +10192,11 @@
+@@ -9924,11 +10189,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2487,7 +3111,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9962,6 +10227,12 @@
+@@ -9959,6 +10224,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -2500,7 +3124,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9973,6 +10244,9 @@
+@@ -9970,6 +10241,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -2510,7 +3134,7 @@
  # A language-specific compiler.
  CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
  
-@@ -9992,7 +10266,7 @@
+@@ -9989,7 +10263,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -2519,7 +3143,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -10023,7 +10297,7 @@
+@@ -10020,7 +10294,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -2528,7 +3152,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10038,7 +10312,7 @@
+@@ -10035,7 +10309,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -2537,7 +3161,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10267,7 +10541,10 @@
+@@ -10264,7 +10538,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -2549,7 +3173,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10309,9 +10586,6 @@
+@@ -10306,9 +10583,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -2559,7 +3183,7 @@
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
-@@ -10333,14 +10607,30 @@
+@@ -10330,14 +10604,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -2592,7 +3216,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10358,14 +10648,17 @@
+@@ -10355,14 +10645,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2612,7 +3236,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10521,6 +10814,10 @@
+@@ -10518,6 +10811,10 @@
        # DJGPP does not support shared libraries at all
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
@@ -2623,7 +3247,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10529,7 +10826,7 @@
+@@ -10526,7 +10823,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2632,7 +3256,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10554,18 +10851,28 @@
+@@ -10551,18 +10848,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2664,7 +3288,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10573,22 +10880,22 @@
+@@ -10570,22 +10877,22 @@
  	    ;;
  	esac
  	;;
@@ -2693,7 +3317,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -10601,9 +10908,13 @@
+@@ -10598,9 +10905,13 @@
  	    ;;
  	esac
  	;;
@@ -2708,7 +3332,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -10612,20 +10923,26 @@
+@@ -10609,20 +10920,26 @@
  	    ;;
  	esac
  	;;
@@ -2740,7 +3364,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10642,25 +10959,25 @@
+@@ -10639,25 +10956,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2771,7 +3395,7 @@
  	    # Digital/Compaq C++
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10674,24 +10991,15 @@
+@@ -10671,24 +10988,15 @@
  	;;
        psos*)
  	;;
@@ -2798,7 +3422,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10701,12 +11009,12 @@
+@@ -10698,12 +11006,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2813,7 +3437,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10716,7 +11024,7 @@
+@@ -10713,7 +11021,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2822,7 +3446,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10724,7 +11032,14 @@
+@@ -10721,7 +11029,14 @@
  	    ;;
  	esac
  	;;
@@ -2838,7 +3462,7 @@
  	;;
        vxworks*)
  	;;
-@@ -10771,6 +11086,11 @@
+@@ -10768,6 +11083,11 @@
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
        ;;
  
@@ -2850,7 +3474,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -10787,7 +11107,7 @@
+@@ -10784,7 +11104,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2859,7 +3483,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10813,6 +11133,16 @@
+@@ -10810,6 +11130,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2876,7 +3500,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10824,7 +11154,7 @@
+@@ -10821,7 +11151,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2885,7 +3509,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10847,13 +11177,20 @@
+@@ -10844,13 +11174,20 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2908,7 +3532,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10868,15 +11205,15 @@
+@@ -10865,15 +11202,15 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
@@ -2930,7 +3554,7 @@
        ;;
  
      sunos4*)
-@@ -10885,7 +11222,7 @@
+@@ -10882,7 +11219,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2939,7 +3563,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10898,6 +11235,17 @@
+@@ -10895,6 +11232,17 @@
        fi
        ;;
  
@@ -2957,7 +3581,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10925,7 +11273,7 @@
+@@ -10922,7 +11270,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2966,7 +3590,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10934,6 +11282,16 @@
+@@ -10931,6 +11279,16 @@
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
      ;;
  esac
@@ -2983,7 +3607,7 @@
  ])
  
  
-@@ -10958,7 +11316,10 @@
+@@ -10955,7 +11313,10 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -2995,7 +3619,7 @@
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10984,7 +11345,7 @@
+@@ -10981,7 +11342,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -3004,7 +3628,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -11001,7 +11362,8 @@
+@@ -10998,7 +11359,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -3014,7 +3638,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11011,6 +11373,10 @@
+@@ -11008,6 +11370,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -3025,7 +3649,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -11021,6 +11387,27 @@
+@@ -11018,6 +11384,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -3053,7 +3677,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -11058,7 +11445,7 @@
+@@ -11055,7 +11442,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -3062,7 +3686,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11068,13 +11455,13 @@
+@@ -11065,13 +11452,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3079,7 +3703,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -11083,23 +11470,70 @@
+@@ -11080,23 +11467,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -3156,7 +3780,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	cat <<EOF 1>&2
-@@ -11113,13 +11547,40 @@
+@@ -11110,13 +11544,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3199,7 +3823,7 @@
      sunos4*)
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -11129,24 +11590,19 @@
+@@ -11126,24 +11587,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3231,7 +3855,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11158,7 +11614,7 @@
+@@ -11155,7 +11611,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3240,7 +3864,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11180,9 +11636,21 @@
+@@ -11177,9 +11633,21 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -3264,7 +3888,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11199,7 +11667,7 @@
+@@ -11196,7 +11664,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -3273,7 +3897,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -11218,8 +11686,12 @@
+@@ -11215,8 +11683,12 @@
    	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
    	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	  fi
@@ -3286,7 +3910,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11227,30 +11699,30 @@
+@@ -11224,30 +11696,30 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -3328,7 +3952,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11259,13 +11731,11 @@
+@@ -11256,13 +11728,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3345,7 +3969,7 @@
  	fi
        fi
        ;;
-@@ -11278,7 +11748,7 @@
+@@ -11275,7 +11745,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -3354,7 +3978,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11288,69 +11758,69 @@
+@@ -11285,69 +11755,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3470,7 +4094,7 @@
        ;;
  
      dgux*)
-@@ -11383,8 +11853,8 @@
+@@ -11380,8 +11850,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3481,7 +4105,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11392,7 +11862,7 @@
+@@ -11389,7 +11859,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -3490,7 +4114,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11406,47 +11876,62 @@
+@@ -11403,47 +11873,62 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        ;;
  
@@ -3577,7 +4201,7 @@
  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
  
-@@ -11460,7 +11945,7 @@
+@@ -11457,7 +11942,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -3586,7 +4210,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11470,7 +11955,7 @@
+@@ -11467,7 +11952,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -3595,7 +4219,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
-@@ -11493,7 +11978,8 @@
+@@ -11490,7 +11975,8 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3605,7 +4229,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11503,7 +11989,7 @@
+@@ -11500,7 +11986,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -3614,7 +4238,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11514,14 +12000,14 @@
+@@ -11511,14 +11997,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -3631,7 +4255,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11533,13 +12019,13 @@
+@@ -11530,13 +12016,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3647,7 +4271,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11547,21 +12033,15 @@
+@@ -11544,21 +12030,15 @@
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
        ;;
  
@@ -3673,7 +4297,7 @@
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11570,8 +12050,18 @@
+@@ -11567,8 +12047,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3694,7 +4318,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11580,7 +12070,7 @@
+@@ -11577,7 +12067,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -3703,7 +4327,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11628,36 +12118,45 @@
+@@ -11625,36 +12115,45 @@
        fi
        ;;
  
@@ -3770,7 +4394,7 @@
        ;;
  
      uts4*)
-@@ -11675,11 +12174,6 @@
+@@ -11672,11 +12171,6 @@
  AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
  test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
@@ -3782,7 +4406,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -11700,13 +12194,14 @@
+@@ -11697,13 +12191,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3798,7 +4422,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -11834,7 +12329,7 @@
+@@ -11831,7 +12326,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3807,10 +4431,682 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+--- config.h.in
++++ config.h.in
+@@ -120,22 +120,22 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
+-/* The size of a `char *', as computed by sizeof. */
++/* The size of `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+ 
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+ 
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+ 
+-/* The size of a `short', as computed by sizeof. */
++/* The size of `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+ 
+-/* The size of a `size_t', as computed by sizeof. */
++/* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+ 
+-/* The size of a `unsigned long', as computed by sizeof. */
++/* The size of `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+ 
+ /* Define to 1 if you have the ANSI C header files. */
 --- configure
 +++ configure
-@@ -278,15 +278,15 @@
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.60.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -16,11 +17,35 @@
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
  
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+@@ -29,8 +54,43 @@
+ fi
+ 
+ 
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -44,18 +104,19 @@
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+-    $as_unset $as_var
++    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+@@ -63,157 +124,386 @@
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
++# CDPATH.
++$as_unset CDPATH
+ 
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
++if test "x$CONFIG_SHELL" = x; then
++  if (eval ":") 2>/dev/null; then
++  as_have_required=yes
++else
++  as_have_required=no
+ fi
+ 
++  if test $as_have_required = yes && 	 (eval ":
++(as_func_return () {
++  (exit \$1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0) || { (exit 1); exit 1; }
++
++(
++  as_lineno_1=\$LINENO
++  as_lineno_2=\$LINENO
++  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
++  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
++") 2> /dev/null; then
++  :
++else
++  as_candidate_shells=
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
++  case $as_dir in
+ 	 /*)
+-	   if ("$as_dir/$as_base" -c '
++	   for as_base in sh bash ksh sh5; do
++	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++	   done;;
++       esac
++done
++IFS=$as_save_IFS
++
++
++      for as_shell in $as_candidate_shells $SHELL; do
++	 # Try only shells that exist, to save several forks.
++	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++		{ ("$as_shell") 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++_ASEOF
++}; then
++  CONFIG_SHELL=$as_shell
++	       as_have_required=yes
++	       if { "$as_shell" 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++(as_func_return () {
++  (exit $1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
++
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
++
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = "$1" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test $exitcode = 0) || { (exit 1); exit 1; }
++
++(
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
++
++_ASEOF
++}; then
++  break
++fi
++
++fi
++
++      done
++
++      if test "x$CONFIG_SHELL" != x; then
++  for as_var in BASH_ENV ENV
++        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++        done
++        export CONFIG_SHELL
++        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++
++    if test $as_have_required = no; then
++  echo This script requires a shell more modern than all the
++      echo shells that I found on your system.  Please install a
++      echo modern shell, or manually run the script under such a
++      echo shell if you do have one.
++      { (exit 1); exit 1; }
++fi
++
++
++fi
++
++fi
++
++
++
++(eval "as_func_return () {
++  (exit \$1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
++
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
++
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0") || {
++  echo No shell found that supports shell functions.
++  echo Please tell autoconf at gnu.org about your system,
++  echo including any error possibly output before this
++  echo message
++}
++
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
++  # line-number line after each line using $LINENO; the second 'sed'
++  # does the real work.  The second script uses 'N' to pair each
++  # line-number line with the line containing $LINENO, and appends
++  # trailing '-' during substitution so that $LINENO is not a special
++  # case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  # scripts with optimization help from Paolo Bonzini.  Blame Lee
++  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
++  chmod +x "$as_me.lineno" ||
+     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++  case `echo 'x\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  *)   ECHO_C='\c';;
++  esac;;
++*)
++  ECHO_N='-n';;
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
++  as_ln_s='ln -s'
++  # ... but there are two gotchas:
++  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++  # In both cases, we have to default to `cp -p'.
++  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+     as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -222,7 +512,19 @@
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++  as_executable_p="test -x"
++else
++  as_executable_p=:
++fi
++rm -f conf$$.file
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -231,15 +533,6 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ 
+ 
+ # Check that we are running under the correct shell.
+@@ -278,15 +571,15 @@
+ 
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
 -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
@@ -3828,16 +5124,798 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -464,7 +464,7 @@
+@@ -395,29 +688,26 @@
+ 
+ tagnames=${tagnames+${tagnames},}F77
+ 
++exec 7<&0 </dev/null 6>&1
++
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+ # Identity of this package.
+ PACKAGE_NAME=
+ PACKAGE_TARNAME=
+@@ -455,17 +745,328 @@
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
++#endif
++#if HAVE_STDINT_H
++# include <stdint.h>
+ #endif
+ #if HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND LIBKIPI_CFLAGS LIBKIPI_LIBS LIBKIPI_LIBS_DEP PKG_CONFIG LIBKEXIF_CFLAGS LIBKEXIF_LIBS LIBKEXIF_LIBS_DEP compile_LIBKEXIF_TRUE compile_LIBKEXIF_FALSE GPHOTO_CONFIG GPHOTO_PORT_CONFIG GPHOTO_CFLAGS LIB_GPHOTO compile_KAMERAKLIENT_TRUE compile_KAMERAKLIENT_FALSE XSLT_CONFIG LIBXSLT_CFLAGS LIBXSLT_LIBS compile_HTMLEXPORT_TRUE compile_HTMLEXPORT_FALSE MAGICK_CONFIG LIBMAGICK_CFLAGS LIBMAGICK_LIBS GL_LIBS LIB_IMLIB2 IMLIB2_CFLAGS compile_SLIDESHOW_TRUE compile_SLIDESHOW_FALSE LIB_TIFF compile_ACQUIREIMAGES_TRUE compile_ACQUIREIMAGES_FALSE compile_RAWCONVERTER_TRUE compile_RAWCONVERTER_FALSE compile_TIMEADJUST_TRUE compile_TIMEADJUST_FALSE compile_JPEGLOSSLESS_TRUE compile_JPEGLOSSLESS_FALSE TOPSUBDIRS libkexif_SUBDIR_included_TRUE libkexif_SUBDIR_included_FALSE libkipi_SUBDIR_included_TRUE libkipi_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kipi_plugins_SUBDIR_included_TRUE kipi_plugins_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND LIBKIPI_CFLAGS LIBKIPI_LIBS LIBKIPI_LIBS_DEP PKG_CONFIG LIBKEXIF_CFLAGS LIBKEXIF_LIBS LIBKEXIF_LIBS_DEP compile_LIBKEXIF_TRUE compile_LIBKEXIF_FALSE GPHOTO_CONFIG GPHOTO_PORT_CONFIG GPHOTO_CFLAGS LIB_GPHOTO compile_KAMERAKLIENT_TRUE compile_KAMERAKLIENT_FALSE XSLT_CONFIG LIBXSLT_CFLAGS LIBXSLT_LIBS compile_HTMLEXPORT_TRUE compile_HTMLEXPORT_FALSE MAGICK_CONFIG LIBMAGICK_CFLAGS LIBMAGICK_LIBS GL_LIBS LIB_IMLIB2 IMLIB2_CFLAGS compile_SLIDESHOW_TRUE compile_SLIDESHOW_FALSE LIB_TIFF compile_ACQUIREIMAGES_TRUE compile_ACQUIREIMAGES_FALSE compile_RAWCONVERTER_TRUE compile_RAWCONVERTER_FALSE compile_TIMEADJUST_TRUE compile_TIMEADJUST_FALSE compile_JPEGLOSSLESS_TRUE compile_JPEGLOSSLESS_FALSE TOPSUBDIRS libkexif_SUBDIR_included_TRUE libkexif_SUBDIR_included_FALSE libkipi_SUBDIR_included_TRUE libkipi_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kipi_plugins_SUBDIR_included_TRUE kipi_plugins_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND KIPI_PLUGINS_COMMON_INCLUDE KIPI_PLUGINS_COMMON_LDFLAGS LIBKIPI_CFLAGS LIBKIPI_LIBS LIBKIPI_LIBS_DEP PKG_CONFIG LIB_TIFF compile_ACQUIREIMAGES_TRUE compile_ACQUIREIMAGES_FALSE compile_RAWCONVERTER_TRUE compile_RAWCONVERTER_FALSE GPHOTO_CONFIG GPHOTO_PORT_CONFIG GPHOTO_CFLAGS LIB_GPHOTO compile_KAMERAKLIENT_TRUE compile_KAMERAKLIENT_FALSE XSLT_CONFIG LIBXSLT_CFLAGS LIBXSLT_LIBS compile_HTMLEXPORT_TRUE compile_HTMLEXPORT_FALSE EXIV2_CFLAGS EXIV2_LIBS LIBGPOD_CFLAGS LIBGPOD_LIBS compile_IPODEXPORT_TRUE compile_IPODEXPORT_FALSE GL_LIBS LIB_IMLIB2 IMLIB2_CFLAGS compile_SLIDESHOW_TRUE compile_SLIDESHOW_FALSE TOPSUBDIRS libkipi_SUBDIR_included_TRUE libkipi_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kipi_plugins_SUBDIR_included_TRUE kipi_plugins_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL
++PATH_SEPARATOR
++PACKAGE_NAME
++PACKAGE_TARNAME
++PACKAGE_VERSION
++PACKAGE_STRING
++PACKAGE_BUGREPORT
++exec_prefix
++prefix
++program_transform_name
++bindir
++sbindir
++libexecdir
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
++host_alias
++target_alias
++build
++build_cpu
++build_vendor
++build_os
++host
++host_cpu
++host_vendor
++host_os
++target
++target_cpu
++target_vendor
++target_os
++INSTALL_PROGRAM
++INSTALL_SCRIPT
++INSTALL_DATA
++CYGPATH_W
++PACKAGE
++VERSION
++ACLOCAL
++AUTOCONF
++AUTOMAKE
++AUTOHEADER
++MAKEINFO
++install_sh
++STRIP
++INSTALL_STRIP_PROGRAM
++mkdir_p
++AWK
++SET_MAKE
++am__leading_dot
++AMTAR
++am__tar
++am__untar
++MAINTAINER_MODE_TRUE
++MAINTAINER_MODE_FALSE
++MAINT
++KDECONFIG
++kde_libs_prefix
++kde_libs_htmldir
++CONF_FILES
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++ac_ct_CC
++EXEEXT
++OBJEXT
++DEPDIR
++am__include
++am__quote
++AMDEP_TRUE
++AMDEP_FALSE
++AMDEPBACKSLASH
++CCDEPMODE
++am__fastdepCC_TRUE
++am__fastdepCC_FALSE
++CPP
++CXX
++CXXFLAGS
++ac_ct_CXX
++CXXDEPMODE
++am__fastdepCXX_TRUE
++am__fastdepCXX_FALSE
++WOVERLOADED_VIRTUAL
++HAVE_GCC_VISIBILITY
++unsermake_enable_pch_TRUE
++unsermake_enable_pch_FALSE
++USE_EXCEPTIONS
++USE_RTTI
++CXXCPP
++NOOPT_CXXFLAGS
++NOOPT_CFLAGS
++ENABLE_PERMISSIVE_FLAG
++LDFLAGS_AS_NEEDED
++LDFLAGS_NEW_DTAGS
++KDE_USE_FINAL_TRUE
++KDE_USE_FINAL_FALSE
++KDE_USE_CLOSURE_TRUE
++KDE_USE_CLOSURE_FALSE
++KDE_NO_UNDEFINED
++KDE_USE_NMCHECK_TRUE
++KDE_USE_NMCHECK_FALSE
++GREP
++EGREP
++LN_S
++ECHO
++AR
++RANLIB
++F77
++FFLAGS
++ac_ct_F77
++LIBTOOL
++KDE_PLUGIN
++KDE_CHECK_PLUGIN
++MSGFMT
++GMSGFMT
++XGETTEXT
++LIBUTIL
++LIBCOMPAT
++LIBCRYPT
++LIBRESOLV
++LIB_POLL
++FRAMEWORK_COREAUDIO
++LIBSOCKET
++X_EXTRA_LIBS
++LIBUCB
++LIBDL
++KDE_USE_FPIE
++KDE_USE_PIE
++include_x11_TRUE
++include_x11_FALSE
++XMKMF
++X_PRE_LIBS
++LIB_X11
++LIB_XRENDER
++LIBSM
++X_INCLUDES
++X_LDFLAGS
++x_includes
++x_libraries
++QTE_NORTTI
++LIB_XEXT
++LIBPTHREAD
++USE_THREADS
++KDE_MT_LDFLAGS
++KDE_MT_LIBS
++USER_INCLUDES
++USER_LDFLAGS
++LIBZ
++LIBPNG
++LIBJPEG
++qt_libraries
++qt_includes
++QT_INCLUDES
++QT_LDFLAGS
++PERL
++MOC
++UIC
++UIC_TR
++LIB_QT
++LIB_QPE
++kde_qtver
++KDE_EXTRA_RPATH
++KDE_RPATH
++X_RPATH
++kde_libraries
++kde_includes
++KDE_LDFLAGS
++KDE_INCLUDES
++all_includes
++all_libraries
++AUTODIRS
++include_ARTS_TRUE
++include_ARTS_FALSE
++MAKEKDEWIDGETS
++KCONFIG_COMPILER
++KCFG_DEPENDENCIES
++DCOPIDLNG
++DCOPIDL
++DCOPIDL2CPP
++DCOP_DEPENDENCIES
++MCOPIDL
++ARTSCCONFIG
++MEINPROC
++KDE_XSL_STYLESHEET
++XMLLINT
++kde_htmldir
++kde_appsdir
++kde_icondir
++kde_sounddir
++kde_datadir
++kde_locale
++kde_confdir
++kde_kcfgdir
++kde_mimedir
++kde_wallpaperdir
++kde_bindir
++xdg_appsdir
++xdg_menudir
++xdg_directorydir
++kde_templatesdir
++kde_servicesdir
++kde_servicetypesdir
++kde_moduledir
++kdeinitdir
++kde_styledir
++kde_widgetdir
++LIB_KDED
++LIB_KDECORE
++LIB_KDEUI
++LIB_KIO
++LIB_KJS
++LIB_SMB
++LIB_KAB
++LIB_KABC
++LIB_KHTML
++LIB_KSPELL
++LIB_KPARTS
++LIB_KDEPRINT
++LIB_KUTILS
++LIB_KDEPIM
++LIB_KIMPROXY
++LIB_KNEWSTUFF
++LIB_KDNSSD
++LIB_KUNITTEST
++LIB_KSYCOCA
++LIB_KFILE
++LIB_KFM
++QTDOCDIR
++KDE_HAVE_DOT
++DOXYGEN
++DOXYGEN_PROJECT_NAME
++DOXYGEN_PROJECT_NUMBER
++KDE_HAS_DOXYGEN
++PKGCONFIGFOUND
++KIPI_PLUGINS_COMMON_INCLUDE
++KIPI_PLUGINS_COMMON_LDFLAGS
++LIBKIPI_CFLAGS
++LIBKIPI_LIBS
++LIBKIPI_LIBS_DEP
++PKG_CONFIG
++LIB_TIFF
++compile_ACQUIREIMAGES_TRUE
++compile_ACQUIREIMAGES_FALSE
++compile_RAWCONVERTER_TRUE
++compile_RAWCONVERTER_FALSE
++GPHOTO_CONFIG
++GPHOTO_PORT_CONFIG
++GPHOTO_CFLAGS
++LIB_GPHOTO
++compile_KAMERAKLIENT_TRUE
++compile_KAMERAKLIENT_FALSE
++XSLT_CONFIG
++LIBXSLT_CFLAGS
++LIBXSLT_LIBS
++compile_HTMLEXPORT_TRUE
++compile_HTMLEXPORT_FALSE
++EXIV2_CFLAGS
++EXIV2_LIBS
++LIBGPOD_CFLAGS
++LIBGPOD_LIBS
++compile_IPODEXPORT_TRUE
++compile_IPODEXPORT_FALSE
++GL_LIBS
++LIB_IMLIB2
++IMLIB2_CFLAGS
++compile_SLIDESHOW_TRUE
++compile_SLIDESHOW_FALSE
++TOPSUBDIRS
++libkipi_SUBDIR_included_TRUE
++libkipi_SUBDIR_included_FALSE
++doc_SUBDIR_included_TRUE
++doc_SUBDIR_included_FALSE
++kipi_plugins_SUBDIR_included_TRUE
++kipi_plugins_SUBDIR_included_FALSE
++po_SUBDIR_included_TRUE
++po_SUBDIR_included_FALSE
++LIBOBJS
++LTLIBOBJS'
  ac_subst_files=''
++      ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++CPP
++CXX
++CXXFLAGS
++CCC
++CXXCPP
++F77
++FFLAGS
++XMKMF
++PKGCONFIGFOUND'
++
  
  # Initialize some variables set by options.
-@@ -1029,6 +1029,8 @@
+ ac_init_help=
+@@ -492,34 +1093,48 @@
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+ 
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+   # If the previous option needs an argument, assign it.
+   if test -n "$ac_prev"; then
+-    eval "$ac_prev=\$ac_option"
++    eval $ac_prev=\$ac_option
+     ac_prev=
+     continue
+   fi
+ 
+-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++  case $ac_option in
++  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *)	ac_optarg=yes ;;
++  esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+ 
+-  case $ac_option in
++  case $ac_dashdash$ac_option in
++  --)
++    ac_dashdash=yes ;;
+ 
+   -bindir | --bindir | --bindi | --bind | --bin | --bi)
+     ac_prev=bindir ;;
+@@ -541,12 +1156,18 @@
+   --config-cache | -C)
+     cache_file=config.cache ;;
+ 
+-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++  -datadir | --datadir | --datadi | --datad)
+     ac_prev=datadir ;;
+-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+-  | --da=*)
++  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+@@ -554,7 +1175,17 @@
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    eval "enable_$ac_feature=no" ;;
++    eval enable_$ac_feature=no ;;
++
++  -docdir | --docdir | --docdi | --doc | --do)
++    ac_prev=docdir ;;
++  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++    docdir=$ac_optarg ;;
++
++  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++    ac_prev=dvidir ;;
++  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++    dvidir=$ac_optarg ;;
+ 
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+@@ -563,11 +1194,7 @@
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
+-    esac
+-    eval "enable_$ac_feature='$ac_optarg'" ;;
++    eval enable_$ac_feature=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -594,6 +1221,12 @@
+   -host=* | --host=* | --hos=* | --ho=*)
+     host_alias=$ac_optarg ;;
+ 
++  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++    ac_prev=htmldir ;;
++  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++  | --ht=*)
++    htmldir=$ac_optarg ;;
++
+   -includedir | --includedir | --includedi | --included | --include \
+   | --includ | --inclu | --incl | --inc)
+     ac_prev=includedir ;;
+@@ -618,13 +1251,16 @@
+   | --libexe=* | --libex=* | --libe=*)
+     libexecdir=$ac_optarg ;;
+ 
++  -localedir | --localedir | --localedi | --localed | --locale)
++    ac_prev=localedir ;;
++  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++    localedir=$ac_optarg ;;
++
+   -localstatedir | --localstatedir | --localstatedi | --localstated \
+-  | --localstate | --localstat | --localsta | --localst \
+-  | --locals | --local | --loca | --loc | --lo)
++  | --localstate | --localstat | --localsta | --localst | --locals)
+     ac_prev=localstatedir ;;
+   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+     localstatedir=$ac_optarg ;;
+ 
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -689,6 +1325,16 @@
+   | --progr-tra=* | --program-tr=* | --program-t=*)
+     program_transform_name=$ac_optarg ;;
+ 
++  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++    ac_prev=pdfdir ;;
++  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++    pdfdir=$ac_optarg ;;
++
++  -psdir | --psdir | --psdi | --psd | --ps)
++    ac_prev=psdir ;;
++  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++    psdir=$ac_optarg ;;
++
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+@@ -745,11 +1391,7 @@
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
+-    esac
+-    eval "with_$ac_package='$ac_optarg'" ;;
++    eval with_$ac_package=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+@@ -758,7 +1400,7 @@
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     ac_package=`echo $ac_package | sed 's/-/_/g'`
+-    eval "with_$ac_package=no" ;;
++    eval with_$ac_package=no ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -789,8 +1431,7 @@
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+    { (exit 1); exit 1; }; }
+-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+-    eval "$ac_envvar='$ac_optarg'"
++    eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+   *)
+@@ -810,27 +1451,19 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
++# Be sure to have absolute directory names.
++for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
++		datadir sysconfdir sharedstatedir localstatedir includedir \
++		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++		libdir localedir mandir
+ do
+-  eval ac_val=$`echo $ac_var`
++  eval ac_val=\$$ac_var
+   case $ac_val in
+-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
+-  esac
+-done
+-
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++    [\\/$]* | ?:[\\/]* )  continue;;
++    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
++  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; }
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -857,98 +1490,76 @@
+ test "$silent" = yes && exec 6>/dev/null
+ 
+ 
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++  { echo "$as_me: error: Working directory cannot be determined" >&2
++   { (exit 1); exit 1; }; }
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++  { echo "$as_me: error: pwd does not report name of working directory" >&2
++   { (exit 1); exit 1; }; }
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+-  # Try the directory containing this script, then its parent.
+-  ac_confdir=`(dirname "$0") 2>/dev/null ||
++  # Try the directory containing this script, then the parent directory.
++  ac_confdir=`$as_dirname -- "$0" ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$0" : 'X\(//\)[^/]' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$0" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+   srcdir=$ac_confdir
+-  if test ! -r $srcdir/$ac_unique_file; then
++  if test ! -r "$srcdir/$ac_unique_file"; then
+     srcdir=..
+   fi
+ else
+   ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+-  if test "$ac_srcdir_defaulted" = yes; then
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+-   { (exit 1); exit 1; }; }
+-  else
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+-   { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
+-ac_env_CXX_set=${CXX+set}
+-ac_env_CXX_value=$CXX
+-ac_cv_env_CXX_set=${CXX+set}
+-ac_cv_env_CXX_value=$CXX
+-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_env_CXXFLAGS_value=$CXXFLAGS
+-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+-ac_env_CXXCPP_set=${CXXCPP+set}
+-ac_env_CXXCPP_value=$CXXCPP
+-ac_cv_env_CXXCPP_set=${CXXCPP+set}
+-ac_cv_env_CXXCPP_value=$CXXCPP
+-ac_env_F77_set=${F77+set}
+-ac_env_F77_value=$F77
+-ac_cv_env_F77_set=${F77+set}
+-ac_cv_env_F77_value=$F77
+-ac_env_FFLAGS_set=${FFLAGS+set}
+-ac_env_FFLAGS_value=$FFLAGS
+-ac_cv_env_FFLAGS_set=${FFLAGS+set}
+-ac_cv_env_FFLAGS_value=$FFLAGS
+-ac_env_PKGCONFIGFOUND_set=${PKGCONFIGFOUND+set}
+-ac_env_PKGCONFIGFOUND_value=$PKGCONFIGFOUND
+-ac_cv_env_PKGCONFIGFOUND_set=${PKGCONFIGFOUND+set}
+-ac_cv_env_PKGCONFIGFOUND_value=$PKGCONFIGFOUND
++if test ! -r "$srcdir/$ac_unique_file"; then
++  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++   { (exit 1); exit 1; }; }
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
++   { (exit 1); exit 1; }; }
++	pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++  srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++  eval ac_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_env_${ac_var}_value=\$${ac_var}
++  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+ 
+ #
+ # Report the --help message.
+@@ -977,9 +1588,6 @@
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+-_ACEOF
+-
+-  cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+ 			  [$ac_default_prefix]
+@@ -997,15 +1605,22 @@
+   --bindir=DIR           user executables [EPREFIX/bin]
+   --sbindir=DIR          system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
+-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+   --includedir=DIR       C header files [PREFIX/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --infodir=DIR          info documentation [PREFIX/info]
+-  --mandir=DIR           man documentation [PREFIX/man]
++  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
++  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
++  --infodir=DIR          info documentation [DATAROOTDIR/info]
++  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
++  --mandir=DIR           man documentation [DATAROOTDIR/man]
++  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
++  --htmldir=DIR          html documentation [DOCDIR]
++  --dvidir=DIR           dvi documentation [DOCDIR]
++  --pdfdir=DIR           pdf documentation [DOCDIR]
++  --psdir=DIR            ps documentation [DOCDIR]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+@@ -1029,6 +1644,8 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -3846,23 +5924,1078 @@
    --disable-fast-perl     disable fast Makefile generation (needs perl)
    --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
    --disable-debug         disables debug output and debug symbols default=no
-@@ -2093,6 +2095,31 @@
+@@ -1036,8 +1653,8 @@
+                           work!)
+   --disable-warnings      disables compilation with -Wall and similar
+   --enable-profile        creates profiling infos default=no
+-  --disable-dependency-tracking Speeds up one-time builds
+-  --enable-dependency-tracking  Do not reject slow dependency extractors
++  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors
+   --enable-pch            enables precompiled header support (currently only
+                           KCC or gcc >=3.4+unsermake) default=no
+   --enable-coverage       use gcc coverage testing
+@@ -1046,10 +1663,8 @@
+                           of memory)
+   --enable-closure        delay template instantiation
+   --enable-nmcheck        enable automatic namespace cleanness check
+-  --enable-shared[=PKGS]
+-                          build shared libraries [default=yes]
+-  --enable-static[=PKGS]
+-                          build static libraries [default=no]
++  --enable-shared[=PKGS]  build shared libraries [default=yes]
++  --enable-static[=PKGS]  build static libraries [default=no]
+   --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
+   --enable-fast-install[=PKGS]
+                           optimize for fast installation [default=yes]
+@@ -1071,8 +1686,7 @@
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+   --with-pic              try to use only PIC/non-PIC objects [default=use
+                           both]
+-  --with-tags[=TAGS]
+-                          include additional configurations [automatic]
++  --with-tags[=TAGS]      include additional configurations [automatic]
+   --with-extra-includes=DIR
+                           adds non standard include paths
+   --with-extra-libs=DIR   adds non standard library paths
+@@ -1088,14 +1702,15 @@
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+-              headers in a nonstandard directory <include dir>
++  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++              you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   CXX         C++ compiler command
+   CXXFLAGS    C++ compiler flags
+   CXXCPP      C++ preprocessor
+   F77         Fortran 77 compiler command
+   FFLAGS      Fortran 77 compiler flags
++  XMKMF       Path to xmkmf, Makefile generator for X Window System
+   PKGCONFIGFOUND
+               Path to pkg-config
  
+@@ -1103,118 +1718,86 @@
+ it to find libraries and programs with nonstandard names/locations.
  
+ _ACEOF
++ac_status=$?
+ fi
  
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+-  ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d $ac_dir || continue
++    test -d "$ac_dir" || continue
+     ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
+-    cd $ac_dir
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_srcdir/configure.gnu; then
+-      echo
+-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+-    elif test -f $ac_srcdir/configure; then
+-      echo
+-      $SHELL $ac_srcdir/configure  --help=recursive
+-    elif test -f $ac_srcdir/configure.ac ||
+-	   test -f $ac_srcdir/configure.in; then
+-      echo
+-      $ac_configure --help
++    cd "$ac_dir" || { ac_status=$?; continue; }
++    # Check for guested configure.
++    if test -f "$ac_srcdir/configure.gnu"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++    elif test -f "$ac_srcdir/configure"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure" --help=recursive
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+-    fi
+-    cd $ac_popdir
++    fi || ac_status=$?
++    cd "$ac_pwd" || { ac_status=$?; break; }
+   done
+ fi
+ 
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.60
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+-  exit 0
++  exit
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
++cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++generated by GNU Autoconf 2.60.  Invocation command line was
+ 
+   $ $0 $@
+ 
+ _ACEOF
++exec 5>>config.log
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -1233,7 +1816,7 @@
+ /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+ /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+ /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+@@ -1247,6 +1830,7 @@
+   test -z "$as_dir" && as_dir=.
+   echo "PATH: $as_dir"
+ done
++IFS=$as_save_IFS
+ 
+ } >&5
+ 
+@@ -1268,7 +1852,6 @@
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1279,7 +1862,7 @@
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++    *\'*)
+       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+@@ -1301,9 +1884,7 @@
+ 	  -* ) ac_must_keep_next=true ;;
+ 	esac
+       fi
+-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-      # Get rid of the leading space.
+-      ac_sep=" "
++      ac_configure_args="$ac_configure_args '$ac_arg'"
+       ;;
+     esac
+   done
+@@ -1314,8 +1895,8 @@
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+@@ -1328,20 +1909,34 @@
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      *) $as_unset $ac_var ;;
++      esac ;;
++    esac
++  done
+   (set) 2>&1 |
+-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
++    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
+       sed -n \
+-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+-      ;;
++	"s/'\''/'\''\\\\'\'''\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
++      ;; #(
+     *)
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-}
++    esac |
++    sort
++)
+     echo
+ 
+     cat <<\_ASBOX
+@@ -1352,22 +1947,28 @@
+     echo
+     for ac_var in $ac_subst_vars
+     do
+-      eval ac_val=$`echo $ac_var`
+-      echo "$ac_var='"'"'$ac_val'"'"'"
++      eval ac_val=\$$ac_var
++      case $ac_val in
++      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++      esac
++      echo "$ac_var='\''$ac_val'\''"
+     done | sort
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+       cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
++## ------------------- ##
++## File substitutions. ##
++## ------------------- ##
+ _ASBOX
+       echo
+       for ac_var in $ac_subst_files
+       do
+-	eval ac_val=$`echo $ac_var`
+-	echo "$ac_var='"'"'$ac_val'"'"'"
++	eval ac_val=\$$ac_var
++	case $ac_val in
++	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++	esac
++	echo "$ac_var='\''$ac_val'\''"
+       done | sort
+       echo
+     fi
+@@ -1379,26 +1980,24 @@
+ ## ----------- ##
+ _ASBOX
+       echo
+-      sed "/^$/d" confdefs.h | sort
++      cat confdefs.h
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+-  rm -f core *.core &&
+-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++  rm -f core *.core core.conftest.* &&
++    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+-     ' 0
++' 0
+ for ac_signal in 1 2 13 15; do
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
++rm -f -r conftest* confdefs.h
+ 
+ # Predefined preprocessor variables.
+ 
+@@ -1429,14 +2028,17 @@
+ 
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+-  if test "x$prefix" != xNONE; then
+-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+-  else
+-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+-  fi
++if test -n "$CONFIG_SITE"; then
++  set x "$CONFIG_SITE"
++elif test "x$prefix" != xNONE; then
++  set x "$prefix/share/config.site" "$prefix/etc/config.site"
++else
++  set x "$ac_default_prefix/share/config.site" \
++	"$ac_default_prefix/etc/config.site"
+ fi
+-for ac_site_file in $CONFIG_SITE; do
++shift
++for ac_site_file
++do
+   if test -r "$ac_site_file"; then
+     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+@@ -1452,8 +2054,8 @@
+     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+-      [\\/]* | ?:[\\/]* ) . $cache_file;;
+-      *)                      . ./$cache_file;;
++      [\\/]* | ?:[\\/]* ) . "$cache_file";;
++      *)                      . "./$cache_file";;
+     esac
+   fi
+ else
+@@ -1465,12 +2067,11 @@
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++for ac_var in $ac_precious_vars; do
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+-  eval ac_new_val="\$ac_env_${ac_var}_value"
++  eval ac_old_val=\$ac_cv_env_${ac_var}_value
++  eval ac_new_val=\$ac_env_${ac_var}_value
+   case $ac_old_set,$ac_new_set in
+     set,)
+       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+@@ -1495,8 +2096,7 @@
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+@@ -1513,12 +2113,6 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+ 
+ 
+ 
+@@ -1535,110 +2129,165 @@
+ 
+ 
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ ac_aux_dir=
+-for ac_dir in admin $srcdir/admin; do
+-  if test -f $ac_dir/install-sh; then
++for ac_dir in admin "$srcdir"/admin; do
++  if test -f "$ac_dir/install-sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
+     break
+-  elif test -f $ac_dir/install.sh; then
++  elif test -f "$ac_dir/install.sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     break
+-  elif test -f $ac_dir/shtool; then
++  elif test -f "$ac_dir/shtool"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/shtool install -c"
+     break
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# These three variables are undocumented and unsupported,
++# and are intended to be withdrawn in a future Autoconf release.
++# They can cause serious problems if a builder's source tree is in a directory
++# whose full name contains unusual characters.
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
++ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
++
+ 
+ 
+ unset CDPATH
+ 
+ # Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+-  ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
++  ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
++test "x$ac_build_alias" = x &&
+   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
++  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6; }
++case $ac_cv_build in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
+ build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_build
++shift
++build_cpu=$1
++build_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++build_os=$*
++IFS=$ac_save_IFS
++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+-  ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++  if test "x$host_alias" = x; then
++  ac_cv_host=$ac_cv_build
++else
++  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
++    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
++fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
++case $ac_cv_host in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
+ host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++host_os=$*
++IFS=$ac_save_IFS
++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-echo "$as_me:$LINENO: checking target system type" >&5
+-echo $ECHO_N "checking target system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking target system type" >&5
++echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_target_alias=$target_alias
+-test "x$ac_cv_target_alias" = "x" &&
+-  ac_cv_target_alias=$ac_cv_host_alias
+-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
++  if test "x$target_alias" = x; then
++  ac_cv_target=$ac_cv_host
++else
++  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
++    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
++fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+-echo "${ECHO_T}$ac_cv_target" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
++echo "${ECHO_T}$ac_cv_target" >&6; }
++case $ac_cv_target in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
++echo "$as_me: error: invalid value of canonical target" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
+ target=$ac_cv_target
+-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_target
++shift
++target_cpu=$1
++target_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++target_os=$*
++IFS=$ac_save_IFS
++case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+ # The aliases save the names the user supplied, while $host etc.
+@@ -1648,20 +2297,20 @@
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ test "$program_prefix" != NONE &&
+-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
++  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
++  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+ # Double any \ or $.  echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+ cat <<\_ACEOF >conftest.sed
+ s/[\\$]/&&/g;s/;s,x,x,$//
+ _ACEOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++rm -f conftest.sed
+ 
+ 
+-am__api_version="1.7"
++am__api_version="1.9"
+ 
+ 
+           test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
+@@ -1680,8 +2329,8 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1703,7 +2352,7 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -1722,21 +2371,22 @@
+     ;;
+ esac
+ done
++IFS=$as_save_IFS
+ 
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+     INSTALL=$ac_cv_path_install
+   else
+-    # As a last resort, use the slow shell script.  We don't cache a
+-    # path for INSTALL within a source directory, because that will
++    # As a last resort, use the slow shell script.  Don't cache a
++    # value for INSTALL within a source directory, because that will
+     # break other packages using the cache if that directory is
+-    # removed, or if the path is relative.
++    # removed, or if the value is a relative name.
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -1750,8 +2400,8 @@
+   if test -z "$kde_save_INSTALL_given" ; then
+     # OK, user hasn't given any INSTALL, autoconf found one for us
+     # now we test, if it supports the -p flag
+-    echo "$as_me:$LINENO: checking for -p flag to install" >&5
+-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for -p flag to install" >&5
++echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
+     rm -f confinst.$$.* > /dev/null 2>&1
+     echo "Testtest" > confinst.$$.orig
+     ac_res=no
+@@ -1763,8 +2413,8 @@
+       fi
+     fi
+     rm -f confinst.$$.*
+-    echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6
++    { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+   fi
+ 
+   if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
+@@ -1774,8 +2424,8 @@
+     INSTALL_SCRIPT='${INSTALL}'
+   fi
+ 
+-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -1817,9 +2467,8 @@
+ Check your system clock" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+@@ -1833,12 +2482,45 @@
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
++if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++  # We used to keeping the `.' as first argument, in order to
++  # allow $(mkdir_p) to be used without argument.  As in
++  #   $(mkdir_p) $(somedir)
++  # where $(somedir) is conditionally defined.  However this is wrong
++  # for two reasons:
++  #  1. if the package is installed by a user who cannot write `.'
++  #     make install will fail,
++  #  2. the above comment should most certainly read
++  #     $(mkdir_p) $(DESTDIR)$(somedir)
++  #     so it does not work when $(somedir) is undefined and
++  #     $(DESTDIR) is not.
++  #  To support the latter case, we have to write
++  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
++  #  so the `.' trick is pointless.
++  mkdir_p='mkdir -p --'
++else
++  # On NextStep and OpenStep, the `mkdir' command does not
++  # recognize any option.  It will interpret all options as
++  # directories to create, and then abort because `.' already
++  # exists.
++  for d in ./-p ./--version;
++  do
++    test -d $d && rmdir $d
++  done
++  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
++  if test -f "$ac_aux_dir/mkinstalldirs"; then
++    mkdir_p='$(mkinstalldirs)'
++  else
++    mkdir_p='$(install_sh) -d'
++  fi
++fi
++
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -1851,54 +2533,57 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++  { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$AWK" && break
+ done
+ 
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
+ all:
+-	@echo 'ac_maketemp="$(MAKE)"'
++	@echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
+-  eval ac_cv_prog_make_${ac_make}_set=yes
+-else
+-  eval ac_cv_prog_make_${ac_make}_set=no
+-fi
++case `${MAKE-make} -f conftest.make 2>/dev/null` in
++  *@@@%%%=?*=@@@%%%*)
++    eval ac_cv_prog_make_${ac_make}_set=yes;;
++  *)
++    eval ac_cv_prog_make_${ac_make}_set=no;;
++esac
+ rm -f conftest.make
+ fi
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   SET_MAKE=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+@@ -1911,7 +2596,7 @@
+ fi
+ rmdir .tst 2>/dev/null
+ 
+- # test to see if srcdir already configured
++# test to see if srcdir already configured
+ if test "`cd $srcdir && pwd`" != "`pwd`" &&
+    test -f $srcdir/config.status; then
+   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+@@ -1959,9 +2644,6 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+-
+ install_sh=${install_sh-"$am_aux_dir/install-sh"}
+ 
+ # Installed binaries are usually stripped using `strip' when the user
+@@ -1972,8 +2654,8 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -1986,32 +2668,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++  { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2024,27 +2708,41 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  STRIP=$ac_ct_STRIP
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -2054,6 +2752,38 @@
+ 
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
++# Always define AMTAR for backward compatibility.
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
++
++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
++
++
++
++
++
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++    # Check whether --enable-maintainer-mode was given.
 +if test "${enable_maintainer_mode+set}" = set; then
-+  enableval="$enable_maintainer_mode"
-+  USE_MAINTAINER_MODE=$enableval
++  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 +else
 +  USE_MAINTAINER_MODE=no
-+fi;
-+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++fi
 +
++  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
 +
++
 +if test $USE_MAINTAINER_MODE = yes; then
 +  MAINTAINER_MODE_TRUE=
 +  MAINTAINER_MODE_FALSE='#'
@@ -3872,13 +7005,5036 @@
 +fi
 +
 +  MAINT=$MAINTAINER_MODE_TRUE
+ 
+ 
+ 
+@@ -2075,14 +2805,14 @@
+ 
+   if test "x$prefix" = "xNONE"; then
+ 
+-   echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+    if test -n "$KDECONFIG"; then
+         kde_cv_path="$KDECONFIG";
+    else
+         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -2125,8 +2855,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2137,8 +2867,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       KDECONFIG=$kde_cv_path
+ 
+    fi
+@@ -2147,14 +2877,14 @@
+         kde_save_PATH="$PATH"
+     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
+ 
+-   echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+    if test -n "$KDECONFIG"; then
+         kde_cv_path="$KDECONFIG";
+    else
+         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -2197,8 +2927,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2209,8 +2939,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       KDECONFIG=$kde_cv_path
+ 
+    fi
+@@ -2232,16 +2962,16 @@
+   fi
+   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+ 
+-  echo "$as_me:$LINENO: checking where to install" >&5
+-echo $ECHO_N "checking where to install... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking where to install" >&5
++echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
+   if test "x$prefix" = "xNONE"; then
+     prefix=$kde_libs_prefix
+-    echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
+-echo "${ECHO_T}$prefix (as returned by kde-config)" >&6
++    { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
++echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
+   else
+         given_prefix=$prefix
+-    echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
+-echo "${ECHO_T}$prefix (as requested)" >&6
++    { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
++echo "${ECHO_T}$prefix (as requested)" >&6; }
+   fi
+ 
+   # And delete superfluous '/' to make compares easier
+@@ -2254,13 +2984,13 @@
+ 
+ 
+ 
+-    # Check whether --enable-fast-perl or --disable-fast-perl was given.
++    # Check whether --enable-fast-perl was given.
+ if test "${enable_fast_perl+set}" = set; then
+-  enableval="$enable_fast_perl"
+-  with_fast_perl=$enableval
++  enableval=$enable_fast_perl; with_fast_perl=$enableval
+ else
+   with_fast_perl=yes
+-fi;
++fi
 +
+ 
+ 
+   val=
+@@ -2277,11 +3007,11 @@
+ 
+ 
+ 
+-          ac_config_headers="$ac_config_headers config.h"
++ac_config_headers="$ac_config_headers config.h"
+ 
+ DEPDIR="${am__leading_dot}deps"
+ 
+-          ac_config_commands="$ac_config_commands depfiles"
++ac_config_commands="$ac_config_commands depfiles"
+ 
+ 
+ am_make=${MAKE-make}
+@@ -2291,8 +3021,8 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2319,15 +3049,15 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6
++{ echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6; }
+ rm -f confinc confmf
+ 
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++# Check whether --enable-dependency-tracking was given.
+ if test "${enable_dependency_tracking+set}" = set; then
+-  enableval="$enable_dependency_tracking"
++  enableval=$enable_dependency_tracking;
++fi
+ 
+-fi;
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+@@ -2347,10 +3077,9 @@
+ 
+ 
+ 
+-  # Check whether --enable-debug or --disable-debug was given.
++  # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then
+-  enableval="$enable_debug"
+-
++  enableval=$enable_debug;
+     case $enableval in
+       yes)
+         kde_use_debug_code="yes"
+@@ -2370,18 +3099,18 @@
+   kde_use_debug_code="no"
+       kde_use_debug_define=no
+ 
+-fi;
++fi
 +
+ 
+-    # Check whether --enable-dummyoption or --disable-dummyoption was given.
++    # Check whether --enable-dummyoption was given.
+ if test "${enable_dummyoption+set}" = set; then
+-  enableval="$enable_dummyoption"
++  enableval=$enable_dummyoption;
++fi
+ 
+-fi;
+ 
+-  # Check whether --enable-strict or --disable-strict was given.
++  # Check whether --enable-strict was given.
+ if test "${enable_strict+set}" = set; then
+-  enableval="$enable_strict"
+-
++  enableval=$enable_strict;
+     if test $enableval = "no"; then
+          kde_use_strict_options="no"
+        else
+@@ -2390,12 +3119,12 @@
+ 
+ else
+   kde_use_strict_options="no"
+-fi;
++fi
+ 
+-  # Check whether --enable-warnings or --disable-warnings was given.
+-if test "${enable_warnings+set}" = set; then
+-  enableval="$enable_warnings"
+ 
++  # Check whether --enable-warnings was given.
++if test "${enable_warnings+set}" = set; then
++  enableval=$enable_warnings;
+     if test $enableval = "no"; then
+          kde_use_warnings="no"
+        else
+@@ -2404,20 +3133,21 @@
+ 
+ else
+   kde_use_warnings="yes"
+-fi;
++fi
 +
  
-   unset CDPATH
+     if test "$kde_use_debug_code" != "no"; then
+     kde_use_warnings=yes
+   fi
  
-@@ -7176,7 +7203,7 @@
+-  # Check whether --enable-profile or --disable-profile was given.
++  # Check whether --enable-profile was given.
+ if test "${enable_profile+set}" = set; then
+-  enableval="$enable_profile"
+-  kde_use_profiling=$enableval
++  enableval=$enable_profile; kde_use_profiling=$enableval
+ else
+   kde_use_profiling="no"
+ 
+-fi;
++fi
++
+ 
+     CFLAGS=" $CFLAGS"
+ 
+@@ -2429,8 +3159,8 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2443,32 +3173,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_CC"; then
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2481,36 +3213,51 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ else
+   CC="$ac_cv_prog_CC"
+ fi
+ 
+ if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++          if test -n "$ac_tool_prefix"; then
++    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2523,74 +3270,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+ 
++  fi
+ fi
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2604,7 +3311,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -2615,6 +3322,7 @@
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+   # We found a bogon in the path, so make sure we never use it.
+@@ -2632,22 +3340,23 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$CC"; then
+   if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2660,36 +3369,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+     test -n "$CC" && break
+   done
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2702,29 +3413,45 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_CC" && break
+ done
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ fi
+ 
+ fi
+@@ -2737,21 +3464,35 @@
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C compiler version" >&5
++echo "$as_me:$LINENO: checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (ac_try="$ac_compiler --version >&5"
++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_compiler --version >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++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_compiler -v >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++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_compiler -V >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+@@ -2776,46 +3517,70 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+-  (eval $ac_link_default) 2>&5
++#
++# List of possible output files, starting from the most likely.
++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
++# only as a last resort.  b.out is created by i960 compilers.
++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
++#
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions.  Remove them first so a
++# subsequent execution test works.
++ac_rmfiles=
++for ac_file in $ac_files
++do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
++  esac
++done
++rm -f $ac_rmfiles
++
++if { (ac_try="$ac_link_default"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link_default") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  # Find the output, starting from the most likely.  This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
++# in a Makefile.  We should not override ac_cv_exeext if it was cached,
++# so that the user can short-circuit this test for compilers unknown to
++# Autoconf.
++for ac_file in $ac_files
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+-	;;
+-    conftest.$ac_ext )
+-	# This is the source file.
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ 	;;
+     [ab].out )
+ 	# We found the default executable, but exeext='' is most
+ 	# certainly right.
+ 	break;;
+     *.* )
+-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	# FIXME: I believe we export ac_cv_exeext for Libtool,
+-	# but it would be cool to find out if it's true.  Does anybody
+-	# maintain Libtool? --akim.
+-	export ac_cv_exeext
++        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++	then :; else
++	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	fi
++	# We set ac_cv_exeext here because the later test for it is not
++	# safe: cross compilers may not add the suffix if given an `-o'
++	# argument, so we may need to know it at that point already.
++	# Even if this section looks crufty: it has the advantage of
++	# actually working.
+ 	break;;
+     * )
+ 	break;;
+   esac
+ done
++test "$ac_cv_exeext" = no && ac_cv_exeext=
++
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2828,19 +3593,23 @@
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
+ 
+-# Check the compiler produces executables we can run.  If not, either
++# Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -2859,22 +3628,27 @@
+     fi
+   fi
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run.  If not, either
++# Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
+-
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
++
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+@@ -2885,9 +3659,8 @@
+ for ac_file in conftest.exe conftest conftest.*; do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	  export ac_cv_exeext
+ 	  break;;
+     * ) break;;
+   esac
+@@ -2901,14 +3674,14 @@
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2928,14 +3701,20 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
++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>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  for ac_file in conftest.o conftest.obj conftest.*; do
++  test -f "$ac_file" || continue;
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+@@ -2953,12 +3732,12 @@
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2981,24 +3760,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -3007,24 +3798,28 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
++	ac_compiler_gnu=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_save_c_werror_flag=$ac_c_werror_flag
++   ac_c_werror_flag=yes
++   ac_cv_prog_cc_g=no
++   CFLAGS="-g"
++   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3040,24 +3835,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -3066,285 +3873,278 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
++	CFLAGS=""
++      cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+-
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+-   function prototypes and stuff, but not '\xHH' hex character constants.
+-   These don't provoke an error unfortunately, instead are silently treated
+-   as 'x'.  The following induces an error, until -std1 is added to get
+-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+-   array size at least.  It's necessary to write '\x00'==0 to get something
+-   that's true only with -std1.  */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+ 
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+ int
+ main ()
+ {
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++
+   ;
+   return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
++  :
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+-  *)
+-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+-# Some people use a C++ compiler to compile C.  Since we use `exit',
+-# in C++ we need to declare it.  In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+-  choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
++	ac_c_werror_flag=$ac_save_c_werror_flag
++	 CFLAGS="-g"
++	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  :
++  ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-continue
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+ int
+ main ()
+ {
+-exit (42);
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  break
++  ac_cv_prog_cc_c89=$ac_arg
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext
++  test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
+ fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++  x)
++    { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++  xno)
++    { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++  *)
++    CC="$CC $ac_cv_prog_cc_c89"
++    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
+ 
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3353,8 +4153,8 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3392,7 +4192,9 @@
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      : > sub/conftst$i.h
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+@@ -3420,9 +4222,14 @@
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+-      # (even with -Werror).  So we grep stderr for any message
+-      # that says an option was ignored.
+-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+         am_cv_CC_dependencies_compiler_type=$depmode
+         break
+       fi
+@@ -3436,8 +4243,8 @@
+ fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+ 
+@@ -3459,8 +4266,8 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -3494,8 +4301,13 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -3520,9 +4332,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3532,8 +4345,13 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -3560,6 +4378,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3577,8 +4396,8 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -3601,8 +4420,13 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -3627,9 +4451,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3639,8 +4464,13 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -3667,6 +4497,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3717,18 +4548,22 @@
+ 
+   CXXFLAGS=" $CXXFLAGS"
+ 
+-  ac_ext=cc
++  ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++if test -z "$CXX"; then
++  if test -n "$CCC"; then
++    CXX=$CCC
++  else
++    if test -n "$ac_tool_prefix"; then
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3741,36 +4576,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:$LINENO: result: $CXX" >&5
+-echo "${ECHO_T}$CXX" >&6
++  { echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+     test -n "$CXX" && break
+   done
+ fi
+ if test -z "$CXX"; then
+   ac_ct_CXX=$CXX
+-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3783,55 +4620,85 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CXX="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-echo "${ECHO_T}$ac_ct_CXX" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_CXX" && break
+ done
+-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+ 
+-  CXX=$ac_ct_CXX
++  if test "x$ac_ct_CXX" = x; then
++    CXX="g++"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    CXX=$ac_ct_CXX
++  fi
+ fi
+ 
+-
++  fi
++fi
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C++ compiler version" >&5
++echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (ac_try="$ac_compiler --version >&5"
++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_compiler --version >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++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_compiler -v >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++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_compiler -V >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3854,24 +4721,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -3880,24 +4759,28 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
++	ac_compiler_gnu=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++   ac_cxx_werror_flag=yes
++   ac_cv_prog_cxx_g=no
++   CXXFLAGS="-g"
++   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3913,24 +4796,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -3939,70 +4834,53 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_cxx_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+-if test "$ac_test_CXXFLAGS" = set; then
+-  CXXFLAGS=$ac_save_CXXFLAGS
+-elif test $ac_cv_prog_cxx_g = yes; then
+-  if test "$GXX" = yes; then
+-    CXXFLAGS="-g -O2"
+-  else
+-    CXXFLAGS="-g"
+-  fi
+-else
+-  if test "$GXX" = yes; then
+-    CXXFLAGS="-O2"
+-  else
+-    CXXFLAGS=
+-  fi
+-fi
+-for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
++	CXXFLAGS=""
++      cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4011,61 +4889,91 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
++	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++	 CXXFLAGS="-g"
++	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
++
+ int
+ main ()
+ {
+-exit (42);
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  break
++  ac_cv_prog_cxx_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++  CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
++fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4074,8 +4982,8 @@
+ 
+ depcc="$CXX"  am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4113,7 +5021,9 @@
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      : > sub/conftst$i.h
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+@@ -4141,9 +5051,14 @@
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+-      # (even with -Werror).  So we grep stderr for any message
+-      # that says an option was ignored.
+-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+         am_cv_CXX_dependencies_compiler_type=$depmode
+         break
+       fi
+@@ -4157,8 +5072,8 @@
+ fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+ 
+ 
+@@ -4176,8 +5091,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
+-echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
++echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
+ 
+ 
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -4202,24 +5117,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4228,13 +5155,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_bad_compiler=yes
++	kde_bad_compiler=yes
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-  echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+-echo "${ECHO_T}$kde_bad_compiler" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++  { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
++echo "${ECHO_T}$kde_bad_compiler" >&6; }
+ 
+ if test "$kde_bad_compiler" = "yes"; then
+   { { echo "$as_me:$LINENO: error:
+@@ -4276,17 +5204,16 @@
+         fi
+       fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
+ kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+ 
+-
+-ac_ext=cc
++ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4314,24 +5241,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4340,8 +5279,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4354,29 +5295,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-fno-builtin $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
+-echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
++echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
+ kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4403,24 +5343,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4429,8 +5381,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4443,13 +5397,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+  WOVERLOADED_VRITUAL=""
+ fi
+@@ -4470,16 +5424,15 @@
+ 
+   if test "$kde_use_profiling" = "yes"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
+-echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
++echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
+ kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4506,24 +5459,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4532,8 +5497,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4546,16 +5513,16 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+       CFLAGS="-pg $CFLAGS"
+       CXXFLAGS="-pg $CXXFLAGS"
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -4570,16 +5537,15 @@
+             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4606,24 +5572,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4632,8 +5610,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4646,27 +5626,26 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4691,24 +5670,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4717,8 +5708,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CFLAGS="$save_CFLAGS"
+   ac_ext=c
+@@ -4731,13 +5724,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -4745,16 +5738,15 @@
+           ;;
+         esac
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
++echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
+ kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4781,24 +5773,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4807,8 +5811,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4821,28 +5827,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-Wundef $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4869,24 +5874,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4895,8 +5912,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4909,28 +5928,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-Wno-long-long $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4957,24 +5975,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4983,8 +6013,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -4997,13 +6029,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -5015,13 +6047,13 @@
+     CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
+   fi
+ 
+-  # Check whether --enable-pch or --disable-pch was given.
++  # Check whether --enable-pch was given.
+ if test "${enable_pch+set}" = set; then
+-  enableval="$enable_pch"
+-   kde_use_pch=$enableval
++  enableval=$enable_pch;  kde_use_pch=$enableval
+ else
+    kde_use_pch=no
+-fi;
++fi
++
+ 
+   HAVE_GCC_VISIBILITY=0
+ 
+@@ -5029,16 +6061,15 @@
+   if test "$GXX" = "yes"; then
+     gcc_no_reorder_blocks=NO
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
+ kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5065,24 +6096,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5091,8 +6134,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5105,13 +6150,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  gcc_no_reorder_blocks=YES
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -5123,16 +6168,15 @@
+           CFLAGS="$CFLAGS -fno-reorder-blocks"
+     fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5159,24 +6203,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5185,8 +6241,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5199,28 +6257,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
+ kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5247,24 +6304,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5273,8 +6342,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5287,28 +6358,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-check-new"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
+ kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5335,24 +6405,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5361,8 +6443,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5375,28 +6459,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-common"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5423,24 +6506,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5449,8 +6544,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5463,13 +6560,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_EXCEPTIONS="-fexceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+  USE_EXCEPTIONS=
+ fi
+@@ -5477,37 +6574,37 @@
+     ENABLE_PERMISSIVE_FLAG="-fpermissive"
+ 
+     if test "$kde_use_pch" = "yes"; then
+-        echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
+         echo >conftest.h
+         if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
+             kde_gcc_supports_pch=yes
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         else
+             kde_gcc_supports_pch=no
+-            echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++            { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         fi
+         if test "$kde_gcc_supports_pch" = "yes"; then
+-            echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
+             if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
+                 kde_gcc_supports_pch=yes
+-                echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++                { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             else
+                 kde_gcc_supports_pch=no
+-                echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++                { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+             fi
+         fi
+         rm -f conftest.h conftest.h.gch
+     fi
+ 
+ 
+-  echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
+-echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
++echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
+ if test "${kde_cv_opt_noinline_match+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5539,24 +6636,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5565,18 +6674,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_opt_noinline_match=no
++	kde_cv_opt_noinline_match=no
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+     CFLAGS="$ac_cflags_save"
+   fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+-echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
++echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
+ 
+     if test "x$kde_cv_opt_noinline_match" = "xno" ; then
+        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+@@ -5596,16 +6706,15 @@
+ 
+     if test "$kde_use_pch" = "yes"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
+-echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
++echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
+ kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5632,24 +6741,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5658,8 +6779,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5672,29 +6795,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --pch"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+                                               fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5721,24 +6843,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5747,8 +6881,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5761,28 +6897,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5809,24 +6944,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5835,8 +6982,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5849,28 +6998,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5897,24 +7045,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5923,8 +7083,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -5937,28 +7099,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5985,24 +7146,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6011,8 +7184,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6025,28 +7200,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
+-echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
++echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
+ kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6073,24 +7247,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6099,8 +7285,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6113,13 +7301,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --one_per"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -6226,13 +7414,13 @@
+ fi
+ 
+ 
+-  ac_ext=cc
++  ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6262,8 +7450,13 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -6288,9 +7481,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6300,8 +7494,13 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -6328,6 +7527,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6345,8 +7545,8 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:$LINENO: result: $CXXCPP" >&5
+-echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+ do
+@@ -6369,8 +7569,13 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -6395,9 +7600,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6407,8 +7613,13 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -6435,6 +7646,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6461,16 +7673,15 @@
+      NOOPT_CFLAGS=-O0
+   fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
+-echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
++echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
+ kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6497,24 +7708,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6523,8 +7746,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6537,22 +7762,21 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  NOOPT_CXXFLAGS=-O0
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-  # Check whether --enable-coverage or --disable-coverage was given.
++  # Check whether --enable-coverage was given.
+ if test "${enable_coverage+set}" = set; then
+-  enableval="$enable_coverage"
+-
++  enableval=$enable_coverage;
+       if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
+         ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
+         ac_coverage_linker="-lgcc"
+@@ -6568,36 +7792,36 @@
+       CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
+       LDFLAGS="$LDFLAGS $ac_coverage_linker"
+ 
+-fi;
++fi
++
+ 
+ 
+ 
+ 
+ 
+ 
+-  # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
++  # Check whether --enable-new_ldflags was given.
+ if test "${enable_new_ldflags+set}" = set; then
+-  enableval="$enable_new_ldflags"
+-  kde_use_new_ldflags=$enableval
++  enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval
+ else
+   kde_use_new_ldflags=no
+-fi;
++fi
++
+ 
+   LDFLAGS_AS_NEEDED=""
+   LDFLAGS_NEW_DTAGS=""
+   if test "x$kde_use_new_ldflags" = "xyes"; then
+        LDFLAGS_NEW_DTAGS=""
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6624,24 +7848,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6650,8 +7886,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6664,29 +7902,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6713,24 +7950,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6739,8 +7988,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6753,13 +8004,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  LDFLAGS_AS_NEEDED="-Wl,--as-needed"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -6769,13 +8020,13 @@
+ 
+ 
+ 
+-  # Check whether --enable-final or --disable-final was given.
++  # Check whether --enable-final was given.
+ if test "${enable_final+set}" = set; then
+-  enableval="$enable_final"
+-  kde_use_final=$enableval
++  enableval=$enable_final; kde_use_final=$enableval
+ else
+   kde_use_final=no
+-fi;
++fi
++
+ 
+   if test "x$kde_use_final" = "xyes"; then
+       KDE_USE_FINAL_TRUE=""
+@@ -6788,13 +8039,13 @@
+ 
+ 
+ 
+-  # Check whether --enable-closure or --disable-closure was given.
++  # Check whether --enable-closure was given.
+ if test "${enable_closure+set}" = set; then
+-  enableval="$enable_closure"
+-  kde_use_closure=$enableval
++  enableval=$enable_closure; kde_use_closure=$enableval
+ else
+   kde_use_closure=no
+-fi;
++fi
++
+ 
+   KDE_NO_UNDEFINED=""
+   if test "x$kde_use_closure" = "xyes"; then
+@@ -6808,16 +8059,15 @@
+        case $host in
+          *-*-linux-gnu)
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6844,24 +8094,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6870,8 +8132,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6884,20 +8148,19 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6924,24 +8187,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6950,8 +8225,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -6964,20 +8241,20 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+  KDE_NO_UNDEFINED=""
+ fi
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+  KDE_NO_UNDEFINED=""
+ fi
+@@ -6990,13 +8267,13 @@
+ 
+ 
+ 
+-  # Check whether --enable-nmcheck or --disable-nmcheck was given.
++  # Check whether --enable-nmcheck was given.
+ if test "${enable_nmcheck+set}" = set; then
+-  enableval="$enable_nmcheck"
+-  kde_use_nmcheck=$enableval
++  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
+   kde_use_nmcheck=no
+-fi;
++fi
++
+ 
+   if test "$kde_use_nmcheck" = "yes"; then
+       KDE_USE_NMCHECK_TRUE=""
+@@ -7011,10 +8288,9 @@
+ 
+ 
+ 
+-# Check whether --enable-shared or --disable-shared was given.
++# Check whether --enable-shared was given.
+ if test "${enable_shared+set}" = set; then
+-  enableval="$enable_shared"
+-  p=${PACKAGE-default}
++  enableval=$enable_shared; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_shared=yes ;;
+     no) enable_shared=no ;;
+@@ -7033,12 +8309,12 @@
+     esac
+ else
+   enable_shared=yes
+-fi;
++fi
++
+ 
+-# Check whether --enable-static or --disable-static was given.
++# Check whether --enable-static was given.
+ if test "${enable_static+set}" = set; then
+-  enableval="$enable_static"
+-  p=${PACKAGE-default}
++  enableval=$enable_static; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+     no) enable_static=no ;;
+@@ -7057,18 +8333,19 @@
+     esac
+ else
+   enable_static=no
+-fi;
++fi
++
+ 
+ 
+ 
+ 
+-    # Check whether --enable-libsuffix or --disable-libsuffix was given.
++    # Check whether --enable-libsuffix was given.
+ if test "${enable_libsuffix+set}" = set; then
+-  enableval="$enable_libsuffix"
+-  kdelibsuff=$enableval
++  enableval=$enable_libsuffix; kdelibsuff=$enableval
+ else
+   kdelibsuff="auto"
+-fi;
++fi
++
+ 
+     if test "$kdelibsuff" = "auto"; then
+ 
+@@ -7089,8 +8366,8 @@
+        kdelibsuff=
+     fi
+     if test -z "$kdelibsuff"; then
+-        echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
+-echo "${ECHO_T}not using lib directory suffix" >&6
++        { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
++echo "${ECHO_T}not using lib directory suffix" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define KDELIBSUFF ""
+@@ -7106,14 +8383,13 @@
+ #define KDELIBSUFF "${kdelibsuff}"
+ _ACEOF
+ 
+-        echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
+-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
++        { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
++echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
+     fi
+ 
+-# Check whether --enable-fast-install or --disable-fast-install was given.
++# Check whether --enable-fast-install was given.
+ if test "${enable_fast_install+set}" = set; then
+-  enableval="$enable_fast_install"
+-  p=${PACKAGE-default}
++  enableval=$enable_fast_install; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_fast_install=yes ;;
+     no) enable_fast_install=no ;;
+@@ -7132,10 +8408,11 @@
+     esac
+ else
+   enable_fast_install=yes
+-fi;
++fi
++
+ 
+-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+ if test "${lt_cv_path_SED+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7159,7 +8436,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3887,7 +12043,225 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7281,7 +7308,7 @@
+@@ -7188,37 +8465,184 @@
+ fi
+ 
+ SED=$lt_cv_path_SED
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
++{ echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
++
++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
++if test "${ac_cv_path_GREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_path_GREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in grep ggrep; do
++  for ac_exec_ext in '' $ac_executable_extensions; do
++    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++    # Check for GNU ac_path_GREP and select it if it is found.
++  # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++  ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    echo 'GREP' >> "conftest.nl"
++    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    ac_count=`expr $ac_count + 1`
++    if test $ac_count -gt ${ac_path_GREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_GREP="$ac_path_GREP"
++      ac_path_GREP_max=$ac_count
++    fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++    $ac_path_GREP_found && break 3
++  done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++else
++  ac_cv_path_GREP=$GREP
++fi
++
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
++
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
++{ echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++   then ac_cv_path_EGREP="$GREP -E"
++   else
++     # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
++  ac_path_EGREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in egrep; do
++  for ac_exec_ext in '' $ac_executable_extensions; do
++    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++    # Check for GNU ac_path_EGREP and select it if it is found.
++  # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++  ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    echo 'EGREP' >> "conftest.nl"
++    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    ac_count=`expr $ac_count + 1`
++    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_EGREP="$ac_path_EGREP"
++      ac_path_EGREP_max=$ac_count
+     fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++    $ac_path_EGREP_found && break 3
++  done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++else
++  ac_cv_path_EGREP=$EGREP
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
++
++
++   fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
+ 
+ 
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
++# Check whether --with-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+   with_gnu_ld=no
+-fi;
++fi
++
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -7247,11 +8671,11 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7264,7 +8688,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -3896,7 +12270,27 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7315,7 +7342,7 @@
+@@ -7284,21 +8708,21 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++  { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -3905,7 +12299,33 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7345,6 +7372,15 @@
+@@ -7308,29 +8732,38 @@
+   ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ 
+-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_reload_flag+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   lt_cv_ld_reload_flag='-r'
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3919,9 +12339,14 @@
 +    ;;
 +esac
  
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7355,36 +7391,43 @@
+-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+ if test "${lt_cv_path_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7338,56 +8771,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -3989,7 +12414,37 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
-@@ -7431,44 +7474,36 @@
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ NM="$lt_cv_path_NM"
+ 
+-echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
++  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+ 
+-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7414,44 +8854,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -4044,7 +12499,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7484,7 +7519,7 @@
+@@ -7467,7 +8899,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -4053,7 +12508,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7500,43 +7535,27 @@
+@@ -7483,43 +8915,27 @@
    esac
    ;;
  
@@ -4110,7 +12565,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
-@@ -7555,32 +7574,22 @@
+@@ -7538,32 +8954,22 @@
    ;;
  
  openbsd*)
@@ -4146,7 +12601,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7601,10 +7610,13 @@
+@@ -7584,17 +8990,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -4161,7 +12616,16 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -7620,6 +7632,9 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -7603,14 +9012,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -4171,16 +12635,27 @@
  # Allow CC to be a program name with arguments.
  compiler=$CC
  
-@@ -7654,7 +7669,7 @@
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
++  enableval=$enable_libtool_lock;
++fi
+ 
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ # Some flags need to be propagated to the compiler or linker for good
+@@ -7637,7 +9049,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7657 "configure"' > conftest.$ac_ext
-+  echo '#line 7672 "configure"' > conftest.$ac_ext
+-  echo '#line 7640 "configure"' > conftest.$ac_ext
++  echo '#line 9052 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7697,14 +7712,13 @@
+@@ -7680,14 +9092,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -4197,7 +12672,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7716,7 +7730,6 @@
+@@ -7699,7 +9110,6 @@
        esac
        ;;
      *64-bit*)
@@ -4205,7 +12680,85 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7811,6 +7824,26 @@
+@@ -7724,8 +9134,8 @@
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7751,24 +9161,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -7777,9 +9199,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-lt_cv_cc_needs_belf=no
++	lt_cv_cc_needs_belf=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7788,13 +9211,33 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -4232,39 +12785,522 @@
  
  esac
  
-@@ -8203,6 +8236,243 @@
+@@ -7802,8 +9245,8 @@
  
- done
  
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7827,24 +9270,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -7853,9 +9308,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_stdc=no
++	ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7911,6 +9367,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -7930,18 +9387,27 @@
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -7954,12 +9420,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
 +
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -7982,9 +9450,9 @@
+ 		  inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -7998,24 +9466,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -8024,12 +9504,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Header=no"
++	eval "$as_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -8044,18 +9526,19 @@
+ for ac_header in dlfcn.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8066,24 +9549,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -8092,15 +9587,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8109,8 +9605,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -8134,9 +9635,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -8160,25 +9662,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -8190,12790 +9686,12907 @@
+ 
+ done
+ 
+-ac_ext=f
+-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_F77+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$F77"; then
+-  ac_cv_prog_F77="$F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+ 
+-fi
+-fi
+-F77=$ac_cv_prog_F77
+-if test -n "$F77"; then
+-  echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+ 
+-    test -n "$F77" && break
+-  done
+-fi
+-if test -z "$F77"; then
+-  ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cc
++  ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 +if test -z "$CXXCPP"; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$ac_ct_F77"; then
+-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
 +      # Double quotes because CXXCPP needs to be expanded
 +    for CXXCPP in "$CXX -E" "/lib/cpp"
 +    do
 +      ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
-+do
+ do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_F77="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_F77=$ac_cv_prog_ac_ct_F77
+-if test -n "$ac_ct_F77"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  test -n "$ac_ct_F77" && break
+-done
+-
+-  F77=$ac_ct_F77
+-fi
+-
+-
+-# Provide some information about the compiler.
+-echo "$as_me:8285:" \
+-     "checking for Fortran 77 compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-rm -f a.out
+-
+-# If we don't use `.F' as extension, the preprocessor is not run on the
+-# input file.  (Note that this only needs to work for GNU compilers.)
+-ac_save_ext=$ac_ext
+-ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
+-      program main
+-#ifndef __GNUC__
+-       choke me
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -4274,16 +13310,41 @@
 +# include <limits.h>
 +#else
 +# include <assert.h>
-+#endif
+ #endif
+-
+-      end
 +		     Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 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
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 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); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_compiler_gnu=yes
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -4296,32 +13357,78 @@
 +fi
 +if test -z "$ac_cpp_err"; then
 +  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
 +  # Broken: fails on valid input.
 +continue
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+ 
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+-ac_ext=$ac_save_ext
+-ac_test_FFLAGS=${FFLAGS+set}
+-ac_save_FFLAGS=$FFLAGS
+-FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_f77_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  FFLAGS=-g
+-cat >conftest.$ac_ext <<_ACEOF
+-      program main
 +rm -f conftest.err conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether non-existent headers
+ 
+-      end
++  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 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
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_prog_f77_g=yes
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -4335,14 +13442,16 @@
 +if test -z "$ac_cpp_err"; then
 +  # Broken: success on invalid input.
 +continue
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_f77_g=no
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -4350,18 +13459,31 @@
 +rm -f conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then
 +  break
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +    done
 +    ac_cv_prog_CXXCPP=$CXXCPP
-+
-+fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+-if test "$ac_test_FFLAGS" = set; then
+-  FFLAGS=$ac_save_FFLAGS
+-elif test $ac_cv_prog_f77_g = yes; then
+-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+-    FFLAGS="-g -O2"
+-  else
+-    FFLAGS="-g"
+-  fi
 +  CXXCPP=$ac_cv_prog_CXXCPP
-+else
+ else
+-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+-    FFLAGS="-O2"
 +  ac_cv_prog_CXXCPP=$CXXCPP
 +fi
-+echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
 +ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
 +do
@@ -4384,8 +13506,13 @@
 +#endif
 +		     Syntax error
 +_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
@@ -4395,24 +13522,90 @@
 +  if test -s conftest.err; then
 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
+   else
+-    FFLAGS=
 +    ac_cpp_err=
-+  fi
+   fi
 +else
 +  ac_cpp_err=yes
-+fi
+ fi
+-
+-G77=`test $ac_compiler_gnu = yes && echo yes`
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-
+-# find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if test -z "$ac_cpp_err"; then
 +  :
-+else
+ else
+-    i=0
+-  testring="ABCD"
+-
+-  case $build_os in
+-  msdosdjgpp*)
+-    # On DJGPP, this test can blow up pretty badly due to problems in libc
+-    # (any single argument exceeding 2000 bytes causes a buffer overrun
+-    # during glob expansion).  Even if it were fixed, the result of this
+-    # check would be larger than it should be.
+-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+-    ;;
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-  gnu*)
+-    # Under GNU Hurd, this test is not required because there is
+-    # no limit to the length of command line arguments.
+-    # Libtool will interpret -1 as no limit whatsoever
+-    lt_cv_sys_max_cmd_len=-1;
+-    ;;
 +  # Broken: fails on valid input.
 +continue
 +fi
+ 
+-  cygwin* | mingw*)
+-    # On Win9x/ME, this test blows up -- it succeeds, but takes
+-    # about 5 minutes as the teststring grows exponentially.
+-    # Worse, since 9x/ME are not pre-emptively multitasking,
+-    # you end up with a "frozen" computer, even though with patience
+-    # the test eventually succeeds (with a max line length of 256k).
+-    # Instead, let's just punt: use the minimum linelength reported by
+-    # all of the supported platforms: 8192 (on NT/2K/XP).
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
 +rm -f conftest.err conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether non-existent headers
+ 
+- *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      testring=$testring$testring
+-    done
+-    testring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+-    ;;
+-  esac
++  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -4422,8 +13615,13 @@
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
@@ -4445,11 +13643,15 @@
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
-+fi
+ fi
+ 
+-if test -n $lt_cv_sys_max_cmd_len ; then
+-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -4457,54 +13659,686 @@
 +rm -f conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then
 +  :
-+else
+ else
+-  echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
 +  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 +See \`config.log' for more details." >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
-+
-+ac_ext=cc
+ fi
+ 
++ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
+ 
 +fi
-+
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8295,7 +8565,7 @@
  
+-
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
  
- # Provide some information about the compiler.
--echo "$as_me:8298:" \
-+echo "$as_me:8568:" \
-      "checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8448,7 +8718,7 @@
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+-
+-# Character class describing NM global symbol codes.
+-symcode='[BCDEGRST]'
+-
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+-
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
++  { echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+ 
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[BCDT]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[ABCDGISTW]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  if test "$host_cpu" = ia64; then
+-    symcode='[ABCDEGRST]'
++    test -n "$F77" && break
++  done
++fi
++if test -z "$F77"; then
++  ac_ct_F77=$F77
++  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F77"; then
++  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_F77="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
+   fi
+-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[BCDEGRST]'
+-  ;;
+-osf*)
+-  symcode='[BCDEGQRST]'
+-  ;;
+-solaris* | sysv5*)
+-  symcode='[BDT]'
+-  ;;
+-sysv4)
+-  symcode='[DFNSTU]'
+-  ;;
+-esac
+-
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $build_os in
+-mingw*)
+-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+-  ;;
+-esac
++done
++done
++IFS=$as_save_IFS
+ 
+-# If we're using GNU nm, then use its standard symbol codes.
+-case `$NM -V 2>&1` in
+-*GNU* | *'with BFD'*)
+-  symcode='[ABCDGISTW]' ;;
+-esac
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+ 
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
+ 
+-  # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  test -n "$ac_ct_F77" && break
++done
+ 
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
++  if test "x$ac_ct_F77" = x; then
++    F77=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    F77=$ac_ct_F77
++  fi
++fi
+ 
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
+ 
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
++# Provide some information about the compiler.
++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (ac_try="$ac_compiler --version >&5"
++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_compiler --version >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-    # Now try to grab the symbols.
+-    nlist=conftest.nm
+-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
++  (exit $ac_status); }
++{ (ac_try="$ac_compiler -v >&5"
++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_compiler -v >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s "$nlist"; then
+-      # Try sorting and uniquifying the output.
+-      if sort "$nlist" | uniq > "$nlist"T; then
+-	mv -f "$nlist"T "$nlist"
+-      else
+-	rm -f "$nlist"T
+-      fi
+-
+-      # Make sure that we snagged all the symbols we need.
+-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+-	  cat <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++  (exit $ac_status); }
++{ (ac_try="$ac_compiler -V >&5"
++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_compiler -V >&5") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++rm -f a.out
+ 
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr_t void *
+-#else
+-# define lt_ptr_t char *
+-# define const
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.  (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
+ #endif
+ 
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr_t address;
+-}
+-lt_preloaded_symbols[] =
+-{
+-EOF
+-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr_t) 0}
+-};
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  lt_save_LIBS="$LIBS"
+-	  lt_save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++      end
++_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 -s conftest${ac_exeext}; then
+-	    pipe_works=yes
+-	  fi
+-	  LIBS="$lt_save_LIBS"
+-	  CFLAGS="$lt_save_CFLAGS"
+-	else
+-	  echo "cannot find nm_test_func in $nlist" >&5
+-	fi
+-      else
+-	echo "cannot find nm_test_var in $nlist" >&5
+-      fi
+-    else
+-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+-    fi
+-  else
+-    echo "$progname: failed program was:" >&5
+-    cat conftest.$ac_ext >&5
+-  fi
+-  rm -f conftest* conftst*
+-
+-  # Do not use the global_symbol_pipe unless it works.
+-  if test "$pipe_works" = yes; then
+-    break
+-  else
+-    lt_cv_sys_global_symbol_pipe=
+-  fi
+-done
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++	ac_compiler_gnu=no
+ fi
+ 
+-if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-  lt_cv_sys_global_symbol_to_cdecl=
+-fi
+-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+-  echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
+-else
+-  echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6
+-fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+ 
+-echo "$as_me:$LINENO: checking for objdir" >&5
+-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
+-if test "${lt_cv_objdir+set}" = set; then
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
++if test "${ac_cv_prog_f77_g+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-     i=0
--  testring="ABCD"
+-  rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+-  lt_cv_objdir=.libs
+-else
+-  # MS-DOS does not allow filenames that begin with a dot.
+-  lt_cv_objdir=_libs
+-fi
+-rmdir .libs 2>/dev/null
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-echo "${ECHO_T}$lt_cv_objdir" >&6
+-objdir=$lt_cv_objdir
+-
+-
+-
+-
++  FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
+ 
+-case $host_os in
+-aix3*)
+-  # AIX sometimes has problems with the GCC collect2 program.  For some
+-  # reason, if we set the COLLECT_NAMES environment variable, the problems
+-  # vanish in a puff of smoke.
+-  if test "X${COLLECT_NAMES+set}" != Xset; then
+-    COLLECT_NAMES=
+-    export COLLECT_NAMES
+-  fi
+-  ;;
++      end
++_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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_f77_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
+-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++	ac_cv_prog_f77_g=no
++fi
+ 
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
++if test "$ac_test_FFLAGS" = set; then
++  FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-g -O2"
++  else
++    FFLAGS="-g"
++  fi
++else
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-O2"
++  else
++    FFLAGS=
++  fi
++fi
+ 
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
++G77=`test $ac_compiler_gnu = yes && echo yes`
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-# Constants:
+-rm="rm -f"
+ 
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_AR+set}" = set; then
++# 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; }
++if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$AR"; then
+-  ac_cv_prog_AR="$AR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++    i=0
 +  teststring="ABCD"
  
-   case $build_os in
-   msdosdjgpp*)
-@@ -8477,20 +8747,70 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
+-fi
+-fi
+-AR=$ac_cv_prog_AR
+-if test -n "$AR"; then
+-  echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
  
-- *)
+-fi
+-if test -z "$ac_cv_prog_AR"; then
+-  ac_ct_AR=$AR
+-  # Extract the first word of "ar", so it can be a program name with args.
+-set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_AR"; then
+-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_AR="ar"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
+ 
+-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+-fi
+-fi
+-ac_ct_AR=$ac_cv_prog_ac_ct_AR
+-if test -n "$ac_ct_AR"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
+ 
+-  AR=$ac_ct_AR
+-else
+-  AR="$ac_cv_prog_AR"
+-fi
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
-+
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
 +  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 +    # This has been around since 386BSD, at least.  Likely further.
 +    if test -x /sbin/sysctl; then
@@ -4518,12 +14352,48 @@
 +    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 +    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
 +    ;;
-+
+ 
+-fi
+-fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+-  echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
 +  interix*)
 +    # We know the value 262144 and hardcode it with a safety zone (like BSD)
 +    lt_cv_sys_max_cmd_len=196608
 +    ;;
-+
+ 
+-fi
+-if test -z "$ac_cv_prog_RANLIB"; then
+-  ac_ct_RANLIB=$RANLIB
+-  # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_RANLIB"; then
+-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
 +  osf*)
 +    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
 +    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -4549,42 +14419,309 @@
 +    fi
 +    ;;
 +  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
--	       = "XX$testring") >/dev/null 2>&1 &&
--	    new_result=`expr "X$testring" : ".*" 2>&1` &&
++    # If test is not a shell built-in, we'll probably end up computing a
++    # maximum length that is only half of the actual maximum length, but
++    # we can't tell.
 +    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 +    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
- 	    lt_cv_sys_max_cmd_len=$new_result &&
- 	    test $i != 17 # 1/2 MB should be enough
-     do
-       i=`expr $i + 1`
--      testring=$testring$testring
++	    lt_cv_sys_max_cmd_len=$new_result &&
++	    test $i != 17 # 1/2 MB should be enough
++    do
++      i=`expr $i + 1`
 +      teststring=$teststring$teststring
-     done
--    testring=
++    done
 +    teststring=
-     # Add a significant safety factor because C++ compilers can tack on massive
-     # amounts of additional arguments before passing them to the linker.
-     # It appears as though 1/2 is a usable value.
-@@ -8527,9 +8847,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++    # Add a significant safety factor because C++ compilers can tack on massive
++    # amounts of additional arguments before passing them to the linker.
++    # It appears as though 1/2 is a usable value.
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    ;;
++  esac
  
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+-fi
+-fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+ fi
+ 
+-  RANLIB=$ac_ct_RANLIB
++if test -n $lt_cv_sys_max_cmd_len ; then
++  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ else
+-  RANLIB="$ac_cv_prog_RANLIB"
++  { echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6; }
+ fi
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_STRIP+set}" = set; then
++
++
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
 -
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+-  ac_ct_STRIP=$STRIP
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_STRIP="strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  STRIP=$ac_ct_STRIP
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
  
-@@ -8551,14 +8868,30 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+ 
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
+ 
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$LTCC" && LTCC=$CC
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$SED" && SED=sed
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+ 
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+ 
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $MAGIC_CMD in
+-[\\/*] |  ?:[\\/]*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[BCDT]'
    ;;
+-*)
+-  lt_save_MAGIC_CMD="$MAGIC_CMD"
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+-  for ac_dir in $ac_dummy; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/${ac_tool_prefix}file; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    $EGREP "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool at gnu.org
+-
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-  MAGIC_CMD="$lt_save_MAGIC_CMD"
++cygwin* | mingw* | pw32*)
++  symcode='[ABCDGISTW]'
+   ;;
+-esac
+-fi
+-
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+-  if test -n "$ac_tool_prefix"; then
+-    echo "$as_me:$LINENO: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $MAGIC_CMD in
+-[\\/*] |  ?:[\\/]*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDEGRST]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
+-*)
+-  lt_save_MAGIC_CMD="$MAGIC_CMD"
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+-  for ac_dir in $ac_dummy; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/file; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    $EGREP "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool at gnu.org
+-
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-  MAGIC_CMD="$lt_save_MAGIC_CMD"
 +linux* | k*bsd*-gnu)
 +  if test "$host_cpu" = ia64; then
 +    symcode='[ABCDGIRSTW]'
@@ -4592,14 +14729,12 @@
 +    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 +  fi
 +  ;;
- irix* | nonstopux*)
-   symcode='[BCDEGRST]'
-   ;;
- osf*)
-   symcode='[BCDEGQRST]'
-   ;;
--solaris* | sysv5*)
--  symcode='[BDT]'
++irix* | nonstopux*)
++  symcode='[BCDEGRST]'
++  ;;
++osf*)
++  symcode='[BCDEGQRST]'
++  ;;
 +solaris*)
 +  symcode='[BDRT]'
 +  ;;
@@ -4611,113 +14746,192 @@
 +  ;;
 +sysv5* | sco5v6* | unixware* | OpenUNIX*)
 +  symcode='[ABDT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
    ;;
- sysv4)
-   symcode='[DFNSTU]'
-@@ -8576,14 +8909,17 @@
- # If we're using GNU nm, then use its standard symbol codes.
- case `$NM -V 2>&1` in
- *GNU* | *'with BFD'*)
--  symcode='[ABCDGISTW]' ;;
-+  symcode='[ABCDGIRSTW]' ;;
  esac
+-fi
+-
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  else
+-    MAGIC_CMD=:
+-  fi
+-fi
  
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
+-  fi
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+   ;;
+ esac
  
+-enable_dlopen=yes
+-enable_win32_dll=no
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[ABCDGIRSTW]' ;;
++esac
+ 
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
+ 
+-fi;
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 +  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
 +  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-   # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+ 
++  # Write the raw and C identifiers.
 +  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -8745,7 +9081,7 @@
+-# Check whether --with-pic or --without-pic was given.
+-if test "${with_pic+set}" = set; then
+-  withval="$with_pic"
+-  pic_mode="$withval"
+-else
+-  pic_mode=default
+-fi;
+-test -z "$pic_mode" && pic_mode=default
++  # Check to see that the pipe works correctly.
++  pipe_works=no
  
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+-# Use C for the default configuration in the libtool script
+-tagname=
+-lt_save_CC="$CC"
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-# Source file extension for C test sources.
+-ac_ext=c
+-
+-# Object file extension for compiled C test sources.
+-objext=o
+-objext=$objext
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
  
- # Same as above, but do not quote variable references.
-@@ -8765,7 +9101,7 @@
- default_ofile=libtool
- can_build_shared=yes
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
++  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
  
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -9022,6 +9358,7 @@
- test -z "$AS" && AS=as
- test -z "$CC" && CC=cc
- test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
- test -z "$DLLTOOL" && DLLTOOL=dlltool
- test -z "$LD" && LD=ld
- test -z "$LN_S" && LN_S="ln -s"
-@@ -9041,15 +9378,26 @@
- if test -n "$RANLIB"; then
-   case $host_os in
-   openbsd*)
--    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-     ;;
-   *)
--    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-     ;;
-   esac
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
  
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -9075,7 +9423,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9137,7 +9485,7 @@
-       if test -n "$file_magic_test_file"; then
- 	case $deplibs_check_method in
- 	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- 	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9232,68 +9580,25 @@
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
  
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
  
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
  
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
++	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
+ 
 -#
 -# Check for any special shared library compilation flags.
 -#
@@ -4733,14 +14947,20 @@
 -  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
 -echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
 -  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
--  else
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
+   else
 -    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
 -echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
 -    lt_cv_prog_cc_can_build_shared=no
--  fi
++    lt_cv_sys_global_symbol_pipe=
+   fi
 -fi
--
--
++done
+ 
++fi
+ 
 -#
 -# Check to make sure the static flag actually works.
 -#
@@ -4748,7 +14968,13 @@
 -echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
 -if test "${lt_prog_compiler_static_works+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+ else
 -  lt_prog_compiler_static_works=no
 -   save_LDFLAGS="$LDFLAGS"
 -   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
@@ -4766,16 +14992,1293 @@
 -   $rm conftest*
 -   LDFLAGS="$save_LDFLAGS"
 -
--fi
++  { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
+ fi
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
--
+ 
 -if test x"$lt_prog_compiler_static_works" = xyes; then
 -    :
++{ echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
++if test "${lt_cv_objdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-    lt_prog_compiler_static=
++  rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
+ fi
++rmdir .libs 2>/dev/null
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6; }
++objdir=$lt_cv_objdir
+ 
+ 
+ 
+ 
+-lt_prog_compiler_no_builtin_flag=
+-
+-if test "$GCC" = yes; then
+-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+-
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
--    lt_prog_compiler_static=
+-  lt_cv_prog_compiler_rtti_exceptions=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="-fno-rtti -fno-exceptions"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9313: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
+-   echo "$as_me:9317: \$? = $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
+-     if test ! -s conftest.err; then
+-       lt_cv_prog_compiler_rtti_exceptions=yes
+-     fi
+-   fi
+-   $rm conftest*
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
+ 
 -fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e 1s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+ 
+-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+-else
+-    :
+-fi
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+ 
+-fi
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+-lt_prog_compiler_wl=
+-lt_prog_compiler_pic=
+-lt_prog_compiler_static=
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++# Constants:
++rm="rm -f"
+ 
+-  if test "$GCC" = yes; then
+-    lt_prog_compiler_wl='-Wl,'
+-    lt_prog_compiler_static='-static'
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
+ 
+-    case $host_os in
+-      aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static='-Bstatic'
+-      fi
+-      ;;
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+-      ;;
 -
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic='-DDLL_EXPORT'
+-      ;;
+-
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_prog_compiler_pic='-fno-common'
+-      ;;
+-
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      lt_prog_compiler_can_build_shared=no
+-      enable_shared=no
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic=-Kconform_pic
+-      fi
+-      ;;
+-
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case "$host_cpu" in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	lt_prog_compiler_pic='-fPIC'
+-	;;
+-      esac
+-      ;;
+-
+-    *)
+-      lt_prog_compiler_pic='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      lt_prog_compiler_wl='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static='-Bstatic'
+-      else
+-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
+-
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic='-DDLL_EXPORT'
+-      ;;
+-
+-    hpux9* | hpux10* | hpux11*)
+-      lt_prog_compiler_wl='-Wl,'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case "$host_cpu" in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	lt_prog_compiler_pic='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      lt_prog_compiler_static='${wl}-a ${wl}archive'
+-      ;;
+-
+-    irix5* | irix6* | nonstopux*)
+-      lt_prog_compiler_wl='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      lt_prog_compiler_static='-non_shared'
+-      ;;
+-
+-    newsos6)
+-      lt_prog_compiler_pic='-KPIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+-
+-    linux*)
+-      case $CC in
+-      icc* | ecc*)
+-	lt_prog_compiler_wl='-Wl,'
+-	lt_prog_compiler_pic='-KPIC'
+-	lt_prog_compiler_static='-static'
+-        ;;
+-      ccc*)
+-        lt_prog_compiler_wl='-Wl,'
+-        # All Alpha code is PIC.
+-        lt_prog_compiler_static='-non_shared'
+-        ;;
+-      esac
+-      ;;
+-
+-    osf3* | osf4* | osf5*)
+-      lt_prog_compiler_wl='-Wl,'
+-      # All OSF/1 code is PIC.
+-      lt_prog_compiler_static='-non_shared'
+-      ;;
+-
+-    sco3.2v5*)
+-      lt_prog_compiler_pic='-Kpic'
+-      lt_prog_compiler_static='-dn'
+-      ;;
+-
+-    solaris*)
+-      lt_prog_compiler_wl='-Wl,'
+-      lt_prog_compiler_pic='-KPIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+-
+-    sunos4*)
+-      lt_prog_compiler_wl='-Qoption ld '
+-      lt_prog_compiler_pic='-PIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+-
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      lt_prog_compiler_wl='-Wl,'
+-      lt_prog_compiler_pic='-KPIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	lt_prog_compiler_pic='-Kconform_pic'
+-	lt_prog_compiler_static='-Bstatic'
+-      fi
+-      ;;
+-
+-    uts4*)
+-      lt_prog_compiler_pic='-pic'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+-
+-    *)
+-      lt_prog_compiler_can_build_shared=no
+-      ;;
+-    esac
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
+   fi
++done
++done
++IFS=$as_save_IFS
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+ 
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$lt_prog_compiler_pic"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works+set}" = set; then
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_pic_works=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9546: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
+-   echo "$as_me:9550: \$? = $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
+-     if test ! -s conftest.err; then
+-       lt_prog_compiler_pic_works=yes
+-     fi
+-   fi
+-   $rm conftest*
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_AR="ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
+-
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
+-    case $lt_prog_compiler_pic in
+-     "" | " "*) ;;
+-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+-     esac
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6; }
+ else
+-    lt_prog_compiler_pic=
+-     lt_prog_compiler_can_build_shared=no
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-fi
+-case "$host_os" in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    lt_prog_compiler_pic=
+-    ;;
+-  *)
+-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+-    ;;
++  if test "x$ac_ct_AR" = x; then
++    AR="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
+ esac
++    AR=$ac_ct_AR
++  fi
++else
++  AR="$ac_cv_prog_AR"
++fi
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_cv_prog_compiler_c_o=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9613: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
+-   echo "$as_me:9617: \$? = $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
+-     # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
+-       lt_cv_prog_compiler_c_o=yes
+-     fi
+-   fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+ 
+ 
+-hard_links="nottested"
+-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
+-  if test "$hard_links" = no; then
+-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+-    need_locks=warn
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
+   fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ else
+-  need_locks=no
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    RANLIB=$ac_ct_RANLIB
++  fi
++else
++  RANLIB="$ac_cv_prog_RANLIB"
++fi
+ 
+-  runpath_var=
+-  allow_undefined_flag=
+-  enable_shared_with_static_runtimes=no
+-  archive_cmds=
+-  archive_expsym_cmds=
+-  old_archive_From_new_cmds=
+-  old_archive_from_expsyms_cmds=
+-  export_dynamic_flag_spec=
+-  whole_archive_flag_spec=
+-  thread_safe_flag_spec=
+-  hardcode_libdir_flag_spec=
+-  hardcode_libdir_flag_spec_ld=
+-  hardcode_libdir_separator=
+-  hardcode_direct=no
+-  hardcode_minus_L=no
+-  hardcode_shlibpath_var=unsupported
+-  link_all_deplibs=unknown
+-  hardcode_automatic=no
+-  module_cmds=
+-  module_expsym_cmds=
+-  always_export_symbols=no
+-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  include_expsyms=
+-  # exclude_expsyms can be an extended regexp of symbols to exclude
+-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-  # as well as any symbol that contains `d'.
+-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-  # platforms (ab)use it in PIC code, but their linkers get confused if
+-  # the symbol is explicitly referenced.  Since portable code cannot
+-  # rely on this symbol name, it's probably fine to never include it in
+-  # preloaded symbol tables.
+-  extract_expsyms_cmds=
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    if test "$GCC" != yes; then
+-      with_gnu_ld=no
+-    fi
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+ 
+-  ld_shlibs=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
+ 
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	ld_shlibs=no
+-	cat <<EOF 1>&2
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+ 
+-EOF
+-      fi
+-      ;;
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
+ 
+-    amigaos*)
+-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      hardcode_minus_L=yes
+ 
+-      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      ld_shlibs=no
+-      ;;
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+ 
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	allow_undefined_flag=unsupported
+-	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-      else
+-	ld_shlibs=no
+-      fi
+-      ;;
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
+ 
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      allow_undefined_flag=no
+-      always_export_symbols=no
+-      enable_shared_with_static_runtimes=yes
+-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+ 
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	  cp $export_symbols $output_objdir/$soname.def;
+-	else
+-	  echo EXPORTS > $output_objdir/$soname.def;
+-	  cat $export_symbols >> $output_objdir/$soname.def;
+-	fi~
+-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+-      else
+-	ld_shlibs=no
+-      fi
+-      ;;
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+-    solaris* | sysv5*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	ld_shlibs=no
+-	cat <<EOF 1>&2
+ 
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool at gnu.org
+ 
+ EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs=no
++	  fi ;;
++	esac
+       fi
+-      ;;
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
+ 
+-    sunos4*)
+-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
+-      ;;
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+ 
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs=no
+-      fi
+-      ;;
+-    esac
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    { echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6; }
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
+ 
+-    if test "$ld_shlibs" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec=
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool at gnu.org
++
++EOF
++	  fi ;;
++	esac
+       fi
++      break
+     fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
+   else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      allow_undefined_flag=unsupported
+-      always_export_symbols=yes
+-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-      # Note: this linker hardcodes the directories in LIBPATH if there
+-      # are no directories specified by -L.
+-      hardcode_minus_L=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	hardcode_direct=unsupported
+-      fi
+-      ;;
++    MAGIC_CMD=:
++  fi
++fi
+ 
+-    aix4* | aix5*)
+-      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.
+-	aix_use_runtimelinking=no
+-	exp_sym_flag='-Bexport'
+-	no_entry_flag=""
+-      else
+-	# If we're using GNU nm, then we don't want the "-C" option.
+-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	fi
++  fi
++  ;;
++esac
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+-	exp_sym_flag='-bexport'
+-	no_entry_flag='-bnoentry'
+-      fi
++enable_dlopen=yes
++enable_win32_dll=no
+ 
+-      # When large executables or shared objects are built, AIX ld can
+-      # have problems creating the table of contents.  If linking a library
+-      # or program results in "error TOC overflow" add -mminimal-toc to
+-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++# Check whether --enable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval=$enable_libtool_lock;
++fi
+ 
+-      archive_cmds=''
+-      hardcode_direct=yes
+-      hardcode_libdir_separator=':'
+-      link_all_deplibs=yes
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-      if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
+-	# We only want to do this on AIX 4.2 and lower, the check
+-	# below for broken collect2 doesn't work under 4.3+
+-	  collect2name=`${CC} -print-prog-name=collect2`
+-	  if test -f "$collect2name" && \
+-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	  then
+-  	  # We have reworked collect2
+-  	  hardcode_direct=yes
+-	  else
+-  	  # We have old collect2
+-  	  hardcode_direct=unsupported
+-  	  # It fails to find uninstalled libraries when the uninstalled
+-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-  	  # to unsupported forces relinking
+-  	  hardcode_minus_L=yes
+-  	  hardcode_libdir_flag_spec='-L$libdir'
+-  	  hardcode_libdir_separator=
+-	  fi
+-	esac
+-	shared_flag='-shared'
+-      else
+-	# not using gcc
+-	if test "$host_cpu" = ia64; then
+-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-  	# chokes on -Wl,-G. The following line is correct:
+-	  shared_flag='-G'
+-	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
+-	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
+-	fi
+-      fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols=no
+-      if test "$aix_use_runtimelinking" = yes; then
+-	# Warning - without using the other runtime loading flags (-brtl),
+-	# -berok will link without error, but may produce a broken library.
+-	allow_undefined_flag='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# Check whether --with-pic was given.
++if test "${with_pic+set}" = set; then
++  withval=$with_pic; pic_mode="$withval"
++else
++  pic_mode=default
++fi
+ 
+-int
+-main ()
+-{
++test -z "$pic_mode" && pic_mode=default
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++# Use C for the default configuration in the libtool script
++tagname=
++lt_save_CC="$CC"
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++# Source file extension for C test sources.
++ac_ext=c
+ 
+-	hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+-	  allow_undefined_flag="-z nodefs"
+-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# Object file extension for compiled C test sources.
++objext=o
++objext=$objext
+ 
+-int
+-main ()
+-{
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}\n'
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
@@ -4788,60 +16291,321 @@
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
- 
- 
- ## CAVEAT EMPTOR:
-@@ -9322,18 +9627,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++
++lt_prog_compiler_no_builtin_flag=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
++
++
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
 +   -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:9328: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9633: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9332: \$? = $ac_status" >&5
-+   echo "$as_me:9637: \$? = $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
--     if test ! -s conftest.err; then
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:11215: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:11219: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -9394,6 +9701,11 @@
-       lt_prog_compiler_pic='-fno-common'
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ 
+-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	  # Warning - without using the other run time loading flags,
+-	  # -berok will link without error, but may produce a broken library.
+-	  no_undefined_flag=' ${wl}-bernotok'
+-	  allow_undefined_flag=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols=yes
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec=' '
+-	  archive_cmds_need_lc=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
++else
++    :
++fi
++
++fi
++
++lt_prog_compiler_wl=
++lt_prog_compiler_pic=
++lt_prog_compiler_static=
++
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
++
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl='-Wl,'
++    lt_prog_compiler_static='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
+       fi
        ;;
  
+     amigaos*)
+-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      hardcode_minus_L=yes
+-      # see comment about different semantics on the GNU ld section
+-      ld_shlibs=no
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    bsdi4*)
+-      export_dynamic_flag_spec=-rdynamic
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
+       ;;
+ 
+-    cygwin* | mingw* | pw32*)
+-      # When not using gcc, we currently assume that we are using
+-      # Microsoft Visual C++.
+-      # hardcode_libdir_flag_spec is actually meaningless, as there is
+-      # no search path for DLLs.
+-      hardcode_libdir_flag_spec=' '
+-      allow_undefined_flag=no
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      old_archive_From_new_cmds='true'
+-      # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+-      enable_shared_with_static_runtimes=yes
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.012)
+-	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
+-      esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      hardcode_direct=no
+-      hardcode_automatic=yes
+-      hardcode_shlibpath_var=unsupported
+-      whole_archive_flag_spec='-all_load $convenience'
+-      link_all_deplibs=yes
+-    else
+-      ld_shlibs=no
+-    fi
+-      ;;
+-
+-    dgux*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      hardcode_shlibpath_var=no
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
+       ;;
+ 
+-    freebsd1*)
+-      ld_shlibs=no
 +    interix3*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+
-     msdosdjgpp*)
-       # Just because we use GCC doesn't mean we suddenly get shared libraries
-       # on systems that don't support them.
-@@ -9410,7 +9722,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
+       ;;
+ 
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
+-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      hardcode_libdir_flag_spec='-R$libdir'
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared=no
++      enable_shared=no
+       ;;
+ 
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes
+-      hardcode_minus_L=yes
+-      hardcode_shlibpath_var=no
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic=-Kconform_pic
++      fi
+       ;;
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+-      hardcode_libdir_flag_spec='-R$libdir'
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
 +      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -9436,6 +9748,16 @@
- 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='-fPIC'
++	;;
++      esac
+       ;;
+ 
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      fi
+-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-      hardcode_libdir_separator=:
+-      hardcode_direct=yes
+-
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      hardcode_minus_L=yes
+-      export_dynamic_flag_spec='${wl}-E'
++    *)
++      lt_prog_compiler_pic='-fPIC'
+       ;;
+-
+-    hpux10* | hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-	  ;;
+-	*)
+-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
+-	  ;;
+-	esac
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
+       else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	*)
+-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	esac
++	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
-       ;;
+-      if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_flag_spec_ld='+b $libdir'
+-	  hardcode_libdir_separator=:
+-	  hardcode_direct=no
+-	  hardcode_shlibpath_var=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec='-L$libdir'
+-	  hardcode_direct=no
+-	  hardcode_shlibpath_var=no
++      ;;
 +      darwin*)
 +        # PIC is the default on this platform
 +        # Common symbols not allowed in MH_DYLIB files
@@ -4853,30 +16617,85 @@
 +       esac
 +       ;;
  
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -9447,7 +9769,7 @@
-       lt_prog_compiler_wl='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L=yes
+-	  ;;
+-	*)
+-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator=:
+-	  hardcode_direct=yes
+-	  export_dynamic_flag_spec='${wl}-E'
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L=yes
+-	  ;;
+-	esac
+-      fi
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
 +      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -9470,13 +9792,20 @@
-       lt_prog_compiler_static='-Bstatic'
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static='${wl}-a ${wl}archive'
        ;;
  
--    linux*)
--      case $CC in
+     irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
+-      fi
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator=:
+-      link_all_deplibs=yes
++      lt_prog_compiler_wl='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      hardcode_libdir_flag_spec='-R$libdir'
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
++    newsos6)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
+       ;;
+ 
+-    newsos6)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator=:
+-      hardcode_shlibpath_var=no
 +    linux* | k*bsd*-gnu)
 +      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl='-Wl,'
- 	lt_prog_compiler_pic='-KPIC'
- 	lt_prog_compiler_static='-static'
-         ;;
++      icc* | ecc*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-KPIC'
++	lt_prog_compiler_static='-static'
++        ;;
 +      pgcc* | pgf77* | pgf90* | pgf95*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -4884,22 +16703,48 @@
 +	lt_prog_compiler_pic='-fpic'
 +	lt_prog_compiler_static='-Bstatic'
 +        ;;
-       ccc*)
-         lt_prog_compiler_wl='-Wl,'
-         # All Alpha code is PIC.
-@@ -9491,15 +9820,15 @@
-       lt_prog_compiler_static='-non_shared'
++      ccc*)
++        lt_prog_compiler_wl='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static='-non_shared'
++        ;;
++      esac
        ;;
  
--    sco3.2v5*)
--      lt_prog_compiler_pic='-Kpic'
--      lt_prog_compiler_static='-dn'
--      ;;
--
-     solaris*)
--      lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-Bstatic'
+-    openbsd*)
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+-    os2*)
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      hardcode_minus_L=yes
+-      allow_undefined_flag=unsupported
+-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++    solaris*)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
 +      case $cc_basename in
 +      f77* | f90* | f95*)
 +	lt_prog_compiler_wl='-Qoption ld ';;
@@ -4908,79 +16753,267 @@
 +      esac
        ;;
  
-     sunos4*)
-@@ -9508,7 +9837,7 @@
-       lt_prog_compiler_static='-Bstatic'
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	allow_undefined_flag=' -expect_unresolved \*'
+-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator=:
++    sunos4*)
++      lt_prog_compiler_wl='-Qoption ld '
++      lt_prog_compiler_pic='-PIC'
++      lt_prog_compiler_static='-Bstatic'
        ;;
  
--    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-      else
+-	allow_undefined_flag=' -expect_unresolved \*'
+-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
 +    sysv4 | sysv4.2uw2* | sysv4.3*)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-Bstatic'
-@@ -9521,6 +9850,17 @@
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
+-	# Both c and cxx compiler support -rpath directly
+-	hardcode_libdir_flag_spec='-rpath $libdir'
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic='-Kconform_pic'
++	lt_prog_compiler_static='-Bstatic'
        fi
+-      hardcode_libdir_separator=:
        ;;
  
+-    sco3.2v5*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var=no
+-      export_dynamic_flag_spec='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      lt_prog_compiler_wl='-Wl,'
 +      lt_prog_compiler_pic='-KPIC'
 +      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
+       ;;
+ 
+-    solaris*)
+-      no_undefined_flag=' -z text'
+-      if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+-      else
+-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      fi
+-      hardcode_libdir_flag_spec='-R$libdir'
+-      hardcode_shlibpath_var=no
+-      case $host_os in
+-      solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+-      esac
+-      link_all_deplibs=yes
 +    unicos*)
 +      lt_prog_compiler_wl='-Wl,'
 +      lt_prog_compiler_can_build_shared=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic='-pic'
-       lt_prog_compiler_static='-Bstatic'
-@@ -9555,18 +9895,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+       ;;
+ 
+-    sunos4*)
+-      if test "x$host_vendor" = xsequent; then
+-	# Use $CC to link under sequent, because it throws in some extra .o
+-	# files that make .init and .fini sections work.
+-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+-      else
+-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      hardcode_direct=yes
+-      hardcode_minus_L=yes
+-      hardcode_shlibpath_var=no
++    uts4*)
++      lt_prog_compiler_pic='-pic'
++      lt_prog_compiler_static='-Bstatic'
+       ;;
+ 
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  reload_cmds='$CC -r -o $output$reload_objs'
+-	  hardcode_direct=no
+-        ;;
+-	motorola)
+-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var=no
+-      ;;
+-
+-    sysv4.3*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var=no
+-      export_dynamic_flag_spec='-Bexport'
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_shlibpath_var=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	ld_shlibs=yes
+-      fi
+-      ;;
+-
+-    sysv4.2uw2*)
+-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes
+-      hardcode_minus_L=no
+-      hardcode_shlibpath_var=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
++    *)
++      lt_prog_compiler_can_build_shared=no
+       ;;
++    esac
++  fi
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag='${wl}-z ${wl}text'
+-      if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-      else
+-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-      fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var=no
+-      ;;
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+ 
+-    sysv5*)
+-      no_undefined_flag=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      hardcode_libdir_flag_spec=
+-      hardcode_shlibpath_var=no
+-      runpath_var='LD_RUN_PATH'
+-      ;;
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic"; then
+ 
+-    uts4*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      hardcode_shlibpath_var=no
+-      ;;
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_pic_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
 +   -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:9561: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9901: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9565: \$? = $ac_status" >&5
-+   echo "$as_me:9905: \$? = $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
--     if test ! -s conftest.err; then
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:11483: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:11487: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works=yes
-      fi
-    fi
-@@ -9587,7 +9929,7 @@
- fi
++       lt_prog_compiler_pic_works=yes
++     fi
++   fi
++   $rm conftest*
  
+-    *)
+-      ld_shlibs=no
+-      ;;
+-    esac
+-  fi
++fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
+-test "$ld_shlibs" = no && can_build_shared=no
++if test x"$lt_prog_compiler_pic_works" = xyes; then
++    case $lt_prog_compiler_pic in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
++     esac
++else
++    lt_prog_compiler_pic=
++     lt_prog_compiler_can_build_shared=no
++fi
+ 
+-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"
  fi
--case "$host_os" in
 +case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic=
-@@ -9597,6 +9939,48 @@
-     ;;
- esac
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic=
++    ;;
++  *)
++    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
++    ;;
++esac
  
-+#
+ #
+-# Do we need to explicitly link libc?
 +# Check to make sure the static flag actually works.
-+#
+ #
+-case "x$archive_cmds_need_lc" in
+-x|xyes)
+-  # Assume -lc should be added
+-  archive_cmds_need_lc=yes
 +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
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
@@ -5005,76 +17038,263 @@
 +   fi
 +   $rm conftest*
 +   LDFLAGS="$save_LDFLAGS"
-+
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $archive_cmds in
+-    *'~'*)
+-      # FIXME: we may have to deal with multi-command sequences.
+-      ;;
+-    '$CC '*)
+-      # Test whether the compiler implicitly links with -lc since on some
+-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-      # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-+
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+ 
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$lt_prog_compiler_wl
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$allow_undefined_flag
+-        allow_undefined_flag=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-        then
+-	  archive_cmds_need_lc=no
+-        else
+-	  archive_cmds_need_lc=yes
+-        fi
+-        allow_undefined_flag=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc" >&6
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
 +if test x"$lt_prog_compiler_static_works" = xyes; then
 +    :
 +else
 +    lt_prog_compiler_static=
 +fi
-+
-+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -9609,38 +9993,36 @@
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
--   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--   # that will create temporary files in the current directory regardless of
--   # the output directory.  Thus, making CWD read-only will cause this test
--   # to fail, enabling locking or at least warning the user not to do parallel
--   # builds.
--   chmod -w .
--
-    lt_compiler_flag="-o out/conftest2.$ac_objext"
-    # Insert the option either (1) after the last *FLAGS variable, or
-    # (2) before a word containing "conftest.", or (3) at the end.
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext=".so"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
+ 
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
 +   -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:9628: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10005: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9632: \$? = $ac_status" >&5
-+   echo "$as_me:10009: \$? = $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
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:11587: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:11591: \$? = $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
++     # So say no if there are warnings
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 +     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 +     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o=yes
-      fi
-    fi
--   chmod u+w .
--   $rm conftest* out/*
--   rmdir out
++       lt_cv_prog_compiler_c_o=yes
++     fi
++   fi
 +   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
 +   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
 +   $rm out/* && rmdir out
-    cd ..
-    rmdir conftest
-    $rm conftest*
-@@ -9711,6 +10093,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
++   cd ..
++   rmdir conftest
++   $rm conftest*
+ 
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
+-    case $host_os in
+-      aix4 | aix4.[01] | aix4.[01].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	:
+-      else
+-	can_build_shared=no
+-      fi
+-      ;;
+-    esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-    fi
+-    shlibpath_var=LIBPATH
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
+   fi
+-  ;;
++else
++  need_locks=no
++fi
+ 
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+-  ;;
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
++  runpath_var=
++  allow_undefined_flag=
++  enable_shared_with_static_runtimes=no
++  archive_cmds=
++  archive_expsym_cmds=
++  old_archive_From_new_cmds=
++  old_archive_from_expsyms_cmds=
++  export_dynamic_flag_spec=
++  whole_archive_flag_spec=
++  thread_safe_flag_spec=
++  hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec_ld=
++  hardcode_libdir_separator=
++  hardcode_direct=no
++  hardcode_minus_L=no
++  hardcode_shlibpath_var=unsupported
++  link_all_deplibs=unknown
++  hardcode_automatic=no
++  module_cmds=
++  module_expsym_cmds=
++  always_export_symbols=no
++  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
 +  # Just being paranoid about ensuring that cc_basename is set.
 +  for cc_temp in $compiler""; do
 +  case $cc_temp in
@@ -5086,23 +17306,60 @@
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -9721,6 +10113,10 @@
-       with_gnu_ld=no
-     fi
-     ;;
+-bsdi4*)
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
+-  ;;
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
 +  interix*)
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-@@ -9731,6 +10127,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
  
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
+-  shrext=".dll"
+-  need_version=no
+-  need_lib_prefix=no
++  ld_shlibs=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
@@ -5123,47 +17380,105 @@
 +      *\ 2.11.*) ;; # other 2.11 versions
 +      *) supports_anon_versioning=yes ;;
 +    esac
+ 
++    # See if GNU ld supports shared libraries.
+     case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
 +
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -9768,7 +10185,7 @@
- 	allow_undefined_flag=unsupported
- 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- 	# support --undefined.  This deserves some investigation.  FIXME
--	archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
+       ;;
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++
++      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag=unsupported
++	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
 +	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
        else
- 	ld_shlibs=no
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++	ld_shlibs=no
        fi
-@@ -9778,13 +10195,13 @@
-       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-       # as there is no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
--      allow_undefined_flag=no
+       ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
 +      allow_undefined_flag=unsupported
-       always_export_symbols=no
-       enable_shared_with_static_runtimes=yes
--      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      always_export_symbols=no
++      enable_shared_with_static_runtimes=yes
 +      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--        archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 +        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- 	# If the export-symbols file already is a .def file (1st line
- 	# is EXPORTS), use it as is; otherwise, prepend...
- 	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9793,23 +10210,70 @@
- 	  echo EXPORTS > $output_objdir/$soname.def;
- 	  cat $export_symbols >> $output_objdir/$soname.def;
- 	fi~
--	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +      else
 +	ld_shlibs=no
 +      fi
-+      ;;
-+
+       ;;
+-    esac
+-    ;;
+ 
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
 +    interix3*)
 +      hardcode_direct=no
 +      hardcode_shlibpath_var=no
@@ -5178,7 +17493,25 @@
 +      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
-+
+ 
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+-  soname_spec='${libname}${release}${major}$shared_ext'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
 +    linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -5198,7 +17531,15 @@
 +	  tmp_addflag=' -nofor_main' ;;
 +	esac
 +	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
+ 
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
 +	if test $supports_anon_versioning = yes; then
 +	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
 +  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
@@ -5206,48 +17547,144 @@
 +	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +	fi
 +	link_all_deplibs=no
-       else
- 	ld_shlibs=no
-       fi
-       ;;
++      else
++	ld_shlibs=no
++      fi
++      ;;
  
--    netbsd*)
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
 +    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-       else
--	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       fi
-       ;;
++      fi
++      ;;
  
--    solaris* | sysv5*)
+-kfreebsd*-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
 +    solaris*)
-       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- 	ld_shlibs=no
- 	cat <<EOF 1>&2
-@@ -9823,13 +10287,40 @@
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
  
- EOF
-       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
+-      ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	ld_shlibs=no
-       fi
++      else
++	ld_shlibs=no
++      fi
        ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  freebsd3.01* | freebsdelf3.01*)
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  *) # from 3.2 on
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
  
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
 +	ld_shlibs=no
 +	cat <<_LT_EOF 1>&2
-+
+ 
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  case "$host_cpu" in
+-  ia64*)
+-    shrext='.so'
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+-    else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+-    fi
+-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-    ;;
+-   hppa*64*)
+-     shrext='.sl'
+-     hardcode_into_libs=yes
+-     dynamic_linker="$host_os dld.sl"
+-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-     soname_spec='${libname}${release}${shared_ext}$major'
+-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-     ;;
+-   *)
+-    shrext='.sl'
+-    dynamic_linker="$host_os dld.sl"
+-    shlibpath_var=SHLIB_PATH
+-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    ;;
+-  esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
@@ -5269,56 +17706,149 @@
 +      esac
 +      ;;
 +
-     sunos4*)
-       archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-       wlarc=
-@@ -9839,24 +10330,19 @@
++    sunos4*)
++      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
  
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
      *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
+-    ;;
+-  *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	ld_shlibs=no
-       fi
-       ;;
++      else
++	ld_shlibs=no
++      fi
++      ;;
      esac
+-    ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-  hardcode_into_libs=yes
+-  ;;
+-
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
+-  ;;
  
--    if test "$ld_shlibs" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec=
--      fi
+-# This must be Linux ELF.
+-linux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
 +    if test "$ld_shlibs" = no; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec=
 +      export_dynamic_flag_spec=
 +      whole_archive_flag_spec=
      fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9868,7 +10354,7 @@
-       # Note: this linker hardcodes the directories in LIBPATH if there
-       # are no directories specified by -L.
-       hardcode_minus_L=yes
--      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag=unsupported
++      always_export_symbols=yes
++      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L=yes
 +      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- 	# Neither direct hardcoding nor static linking is supported with a
- 	# broken collect2.
- 	hardcode_direct=unsupported
-@@ -9890,9 +10376,21 @@
- 	else
- 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- 	fi
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct=unsupported
++      fi
++      ;;
+ 
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
+-  ;;
++    aix4* | aix5*)
++      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.
 +	aix_use_runtimelinking=no
-+
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
+ 
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
 +	# 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.
@@ -5332,130 +17862,535 @@
 +	  ;;
 +	esac
  
--	# KDE requires run time linking.  Make it the default.
--	aix_use_runtimelinking=yes
- 	exp_sym_flag='-bexport'
- 	no_entry_flag='-bnoentry'
-       fi
-@@ -9909,7 +10407,7 @@
-       link_all_deplibs=yes
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
+-
+-nto-qnx*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
+-
+-openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
+-
+-os2*)
+-  libname_spec='$name'
+-  shrext=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
+-
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
  
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
++      archive_cmds=''
++      hardcode_direct=yes
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
+-  esac
+-  ;;
++      if test "$GCC" = yes; then
 +	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9928,8 +10426,12 @@
-   	  hardcode_libdir_flag_spec='-L$libdir'
-   	  hardcode_libdir_separator=
- 	  fi
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L=yes
++  	  hardcode_libdir_flag_spec='-L$libdir'
++  	  hardcode_libdir_separator=
++	  fi
 +	  ;;
- 	esac
- 	shared_flag='-shared'
++	esac
++	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
 +	  shared_flag="$shared_flag "'${wl}-G'
 +	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -9937,22 +10439,23 @@
-   	# chokes on -Wl,-G. The following line is correct:
- 	  shared_flag='-G'
- 	else
--  	if test "$aix_use_runtimelinking" = yes; then
--	    shared_flag='-qmkshrobj ${wl}-G'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
 +	  if test "$aix_use_runtimelinking" = yes; then
 +	    shared_flag='${wl}-G'
- 	  else
--	    shared_flag='-qmkshrobj'
--  	fi
++	  else
 +	    shared_flag='${wl}-bM:SRE'
 +	  fi
- 	fi
-       fi
++	fi
++      fi
  
--      # Let the compiler handle the export list.
--      always_export_symbols=no
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols=yes
-       if test "$aix_use_runtimelinking" = yes; then
- 	# Warning - without using the other runtime loading flags (-brtl),
- 	# -berok will link without error, but may produce a broken library.
- 	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an empty executable.
--	cat >conftest.$ac_ext <<_ACEOF
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
 +       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++int
++main ()
++{
+ 
+-*)
+-  dynamic_linker=no
+-  ;;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
+-test "$dynamic_linker" = no && can_build_shared=no
+-
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-hardcode_action=
+-if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var " || \
+-   test "X$hardcode_automatic"="Xyes" ; then
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+ 
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+-     test "$hardcode_minus_L" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action=immediate
+-  fi
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
+ else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action=unsupported
+-fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ 
+-if test "$hardcode_action" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+ fi
+ 
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-       ;;
+-   *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-    ;;
+-  esac
+-fi
+-
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
+-
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
+-
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
+-
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
+-
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag="-z nodefs"
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10003,14 +10506,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_dl_dlopen=yes
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
--	hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
--	archive_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
--	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
- 	if test "$host_cpu" = ia64; then
- 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
- 	  allow_undefined_flag="-z nodefs"
--	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- 	else
- 	 # Determine the default libpath from the value encoded in an empty executable.
- 	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10069,13 +10571,11 @@
- 	  # -berok will link without error, but may produce a broken library.
- 	  no_undefined_flag=' ${wl}-bernotok'
- 	  allow_undefined_flag=' ${wl}-berok'
--	  # -bexpall does not export symbols beginning with underscore (_)
--	  always_export_symbols=yes
- 	  # Exported symbols can be pulled into shared objects from archives
--	  whole_archive_flag_spec=' '
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
++	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag=' ${wl}-bernotok'
++	  allow_undefined_flag=' ${wl}-berok'
++	  # Exported symbols can be pulled into shared objects from archives
 +	  whole_archive_flag_spec='$convenience'
- 	  archive_cmds_need_lc=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
--	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  archive_cmds_need_lc=yes
 +	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-       ;;
-@@ -10088,7 +10588,7 @@
-       ld_shlibs=no
-       ;;
++	fi
++      fi
++      ;;
  
--    bsdi4*)
+-fi
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs=no
++      ;;
+ 
+-   ;;
 +    bsdi[45]*)
-       export_dynamic_flag_spec=-rdynamic
-       ;;
++      export_dynamic_flag_spec=-rdynamic
++      ;;
  
-@@ -10098,13 +10598,13 @@
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
-       hardcode_libdir_flag_spec=' '
--      allow_undefined_flag=no
+-  *)
+-    echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+-if test "${ac_cv_func_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec=' '
 +      allow_undefined_flag=unsupported
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
--      shrext=".dll"
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
 +      shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
--      archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # FIXME: Setting linknames here is a bad hack.
 +      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-       # The linker will automatically build a .lib file if we build a DLL.
-       old_archive_From_new_cmds='true'
-       # FIXME: Should let the user specify the lib program.
-@@ -10114,52 +10614,52 @@
-       ;;
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes=yes
++      ;;
  
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++    darwin* | rhapsody*)
 +      case $host_os in
 +        rhapsody* | darwin1.[012])
 +         allow_undefined_flag='${wl}-undefined ${wl}suppress'
@@ -5475,50 +18410,12 @@
 +         fi
 +         ;;
 +      esac
-       archive_cmds_need_lc=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag='-Wl,-undefined -Wl,suppress'
--	;;
--      *) # Darwin 1.3 on
--	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--	else
--	  case ${MACOSX_DEPLOYMENT_TARGET} in
--	    10.012)
--	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--	      ;;
--	    10.*)
--	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
--	      ;;
--	  esac
--	fi
--	;;
--      esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       hardcode_direct=no
-       hardcode_automatic=yes
-       hardcode_shlibpath_var=unsupported
--      whole_archive_flag_spec='-all_load $convenience'
++      archive_cmds_need_lc=no
++      hardcode_direct=no
++      hardcode_automatic=yes
++      hardcode_shlibpath_var=unsupported
 +      whole_archive_flag_spec=''
-       link_all_deplibs=yes
++      link_all_deplibs=yes
 +    if test "$GCC" = yes ; then
 +    	output_verbose_link_cmd='echo'
 +        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
@@ -5526,8 +18423,7 @@
 +      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 +      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs=no
++    else
 +      case $cc_basename in
 +        xlc*)
 +         output_verbose_link_cmd='echo'
@@ -5541,39 +18437,222 @@
 +         ld_shlibs=no
 +          ;;
 +      esac
-     fi
-       ;;
++    fi
++      ;;
  
-@@ -10193,8 +10693,8 @@
-       ;;
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++    dgux*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
  
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
--      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+-#undef shl_load
++    freebsd1*)
++      ld_shlibs=no
++      ;;
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+-choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
+-int
+-main ()
+-{
+-return f != shl_load;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
+-ac_cv_func_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-if test $ac_cv_func_shl_load = yes; then
+-  lt_cv_dlopen="shl_load"
+-else
+-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 +    freebsd* | dragonfly*)
 +      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-       hardcode_shlibpath_var=no
-@@ -10202,7 +10702,7 @@
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
  
-     hpux9*)
-       if test "$GCC" = yes; then
--	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char shl_load ();
+-int
+-main ()
+-{
+-shl_load ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dld_shl_load=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dld_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+-if test "${ac_cv_func_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
++    hpux9*)
++      if test "$GCC" = yes; then
 +	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       else
- 	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       fi
-@@ -10216,47 +10716,62 @@
-       export_dynamic_flag_spec='${wl}-E'
-       ;;
++      else
++	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_direct=yes
  
--    hpux10* | hpux11*)
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L=yes
++      export_dynamic_flag_spec='${wl}-E'
++      ;;
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
 +    hpux10*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 +	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -5581,16 +18660,70 @@
 +      if test "$with_gnu_ld" = no; then
 +	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_separator=:
-+
+ 
+-#undef dlopen
 +	hardcode_direct=yes
 +	export_dynamic_flag_spec='${wl}-E'
-+
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+-choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
 +	# hardcode_minus_L: Not really in the search PATH,
 +	# but as the default location of the library.
 +	hardcode_minus_L=yes
 +      fi
 +      ;;
-+
+ 
+-int
+-main ()
+-{
+-return f != dlopen;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +    hpux11*)
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 +	case $host_cpu in
@@ -5599,160 +18732,361 @@
 +	  ;;
 +	ia64*)
 +	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  ;;
++	*)
 +	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      else
 +	case $host_cpu in
 +	hppa*64*)
 +	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
 +	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
 +	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*)
--	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
 +	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_separator=:
-+
+ 
+-ac_cv_func_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-if test $ac_cv_func_dlopen = yes; then
+-  lt_cv_dlopen="dlopen"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 +	case $host_cpu in
 +	hppa*64*|ia64*)
- 	  hardcode_libdir_flag_spec_ld='+b $libdir'
--	  hardcode_libdir_separator=:
--	  hardcode_direct=no
--	  hardcode_shlibpath_var=no
--	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec='-L$libdir'
- 	  hardcode_direct=no
- 	  hardcode_shlibpath_var=no
--
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  hardcode_minus_L=yes
- 	  ;;
- 	*)
--	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--	  hardcode_libdir_separator=:
- 	  hardcode_direct=yes
- 	  export_dynamic_flag_spec='${wl}-E'
++	  hardcode_libdir_flag_spec_ld='+b $libdir'
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++	  ;;
++	*)
++	  hardcode_direct=yes
++	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10270,7 +10785,7 @@
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	esac
++      fi
++      ;;
  
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
--	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10280,7 +10795,7 @@
-       link_all_deplibs=yes
-       ;;
++      else
++	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      link_all_deplibs=yes
++      ;;
  
--    netbsd*)
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_svld_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -10303,7 +10818,8 @@
-       hardcode_direct=yes
-       hardcode_shlibpath_var=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
+-ac_cv_lib_svld_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-if test $ac_cv_lib_svld_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
+-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dld_link ();
+-int
+-main ()
+-{
+-dld_link ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dld_dld_link=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++    newsos6)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_shlibpath_var=no
++      ;;
+ 
+-ac_cv_lib_dld_dld_link=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+-if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
++    openbsd*)
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec='${wl}-E'
-       else
-@@ -10313,7 +10829,7 @@
- 	   hardcode_libdir_flag_spec='-R$libdir'
- 	   ;;
- 	 *)
--	   archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec='-R$libdir'
++	   ;;
++	 *)
 +	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- 	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- 	   ;;
-        esac
-@@ -10324,14 +10840,14 @@
-       hardcode_libdir_flag_spec='-L$libdir'
-       hardcode_minus_L=yes
-       allow_undefined_flag=unsupported
--      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
+ 
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      allow_undefined_flag=unsupported
 +      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-       old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
++      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
  
-     osf3*)
-       if test "$GCC" = yes; then
- 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-fi
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
 +	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	allow_undefined_flag=' -expect_unresolved \*'
- 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10343,13 +10859,13 @@
-     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
- 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
+ 
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
 +	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-       else
- 	allow_undefined_flag=' -expect_unresolved \*'
- 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
 +	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
  
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10357,21 +10873,15 @@
-       hardcode_libdir_separator=:
-       ;;
+-fi
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      hardcode_libdir_separator=:
++      ;;
  
--    sco3.2v5*)
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var=no
--      export_dynamic_flag_spec='${wl}-Bexport'
--      runpath_var=LD_RUN_PATH
--      hardcode_runpath_var=yes
--      ;;
--
-     solaris*)
-       no_undefined_flag=' -z text'
-       if test "$GCC" = yes; then
--	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++    solaris*)
++      no_undefined_flag=' -z text'
++      if test "$GCC" = yes; then
 +	wlarc='${wl}'
 +	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
++      else
 +	wlarc=''
- 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10380,8 +10890,18 @@
-       hardcode_shlibpath_var=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_shlibpath_var=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
 +      *)
 + 	# The compiler driver will combine linker options so we
 + 	# cannot just pass the convience library names through
@@ -5765,58 +19099,87 @@
 + 	*)
 + 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
 + 	esac ;;
-       esac
-       link_all_deplibs=yes
-       ;;
-@@ -10390,7 +10910,7 @@
-       if test "x$host_vendor" = xsequent; then
- 	# Use $CC to link under sequent, because it throws in some extra .o
- 	# files that make .init and .fini sections work.
--	archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++      esac
++      link_all_deplibs=yes
++      ;;
+ 
+-fi
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
 +	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
- 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-       fi
-@@ -10438,36 +10958,45 @@
-       fi
-       ;;
++      else
++	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
  
--    sysv4.2uw2*)
--      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct=yes
--      hardcode_minus_L=no
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds='$CC -r -o $output$reload_objs'
++	  hardcode_direct=no
++        ;;
++	motorola)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
+ 
+-fi
++    sysv4.3*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='-Bexport'
++      ;;
+ 
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs=yes
++      fi
++      ;;
+ 
+-fi
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
 +      no_undefined_flag='${wl}-z,text'
 +      archive_cmds_need_lc=no
-       hardcode_shlibpath_var=no
--      hardcode_runpath_var=yes
--      runpath_var=LD_RUN_PATH
--      ;;
++      hardcode_shlibpath_var=no
 +      runpath_var='LD_RUN_PATH'
  
--   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
--      no_undefined_flag='${wl}-z ${wl}text'
-       if test "$GCC" = yes; then
--	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-    ;;
+-  esac
++      if test "$GCC" = yes; then
 +	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
--	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++      else
 +	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       fi
--      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var=no
-       ;;
++      fi
++      ;;
  
--    sysv5*)
--      no_undefined_flag=' -z text'
--      # $CC -shared without GNU ld will not create a library from C++
--      # object files and a static libstdc++, better avoid it by now
--      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
--      hardcode_libdir_flag_spec=
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
 +    sysv5* | sco3.2v5* | sco5v6*)
 +      # Note: We can NOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
@@ -5827,13 +19190,17 @@
 +      no_undefined_flag='${wl}-z,text'
 +      allow_undefined_flag='${wl}-z,nodefs'
 +      archive_cmds_need_lc=no
-       hardcode_shlibpath_var=no
++      hardcode_shlibpath_var=no
 +      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +      hardcode_libdir_separator=':'
 +      link_all_deplibs=yes
 +      export_dynamic_flag_spec='${wl}-Bexport'
-       runpath_var='LD_RUN_PATH'
-+
++      runpath_var='LD_RUN_PATH'
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 +      if test "$GCC" = yes; then
 +	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -5841,43 +19208,203 @@
 +	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
-       ;;
++      ;;
  
-     uts4*)
-@@ -10486,11 +11015,6 @@
- echo "${ECHO_T}$ld_shlibs" >&6
- test "$ld_shlibs" = no && can_build_shared=no
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    uts4*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
  
--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"
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
++    *)
++      ld_shlibs=no
++      ;;
++    esac
++  fi
+ 
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 11736 "configure"
+-#include "confdefs.h"
++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6; }
++test "$ld_shlibs" = no && can_build_shared=no
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc=yes
+ 
+-#include <stdio.h>
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl
++	pic_flag=$lt_prog_compiler_pic
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag
++        allow_undefined_flag=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc=no
++        else
++	  archive_cmds_need_lc=yes
++        fi
++        allow_undefined_flag=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
++      ;;
+     esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
+   fi
 -fi
+-rm -fr conftest*
 -
- #
- # Do we need to explicitly link libc?
- #
-@@ -10523,6 +11047,7 @@
-         libobjs=conftest.$ac_objext
-         deplibs=
-         wl=$lt_prog_compiler_wl
-+	pic_flag=$lt_prog_compiler_pic
-         compiler_flags=-v
-         linker_flags=-v
-         verstring=
-@@ -10558,7 +11083,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++  ;;
++esac
+ 
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
 +shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -10568,7 +11093,20 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
 +if test "$GCC" = yes; then
 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -5889,85 +19416,357 @@
 +  else
 +    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 +  fi
-+else
+ else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 11834 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
++need_lib_prefix=unknown
++hardcode_into_libs=no
  
-@@ -10633,7 +11171,7 @@
- amigaos*)
-   library_names_spec='$libname.ixlibrary $libname.a'
-   # Create ${libname}_ixlibrary.a entries in /sys/libs.
--  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
+ 
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
+     esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
+   fi
+-fi
+-rm -fr conftest*
++  ;;
+ 
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-   ;;
++  ;;
  
- beos*)
-@@ -10642,7 +11180,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-    fi
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
  
--bsdi4*)
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
+-
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
 +bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10658,7 +11196,7 @@
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
  
- cygwin* | mingw* | pw32*)
-   version_type=windows
--  shrext=".dll"
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
+-fi
++cygwin* | mingw* | pw32*)
++  version_type=windows
 +  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
++  need_version=no
++  need_lib_prefix=no
  
-@@ -10670,7 +11208,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -10700,7 +11239,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
+ 
+-# Report which librarie types wil actually be built
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
 +      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -10723,7 +11262,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++      ;;
++    esac
++    ;;
+ 
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+-test "$can_build_shared" = "no" && enable_shared=no
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
+ 
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case "$host_os" in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10746,20 +11285,17 @@
-   dynamic_linker=no
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+   fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
--kfreebsd*-gnu*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
--
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-aix4*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    archive_cmds_need_lc=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
+-      allow_undefined_flag='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.012)
+-	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
+-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    hardcode_direct=no
+-    hardcode_automatic=yes
+-    hardcode_shlibpath_var=unsupported
+-    whole_archive_flag_spec='-all_load $convenience'
+-    link_all_deplibs=yes
+-  else
+-    ld_shlibs=no
+-  fi
+-    ;;
+-esac
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
+ 
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
++freebsd1*)
++  dynamic_linker=no
++  ;;
+ 
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -5978,66 +19777,211 @@
 +    freebsd[123]*) objformat=aout ;;
 +    *) objformat=elf ;;
 +    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -10777,14 +11313,19 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
+   fi
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler \
+-    CC \
+-    LD \
+-    lt_prog_compiler_wl \
+-    lt_prog_compiler_pic \
+-    lt_prog_compiler_static \
+-    lt_prog_compiler_no_builtin_flag \
+-    export_dynamic_flag_spec \
+-    thread_safe_flag_spec \
+-    whole_archive_flag_spec \
+-    enable_shared_with_static_runtimes \
+-    old_archive_cmds \
+-    old_archive_from_new_cmds \
+-    predep_objects \
+-    postdep_objects \
+-    predeps \
+-    postdeps \
+-    compiler_lib_search_path \
+-    archive_cmds \
+-    archive_expsym_cmds \
+-    postinstall_cmds \
+-    postuninstall_cmds \
+-    old_archive_from_expsyms_cmds \
+-    allow_undefined_flag \
+-    no_undefined_flag \
+-    export_symbols_cmds \
+-    hardcode_libdir_flag_spec \
+-    hardcode_libdir_flag_spec_ld \
+-    hardcode_libdir_separator \
+-    hardcode_automatic \
+-    module_cmds \
+-    module_expsym_cmds \
+-    lt_cv_prog_compiler_c_o \
+-    exclude_expsyms \
+-    include_expsyms; do
+-
+-    case $var in
+-    old_archive_cmds | \
+-    old_archive_from_new_cmds | \
+-    archive_cmds | \
+-    archive_expsym_cmds | \
+-    module_cmds | \
+-    module_expsym_cmds | \
+-    old_archive_from_expsyms_cmds | \
+-    export_symbols_cmds | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
+       ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
+       ;;
+-    esac
+-  done
+-
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
 +  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
--  *) # from 3.2 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
 +  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
 +  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
 +  freebsd*) # from 4.6 on
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
-+    ;;
+     ;;
    esac
-   ;;
++  ;;
  
-@@ -10804,9 +11345,9 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
+-cfgfile="${ofile}T"
+-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+-  $rm -f "$cfgfile"
+-  { echo "$as_me:$LINENO: creating $ofile" >&5
+-echo "$as_me: creating $ofile" >&6;}
+-
+-  cat <<__EOF__ >> "$cfgfile"
+-#! $SHELL
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
+ 
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-#
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Libtool:
+-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-# A sed program that does not truncate output.
+-SED=$lt_SED
+-
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
 +  case $host_cpu in
-   ia64*)
--    shrext='.so'
++  ia64*)
 +    shrext_cmds='.so'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.so"
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -10821,7 +11362,7 @@
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-    hppa*64*)
--     shrext='.sl'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
 +     shrext_cmds='.sl'
-      hardcode_into_libs=yes
-      dynamic_linker="$host_os dld.sl"
-      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10832,7 +11373,7 @@
-      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-      ;;
-    *)
--    shrext='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
 +    shrext_cmds='.sl'
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=SHLIB_PATH
-     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10844,6 +11385,18 @@
-   postinstall_cmds='chmod 555 $lib'
-   ;;
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
  
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -6049,51 +19993,89 @@
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
-+
- irix5* | irix6* | nonstopux*)
-   case $host_os in
-     nonstopux*) version_type=nonstopux ;;
-@@ -10887,29 +11440,26 @@
-   ;;
  
- # This must be Linux ELF.
--linux*)
+-# The names of the tagged configurations supported by this script.
+-available_tags=
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
+-# ### BEGIN LIBTOOL CONFIG
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# This must be Linux ELF.
 +linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
--  libsuff=
--  if test "x$LINUX_64_MODE" = x64; then
--    # Some platforms are per default 64-bit, so there's no /lib64
--    if test -d /lib64; then
--      libsuff=64
--    fi
--  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
--  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
--  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
  
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
-+
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-   # powerpc, because MkLinux only supported shared libraries with the
-   # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10919,6 +11469,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
  
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -6105,70 +20087,173 @@
 +  hardcode_into_libs=yes
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -10928,7 +11490,7 @@
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+ 
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -10956,8 +11518,13 @@
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
  
- openbsd*)
-   version_type=sunos
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-# The host system.
+-host_alias=$host_alias
+-host=$host
++openbsd*)
++  version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
-   need_lib_prefix=no
--  need_version=no
++  need_lib_prefix=no
 +  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
 +  case $host_os in
 +    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
 +    *)                         need_version=no  ;;
 +  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -10977,7 +11544,7 @@
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
  
- os2*)
-   libname_spec='$name'
--  shrext=".dll"
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++os2*)
++  libname_spec='$name'
 +  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -10995,13 +11562,6 @@
-   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-   ;;
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
  
--sco3.2v5*)
--  version_type=osf
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
+-# A C compiler.
+-LTCC=$lt_LTCC
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
+-# A language-specific compiler.
+-CC=$lt_compiler
 -
- solaris*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -11027,7 +11587,7 @@
-   need_version=yes
-   ;;
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
  
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-# An ERE matcher.
+-EGREP=$lt_EGREP
 +sysv4 | sysv4.3*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11060,6 +11620,29 @@
-   fi
-   ;;
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
  
+-# The linker used to build libraries.
+-LD=$lt_LD
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -6191,578 +20276,1924 @@
 +  fi
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
-+
- uts4*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11075,12 +11658,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
- test "$dynamic_linker" = no && can_build_shared=no
  
+-# A BSD-compatible nm program.
+-NM=$lt_NM
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-# A symbol stripping program
+-STRIP=$STRIP
++*)
++  dynamic_linker=no
++  ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+ 
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
 +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"
 +fi
-+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
--   test -n "$runpath_var " || \
--   test "X$hardcode_automatic"="Xyes" ; then
+ 
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
 +   test -n "$runpath_var" || \
 +   test "X$hardcode_automatic" = "Xyes" ; then
  
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct" != no &&
-@@ -11723,7 +12311,7 @@
-     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6; }
  
-     save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-# Used on cygwin: assembler.
+-AS="$AS"
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
  
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11739,7 +12327,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11742 "configure"
-+#line 12330 "configure"
- #include "confdefs.h"
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++striplib=
++old_striplib=
++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++       else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++       ;;
++   *)
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++    ;;
++  esac
++fi
  
- #if HAVE_DLFCN_H
-@@ -11796,6 +12384,8 @@
-       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-       /* dlclose (self); */
-     }
-+  else
-+    puts (dlerror ());
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
  
-     exit (status);
- }
-@@ -11805,12 +12395,12 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-     esac
-   else :
-     # compilation failed
-@@ -11825,7 +12415,7 @@
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
  
-     if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-       echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
- echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
- if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -11837,7 +12427,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11840 "configure"
-+#line 12430 "configure"
- #include "confdefs.h"
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
  
- #if HAVE_DLFCN_H
-@@ -11894,6 +12484,8 @@
-       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-       /* dlclose (self); */
-     }
-+  else
-+    puts (dlerror ());
+-# Old archive suffix (normally "a").
+-libext="$libext"
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
  
-     exit (status);
- }
-@@ -11903,12 +12495,12 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
-+    (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-     esac
-   else :
-     # compilation failed
-@@ -11941,7 +12533,7 @@
- fi
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
++  darwin*)
++  # if libdl is installed we need to link against it
++    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
--# Report which librarie types wil actually be built
-+# Report which library types will actually be built
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -11953,7 +12545,7 @@
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic
+-pic_mode=$pic_mode
++	ac_cv_lib_dl_dlopen=no
++fi
  
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -11962,47 +12554,10 @@
-   fi
-   ;;
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
  
--aix4*)
-+aix4* | aix5*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
--  ;;
--  darwin* | rhapsody*)
--  if test "$GCC" = yes; then
--    archive_cmds_need_lc=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag='-Wl,-undefined -Wl,suppress'
--      ;;
--    *) # Darwin 1.3 on
--      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--      else
--	case ${MACOSX_DEPLOYMENT_TARGET} in
--	  10.012)
--	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--	    ;;
--	  10.*)
--	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
--	    ;;
--	esac
--      fi
--      ;;
--    esac
--    output_verbose_link_cmd='echo'
--    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
--    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct=no
--    hardcode_automatic=yes
--    hardcode_shlibpath_var=unsupported
--    whole_archive_flag_spec='-all_load $convenience'
--    link_all_deplibs=yes
--  else
--    ld_shlibs=no
--  fi
-     ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12028,7 +12583,8 @@
-   # Now quote all the things that may contain metacharacters while being
-   # careful not to overquote the AC_SUBSTed values.  We take copies of the
-   # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+    SED SHELL STRIP \
-     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-     deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12142,11 +12698,11 @@
- SED=$lt_SED
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
  
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
++fi
  
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++   ;;
  
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -12176,6 +12732,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
+-# Do we need a version for libraries?
+-need_version=$need_version
++  *)
++    { echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
++if test "${ac_cv_func_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
  
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -12187,6 +12749,9 @@
- # A C compiler.
- LTCC=$lt_LTCC
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+-
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+-
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+-
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+-
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec
+-
+-# Library versioning type.
+-version_type=$version_type
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
  
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-+
- # A language-specific compiler.
- CC=$lt_compiler
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
  
-@@ -12206,7 +12771,7 @@
- NM=$lt_NM
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
++#undef shl_load
  
- # A symbol stripping program
--STRIP=$STRIP
-+STRIP=$lt_STRIP
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_shl_load || defined __stub___shl_load
++choke me
++#endif
  
- # Used to examine libraries when file_magic_cmd begins "file"
- MAGIC_CMD=$MAGIC_CMD
-@@ -12237,7 +12802,7 @@
- libext="$libext"
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++int
++main ()
++{
++return shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++	ac_cv_func_shl_load=no
++fi
  
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -12252,7 +12817,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds
+-archive_expsym_cmds=$lt_archive_expsym_cmds
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shl_load ();
++int
++main ()
++{
++return shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
- # Do we need the lib prefix for modules?
-@@ -12479,7 +13044,10 @@
-   # If there is no Makefile yet, we rely on a make rule to execute
-   # `config.status --recheck' to rerun these tests and create the
-   # libtool script then.
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds
+-module_expsym_cmds=$lt_module_expsym_cmds
++	ac_cv_lib_dld_shl_load=no
++fi
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  { echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
++if test "${ac_cv_func_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps
++#undef dlopen
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_dlopen || defined __stub___dlopen
++choke me
++#endif
+ 
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++	ac_cv_func_dlopen=no
++fi
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++	ac_cv_lib_dl_dlopen=no
++fi
+ 
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++	ac_cv_lib_svld_dlopen=no
++fi
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dld_link ();
++int
++main ()
++{
++return dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++	ac_cv_lib_dld_dld_link=no
++fi
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator
++fi
+ 
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct
+ 
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L
++fi
+ 
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var
+ 
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$hardcode_automatic
++fi
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs
++fi
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++fi
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++    ;;
++  esac
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++    save_LDFLAGS="$LDFLAGS"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms
++    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 14028 "configure"
++#include "confdefs.h"
+ 
+-# ### END LIBTOOL CONFIG
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
+-__EOF__
++#include <stdio.h>
+ 
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
+ 
+-  case $host_os in
+-  aix3*)
+-    cat <<\EOF >> "$cfgfile"
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
+ 
+-# AIX sometimes has problems with the GCC collect2 program.  For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+-  COLLECT_NAMES=
+-  export COLLECT_NAMES
+-fi
+-EOF
+-    ;;
+-  esac
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
+ 
+-  # We use sed instead of cat because bash on DJGPP gets confused if
+-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+-  # text mode, it properly converts lines to CR/LF.  This bash problem
+-  # is reportedly fixed, but why not run on old versions too?
+-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
+ 
+-  mv -f "$cfgfile" "$ofile" || \
+-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+-  chmod +x "$ofile"
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
+ 
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
 -  test -f Makefile && make "$ltmain"
-+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+  if test -f "$ltmain_in"; then
-+    test -f Makefile && make "$ltmain"
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&5 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
 +  fi
  fi
++rm -fr conftest*
  
  
-@@ -12514,6 +13082,9 @@
- echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-     fi
-   fi
-+  if test -z "$LTCFLAGS"; then
-+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-+  fi
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-CC="$lt_save_CC"
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
  
-   # Extract list of available tagged configurations in $ofile.
-   # Note that this assumes the entire list is on one line.
-@@ -12544,7 +13115,9 @@
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 14128 "configure"
++#include "confdefs.h"
  
-       case $tagname in
-       CXX)
+-# Check whether --with-tags or --without-tags was given.
+-if test "${with_tags+set}" = set; then
+-  withval="$with_tags"
+-  tagnames="$withval"
+-fi;
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
+-if test -f "$ltmain" && test -n "$tagnames"; then
+-  if test ! -f "${ofile}"; then
+-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+-  fi
++#include <stdio.h>
+ 
+-  if test -z "$LTCC"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+-    if test -z "$LTCC"; then
+-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+-    else
+-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+-    fi
+-  fi
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
+ 
+-  # Extract list of available tagged configurations in $ofile.
+-  # Note that this assumes the entire list is on one line.
+-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
+ 
+-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-  for tagname in $tagnames; do
+-    IFS="$lt_save_ifs"
+-    # Check whether tagname contains only valid characters
+-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
+-    "") ;;
+-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+-echo "$as_me: error: invalid tag name: $tagname" >&2;}
+-   { (exit 1); exit 1; }; }
+-	;;
+-    esac
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
+ 
+-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+-    then
+-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+-   { (exit 1); exit 1; }; }
+-    fi
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
+ 
+-    # Update the list of available tags.
+-    if test -n "$tagname"; then
+-      echo appending configuration tag \"$tagname\" to $ofile
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
+ 
+-      case $tagname in
+-      CXX)
 -	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12564,6 +13137,7 @@
- hardcode_libdir_flag_spec_ld_CXX=
- hardcode_libdir_separator_CXX=
- hardcode_minus_L_CXX=no
-+hardcode_shlibpath_var_CXX=unsupported
- hardcode_automatic_CXX=no
- module_cmds_CXX=
- module_expsym_cmds_CXX=
-@@ -12581,7 +13155,7 @@
- compiler_lib_search_path_CXX=
+-	  ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&5 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
  
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
  
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -12591,17 +13165,34 @@
- lt_simple_compile_test_code="int some_variable = 0;\n"
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
++    fi
  
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
  
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-archive_cmds_need_lc_CXX=no
+-allow_undefined_flag_CXX=
+-always_export_symbols_CXX=no
+-archive_expsym_cmds_CXX=
+-export_dynamic_flag_spec_CXX=
+-hardcode_direct_CXX=no
+-hardcode_libdir_flag_spec_CXX=
+-hardcode_libdir_flag_spec_ld_CXX=
+-hardcode_libdir_separator_CXX=
+-hardcode_minus_L_CXX=no
+-hardcode_automatic_CXX=no
+-module_cmds_CXX=
+-module_expsym_cmds_CXX=
+-link_all_deplibs_CXX=unknown
+-old_archive_cmds_CXX=$old_archive_cmds
+-no_undefined_flag_CXX=
+-whole_archive_flag_spec_CXX=
+-enable_shared_with_static_runtimes_CXX=no
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
  
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
+-# Dependencies to place before and after the object being linked:
+-predep_objects_CXX=
+-postdep_objects_CXX=
+-predeps_CXX=
+-postdeps_CXX=
+-compiler_lib_search_path_CXX=
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
  
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
+-# Source file extension for C++ test sources.
+-ac_ext=cc
  
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-objext_CXX=$objext
++# Report which library types will actually be built
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
  
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -12612,18 +13203,27 @@
- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
- else
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
++test "$can_build_shared" = "no" && enable_shared=no
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+-
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+-
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-
+-
+-# Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-lt_save_LD=$LD
+-lt_save_GCC=$GCC
+-GCC=$GXX
+-lt_save_with_gnu_ld=$with_gnu_ld
+-lt_save_path_LD=$lt_cv_path_LD
+-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+-else
 -  unset lt_cv_prog_gnu_ld
-+  $as_unset lt_cv_prog_gnu_ld
- fi
- if test -n "${lt_cv_path_LDCXX+set}"; then
-   lt_cv_path_LD=$lt_cv_path_LDCXX
- else
+-fi
+-if test -n "${lt_cv_path_LDCXX+set}"; then
+-  lt_cv_path_LD=$lt_cv_path_LDCXX
+-else
 -  unset lt_cv_path_LD
-+  $as_unset lt_cv_path_LD
- fi
- test -z "${LDCXX+set}" || LD=$LDCXX
- CC=${CXX-"c++"}
- compiler=$CC
- compiler_CXX=$CC
+-fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-compiler_CXX=$CC
 -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case $host_os in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
+ 
+-# We don't want -fno-exception wen compiling C++ code, so set the
+-# no_builtin_flag separately
+-if test "$GXX" = yes; then
+-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+-else
+-  lt_prog_compiler_no_builtin_flag_CXX=
+-fi
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++    ;;
++esac
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+ 
+-if test "$GXX" = yes; then
+-  # Set up default GNU C++ configuration
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+ 
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler \
++    CC \
++    LD \
++    lt_prog_compiler_wl \
++    lt_prog_compiler_pic \
++    lt_prog_compiler_static \
++    lt_prog_compiler_no_builtin_flag \
++    export_dynamic_flag_spec \
++    thread_safe_flag_spec \
++    whole_archive_flag_spec \
++    enable_shared_with_static_runtimes \
++    old_archive_cmds \
++    old_archive_from_new_cmds \
++    predep_objects \
++    postdep_objects \
++    predeps \
++    postdeps \
++    compiler_lib_search_path \
++    archive_cmds \
++    archive_expsym_cmds \
++    postinstall_cmds \
++    postuninstall_cmds \
++    old_archive_from_expsyms_cmds \
++    allow_undefined_flag \
++    no_undefined_flag \
++    export_symbols_cmds \
++    hardcode_libdir_flag_spec \
++    hardcode_libdir_flag_spec_ld \
++    hardcode_libdir_separator \
++    hardcode_automatic \
++    module_cmds \
++    module_expsym_cmds \
++    lt_cv_prog_compiler_c_o \
++    exclude_expsyms \
++    include_expsyms; do
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
+-else
+-  with_gnu_ld=no
+-fi;
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [\\/]* | ?:[\\/]*)
+-      re_direlt='/[^/][^/]*/\.\./'
+-      # Canonicalize the pathname of ld
+-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
++    case $var in
++    old_archive_cmds | \
++    old_archive_from_new_cmds | \
++    archive_cmds | \
++    archive_expsym_cmds | \
++    module_cmds | \
++    module_expsym_cmds | \
++    old_archive_from_expsyms_cmds | \
++    export_symbols_cmds | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+       ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
+-    ;;
+-  *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
 +
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+     ;;
+   esac
+-elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+-else
+-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+-fi
+-if test "${lt_cv_path_LD+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -z "$LD"; then
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      lt_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+-      *GNU* | *'with BFD'*)
+-	test "$with_gnu_ld" != no && break
+-	;;
+-      *)
+-	test "$with_gnu_ld" != yes && break
+-	;;
+-      esac
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-else
+-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi
+-fi
  
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
-@@ -12694,7 +13294,7 @@
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
-+      # but apparently some variants of GNU ld only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
-       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -12728,7 +13328,7 @@
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+-  echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+-   { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -12747,8 +13347,8 @@
-   # Check if GNU C++ uses GNU ld as the underlying linker, since the
-   # archiving commands below assume that GNU ld is being used.
-   if test "$with_gnu_ld" = yes; then
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+-  lt_cv_prog_gnu_ld=yes
+-  ;;
+-*)
+-  lt_cv_prog_gnu_ld=no
+-  ;;
+-esac
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+-with_gnu_ld=$lt_cv_prog_gnu_ld
++cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  { echo "$as_me:$LINENO: creating $ofile" >&5
++echo "$as_me: creating $ofile" >&6;}
+ 
++  cat <<__EOF__ >> "$cfgfile"
++#! $SHELL
+ 
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
+ 
+-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+-  # archiving commands below assume that GNU ld is being used.
+-  if test "$with_gnu_ld" = yes; then
 -    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -    archive_expsym_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++# A sed program that does not truncate output.
++SED=$lt_SED
  
-     hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-     export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12774,7 +13374,7 @@
-     # linker, instead of GNU ld.  If possible, this setting should
-     # overridden to take advantage of the native linker features on
-     # the platform it is being used on.
+-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e 1s/^X//"
+ 
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+-    #     investigate it a little bit more. (MM)
+-    wlarc='${wl}'
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+-	grep 'no-whole-archive' > /dev/null; then
+-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-    else
+-      whole_archive_flag_spec_CXX=
+-    fi
+-  else
+-    with_gnu_ld=no
+-    wlarc=
++# The names of the tagged configurations supported by this script.
++available_tags=
+ 
+-    # A generic and very simple default shared library creation
+-    # command for GNU C++ for the case where it uses the native
+-    # linker, instead of GNU ld.  If possible, this setting should
+-    # overridden to take advantage of the native linker features on
+-    # the platform it is being used on.
 -    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
-+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-   fi
+-  fi
++# ### BEGIN LIBTOOL CONFIG
  
-   # Commands to make compiler produce verbose output that lists
-@@ -12805,8 +13405,23 @@
-       exp_sym_flag='-Bexport'
-       no_entry_flag=""
-     else
+-  # Commands to make compiler produce verbose output that lists
+-  # what "hidden" libraries, object files and flags are used when
+-  # linking a shared library.
+-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+-else
+-  GXX=no
+-  with_gnu_ld=no
+-  wlarc=
+-fi
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+ 
+-# PORTME: fill in a description of your system's C++ link characteristics
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+-ld_shlibs_CXX=yes
+-case $host_os in
+-  aix3*)
+-    # FIXME: insert proper C++ library support
+-    ld_shlibs_CXX=no
+-    ;;
+-  aix4* | aix5*)
+-    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.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
 -      # KDE requires run time linking.  Make it the default.
 -      aix_use_runtimelinking=yes
-+      aix_use_runtimelinking=no
-+
-+      # Test if we are trying to use run time linking or normal
-+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+      # need to do runtime linking.
-+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+	for ld_flag in $LDFLAGS; do
-+	  case $ld_flag in
-+	  *-brtl*)
-+	    aix_use_runtimelinking=yes
-+	    break
-+	    ;;
-+	  esac
-+	done
-+	;;
-+      esac
-+
-       exp_sym_flag='-bexport'
-       no_entry_flag='-bnoentry'
-     fi
-@@ -12823,7 +13438,7 @@
-     link_all_deplibs_CXX=yes
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
  
-     if test "$GXX" = yes; then
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
+ 
+-    archive_cmds_CXX=''
+-    hardcode_direct_CXX=yes
+-    hardcode_libdir_separator_CXX=':'
+-    link_all_deplibs_CXX=yes
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc
+ 
+-    if test "$GXX" = yes; then
 -      case $host_os in aix4.012|aix4.012.*)
-+      case $host_os in aix4.[012]|aix4.[012].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
- 	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12842,8 +13457,12 @@
- 	  hardcode_libdir_flag_spec_CXX='-L$libdir'
- 	  hardcode_libdir_separator_CXX=
- 	fi
-+	;;
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-@@ -12852,15 +13471,16 @@
- 	shared_flag='-G'
-       else
- 	if test "$aix_use_runtimelinking" = yes; then
+-      # We only want to do this on AIX 4.2 and lower, the check
+-      # below for broken collect2 doesn't work under 4.3+
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  hardcode_direct_CXX=yes
+-	else
+-	  # We have old collect2
+-	  hardcode_direct_CXX=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  hardcode_minus_L_CXX=yes
+-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+-	  hardcode_libdir_separator_CXX=
+-	fi
+-      esac
+-      shared_flag='-shared'
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-	# chokes on -Wl,-G. The following line is correct:
+-	shared_flag='-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
 -	  shared_flag='-qmkshrobj ${wl}-G'
-+	  shared_flag='${wl}-G'
- 	else
+-	else
 -	  shared_flag='-qmkshrobj'
-+	  shared_flag='${wl}-bM:SRE'
- 	fi
-       fi
-     fi
+-	fi
+-      fi
+-    fi
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
  
 -    # Let the compiler handle the export list.
 -    always_export_symbols_CXX=no
-+    # It seems that -bexpall does not export symbols beginning with
-+    # underscore (_), so it is better to generate a list of symbols to export.
-+    always_export_symbols_CXX=yes
-     if test "$aix_use_runtimelinking" = yes; then
-       # Warning - without using the other runtime loading flags (-brtl),
-       # -berok will link without error, but may produce a broken library.
-@@ -12919,13 +13539,12 @@
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # Warning - without using the other runtime loading flags (-brtl),
+-      # -berok will link without error, but may produce a broken library.
+-      allow_undefined_flag_CXX='-berok'
+-      # Determine the default libpath from the value encoded in an empty executable.
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
  
-       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+-int
+-main ()
+-{
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
  
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+ 
+-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++# A C compiler.
++LTCC=$lt_LTCC
+ 
 -      archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
 -      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-       if test "$host_cpu" = ia64; then
- 	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
- 	allow_undefined_flag_CXX="-z nodefs"
+-     else
+-      if test "$host_cpu" = ia64; then
+-	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+-	allow_undefined_flag_CXX="-z nodefs"
 -	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-       else
- 	# Determine the default libpath from the value encoded in an empty executable.
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -12984,16 +13603,26 @@
- 	# -berok will link without error, but may produce a broken library.
- 	no_undefined_flag_CXX=' ${wl}-bernotok'
- 	allow_undefined_flag_CXX=' ${wl}-berok'
+-      else
+-	# Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+ 
+-int
+-main ()
+-{
++# A language-specific compiler.
++CC=$lt_compiler
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++# The linker used to build libraries.
++LD=$lt_LD
+ 
+-	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	# Warning - without using the other run time loading flags,
+-	# -berok will link without error, but may produce a broken library.
+-	no_undefined_flag_CXX=' ${wl}-bernotok'
+-	allow_undefined_flag_CXX=' ${wl}-berok'
 -	# -bexpall does not export symbols beginning with underscore (_)
 -	always_export_symbols_CXX=yes
- 	# Exported symbols can be pulled into shared objects from archives
+-	# Exported symbols can be pulled into shared objects from archives
 -	whole_archive_flag_spec_CXX=' '
-+	whole_archive_flag_spec_CXX='$convenience'
- 	archive_cmds_need_lc_CXX=yes
+-	archive_cmds_need_lc_CXX=yes
 -	# This is similar to how AIX traditionally builds it's shared libraries.
 -	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	# This is similar to how AIX traditionally builds its shared libraries.
-+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-     ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+      allow_undefined_flag_CXX=unsupported
-+      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    else
-+      ld_shlibs_CXX=no
-+    fi
-+    ;;
-+
-   chorus*)
-     case $cc_basename in
-       *)
-@@ -13007,12 +13636,12 @@
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-     # as there is no search path for DLLs.
-     hardcode_libdir_flag_spec_CXX='-L$libdir'
+-      fi
+-    fi
+-    ;;
+-  chorus*)
+-    case $cc_basename in
+-      *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-    esac
+-    ;;
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
+ 
+-  cygwin* | mingw* | pw32*)
+-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+-    # as there is no search path for DLLs.
+-    hardcode_libdir_flag_spec_CXX='-L$libdir'
 -    allow_undefined_flag_CXX=no
-+    allow_undefined_flag_CXX=unsupported
-     always_export_symbols_CXX=no
-     enable_shared_with_static_runtimes_CXX=yes
+-    always_export_symbols_CXX=no
+-    enable_shared_with_static_runtimes_CXX=yes
++# A BSD-compatible nm program.
++NM=$lt_NM
  
-     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -      archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       # If the export-symbols file already is a .def file (1st line
-       # is EXPORTS), use it as is; otherwise, prepend...
-       archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13021,70 +13650,81 @@
- 	echo EXPORTS > $output_objdir/$soname.def;
- 	cat $export_symbols >> $output_objdir/$soname.def;
-       fi~
+-      # If the export-symbols file already is a .def file (1st line
+-      # is EXPORTS), use it as is; otherwise, prepend...
+-      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	cp $export_symbols $output_objdir/$soname.def;
+-      else
+-	echo EXPORTS > $output_objdir/$soname.def;
+-	cat $export_symbols >> $output_objdir/$soname.def;
+-      fi~
 -      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-     else
-       ld_shlibs_CXX=no
-     fi
-   ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      archive_cmds_need_lc_CXX=no
-+      hardcode_direct_CXX=no
-+      hardcode_automatic_CXX=yes
-+      hardcode_shlibpath_var_CXX=unsupported
-+      whole_archive_flag_spec_CXX=''
-+      link_all_deplibs_CXX=yes
+-    else
+-      ld_shlibs_CXX=no
+-    fi
+-  ;;
++# A symbol stripping program
++STRIP=$lt_STRIP
  
 -  darwin* | rhapsody*)
 -  if test "$GXX" = yes; then
@@ -6783,12 +22214,7 @@
 -	    allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-       fi
+-      fi
 -      ;;
 -    esac
 -    lt_int_apple_cc_single_mod=no
@@ -6802,7 +22228,9 @@
 -      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
 -    fi
 -    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
--
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
+ 
 -    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
 -    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
@@ -6819,425 +22247,451 @@
 -    ld_shlibs_CXX=no
 -  fi
 -    ;;
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      else
-+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_CXX=no
-+          ;;
-+      esac
-+      fi
-+        ;;
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
  
-   dgux*)
-     case $cc_basename in
+-  dgux*)
+-    case $cc_basename in
 -      ec++)
-+      ec++*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
 -      ghcx)
-+      ghcx*)
- 	# Green Hills C++ Compiler
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13095,14 +13735,14 @@
- 	;;
-     esac
-     ;;
+-	# Green Hills C++ Compiler
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-    esac
+-    ;;
 -  freebsd12*)
-+  freebsd[12]*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     ld_shlibs_CXX=no
-     ;;
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
+-    # C++ shared libraries reported to be fairly broken before switch to ELF
+-    ld_shlibs_CXX=no
+-    ;;
+-  freebsd-elf*)
+-    archive_cmds_need_lc_CXX=no
+-    ;;
 -  freebsd* | kfreebsd*-gnu)
-+  freebsd* | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -13119,12 +13759,12 @@
- 				# location of the library.
+-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+-    # conventions
+-    ld_shlibs_CXX=yes
+-    ;;
+-  gnu*)
+-    ;;
+-  hpux9*)
+-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+-    hardcode_libdir_separator_CXX=:
+-    export_dynamic_flag_spec_CXX='${wl}-E'
+-    hardcode_direct_CXX=yes
+-    hardcode_minus_L_CXX=yes # Not in the search PATH,
+-				# but as the default
+-				# location of the library.
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
  
-     case $cc_basename in
+-    case $cc_basename in
 -    CC)
-+    CC*)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
+-      # FIXME: insert proper C++ library support
+-      ld_shlibs_CXX=no
+-      ;;
 -    aCC)
 -      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+    aCC*)
-+      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-@@ -13133,11 +13773,11 @@
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
+-      # Commands to make compiler produce verbose output that lists
+-      # what "hidden" libraries, object files and flags are used when
+-      # linking a shared library.
+-      #
+-      # There doesn't appear to be a way to prevent this compiler from
+-      # explicitly linking system object files so we need to strip them
+-      # from the output so that they don't get included in the library
+-      # dependencies.
 -      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
+-      ;;
+-    *)
+-      if test "$GXX" = yes; then
 -        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       else
-         # FIXME: insert proper C++ library support
-         ld_shlibs_CXX=no
-@@ -13147,33 +13787,22 @@
-     ;;
-   hpux10*|hpux11*)
-     if test $with_gnu_ld = no; then
+-      else
+-        # FIXME: insert proper C++ library support
+-        ld_shlibs_CXX=no
+-      fi
+-      ;;
+-    esac
+-    ;;
+-  hpux10*|hpux11*)
+-    if test $with_gnu_ld = no; then
 -      case "$host_cpu" in
 -      hppa*64*)
 -	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator_CXX=:
-+
-+      case $host_cpu in
-+      hppa*64*|ia64*)
- 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
 -	hardcode_libdir_separator_CXX=:
 -        ;;
 -      ia64*)
 -	hardcode_libdir_flag_spec_CXX='-L$libdir'
-         ;;
-       *)
+-        ;;
+-      *)
 -	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_CXX=:
- 	export_dynamic_flag_spec_CXX='${wl}-E'
-         ;;
-       esac
-     fi
+-	export_dynamic_flag_spec_CXX='${wl}-E'
+-        ;;
+-      esac
+-    fi
 -    case "$host_cpu" in
 -    hppa*64*)
 -      hardcode_direct_CXX=no
 -      hardcode_shlibpath_var_CXX=no
 -      ;;
 -    ia64*)
-+    case $host_cpu in
-+    hppa*64*|ia64*)
-       hardcode_direct_CXX=no
-       hardcode_shlibpath_var_CXX=no
+-      hardcode_direct_CXX=no
+-      hardcode_shlibpath_var_CXX=no
 -      hardcode_minus_L_CXX=yes # Not in the search PATH,
 -					      # but as the default
 -					      # location of the library.
-       ;;
-     *)
-       hardcode_direct_CXX=yes
-@@ -13184,17 +13813,20 @@
-     esac
+-      ;;
+-    *)
+-      hardcode_direct_CXX=yes
+-      hardcode_minus_L_CXX=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+-      ;;
+-    esac
++# Used on cygwin: assembler.
++AS="$AS"
  
-     case $cc_basename in
+-    case $cc_basename in
 -      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
 -      aCC)
 -	case "$host_cpu" in
 -	hppa*64*|ia64*)
 -	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+      aCC*)
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	  ;;
- 	*)
+-	  ;;
+-	*)
 -	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	  ;;
- 	esac
- 	# Commands to make compiler produce verbose output that lists
-@@ -13210,12 +13842,15 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test $with_gnu_ld = no; then
+-	  ;;
+-	esac
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test $with_gnu_ld = no; then
 -	    case "$host_cpu" in
 -	    ia64*|hppa*64*)
 -	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+	    case $host_cpu in
-+	    hppa*64*)
-+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      ;;
-+	    ia64*)
-+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	      ;;
- 	    *)
+-	      ;;
+-	    *)
 -	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	      ;;
- 	    esac
- 	  fi
-@@ -13226,11 +13861,25 @@
- 	;;
-     esac
-     ;;
-+  interix3*)
-+    hardcode_direct_CXX=no
-+    hardcode_shlibpath_var_CXX=no
-+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+    export_dynamic_flag_spec_CXX='${wl}-E'
-+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+    # Instead, shared libraries are loaded at an image base (0x10000000 by
-+    # default) and relocated if they conflict, which is a slow very memory
-+    # consuming and fragmenting process.  To avoid this, we pick a random,
-+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+    ;;
-   irix5* | irix6*)
-     case $cc_basename in
+-	      ;;
+-	    esac
+-	  fi
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  ld_shlibs_CXX=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  irix5* | irix6*)
+-    case $cc_basename in
 -      CC)
-+      CC*)
- 	# SGI C++
+-	# SGI C++
 -	archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
- 	# Archives containing C++ object files must be created using
- 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13241,9 +13890,9 @@
-       *)
- 	if test "$GXX" = yes; then
- 	  if test "$with_gnu_ld" = no; then
+-	# Archives containing C++ object files must be created using
+-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+-	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test "$with_gnu_ld" = no; then
 -	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	  else
+-	  else
 -	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- 	  fi
- 	fi
- 	link_all_deplibs_CXX=yes
-@@ -13252,16 +13901,16 @@
-     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-     hardcode_libdir_separator_CXX=:
-     ;;
+-	  fi
+-	fi
+-	link_all_deplibs_CXX=yes
+-	;;
+-    esac
+-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator_CXX=:
+-    ;;
 -  linux*)
-+  linux* | k*bsd*-gnu)
-     case $cc_basename in
+-    case $cc_basename in
 -      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
- 	# KCC will only create a shared library if the output file
- 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
- 	# to its proper name (with version) after linking.
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
 -	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
 -	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
- 	# Commands to make compiler produce verbose output that lists
- 	# what "hidden" libraries, object files and flags are used when
- 	# linking a shared library.
-@@ -13279,20 +13928,44 @@
- 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- 	;;
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
+ 
+-	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
+-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++# Object file suffix (normally "o").
++objext="$ac_objext"
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+-	;;
 -      icpc)
-+      icpc*)
- 	# Intel C++
- 	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	archive_cmds_need_lc_CXX=no
+-	# Intel C++
+-	with_gnu_ld=yes
+-	archive_cmds_need_lc_CXX=no
 -	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
+-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+-	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+-	;;
 -      cxx)
-+      pgCC*)
-+        # 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'
-+
-+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
- 	# Compaq C++
+-	# Compaq C++
 -	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++# Old archive suffix (normally "a").
++libext="$libext"
  
- 	runpath_var=LD_RUN_PATH
- 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13320,7 +13993,7 @@
-     ;;
-   mvs*)
-     case $cc_basename in
+-	runpath_var=LD_RUN_PATH
+-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+-	hardcode_libdir_separator_CXX=:
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-    esac
+-    ;;
+-  lynxos*)
+-    # FIXME: insert proper C++ library support
+-    ld_shlibs_CXX=no
+-    ;;
+-  m88k*)
+-    # FIXME: insert proper C++ library support
+-    ld_shlibs_CXX=no
+-    ;;
+-  mvs*)
+-    case $cc_basename in
 -      cxx)
-+      cxx*)
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
-@@ -13330,7 +14003,7 @@
- 	;;
-     esac
-     ;;
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-    esac
+-    ;;
 -  netbsd*)
-+  netbsd* | netbsdelf*-gnu)
-     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-       wlarc=
-@@ -13341,15 +14014,31 @@
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    ld_shlibs_CXX=no
-+    ;;
-+  openbsd*)
-+    hardcode_direct_CXX=yes
-+    hardcode_shlibpath_var_CXX=no
-+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      export_dynamic_flag_spec_CXX='${wl}-E'
-+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
+-    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=
+-      hardcode_libdir_flag_spec_CXX='-R$libdir'
+-      hardcode_direct_CXX=yes
+-      hardcode_shlibpath_var_CXX=no
+-    fi
+-    # Workaround some broken pre-1.5 toolchains
+-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+-    ;;
+-  osf3*)
+-    case $cc_basename in
 -      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
++# Executable file suffix (normally "").
++exeext="$exeext"
  
- 	# KCC will only create a shared library if the output file
- 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
- 	# to its proper name (with version) after linking.
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
 -	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
++pic_mode=$pic_mode
  
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	hardcode_libdir_separator_CXX=:
-@@ -13359,14 +14048,14 @@
- 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+-	hardcode_libdir_separator_CXX=:
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
  
- 	;;
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+ 
+-	;;
 -      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
 -      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 -	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
  
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	hardcode_libdir_separator_CXX=:
-@@ -13384,7 +14073,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+-	hardcode_libdir_separator_CXX=:
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 -	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++# Do we need a version for libraries?
++need_version=$need_version
  
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13403,13 +14092,13 @@
-     ;;
-   osf4* | osf5*)
-     case $cc_basename in
+-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+-	  hardcode_libdir_separator_CXX=:
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+ 
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  ld_shlibs_CXX=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  osf4* | osf5*)
+-    case $cc_basename in
 -      KCC)
-+      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
- 	# KCC will only create a shared library if the output file
- 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
- 	# to its proper name (with version) after linking.
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
 -	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static
  
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	hardcode_libdir_separator_CXX=:
-@@ -13418,17 +14107,17 @@
- 	# the KAI C++ compiler.
- 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
- 	;;
+-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+-	hardcode_libdir_separator_CXX=:
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+ 
+-	# Archives containing C++ object files must be created using
+-	# the KAI C++ compiler.
+-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
+-	;;
 -      RCC)
-+      RCC*)
- 	# Rational C++ 2.4.1
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
 -      cxx)
-+      cxx*)
- 	allow_undefined_flag_CXX=' -expect_unresolved \*'
+-	allow_undefined_flag_CXX=' -expect_unresolved \*'
 -	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	  echo "-hidden">> $lib.exp~
+-	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+-	  echo "-hidden">> $lib.exp~
 -	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- 	  $rm $lib.exp'
+-	  $rm $lib.exp'
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
  
- 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13447,7 +14136,7 @@
-       *)
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+-	hardcode_libdir_separator_CXX=:
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 -	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
  
- 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	  hardcode_libdir_separator_CXX=:
-@@ -13468,27 +14157,14 @@
-     # FIXME: insert proper C++ library support
-     ld_shlibs_CXX=no
-     ;;
+-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+-	  hardcode_libdir_separator_CXX=:
++# Library versioning type.
++version_type=$version_type
+ 
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  ld_shlibs_CXX=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  psos*)
+-    # FIXME: insert proper C++ library support
+-    ld_shlibs_CXX=no
+-    ;;
 -  sco*)
 -    archive_cmds_need_lc_CXX=no
 -    case $cc_basename in
@@ -7251,54 +22705,51 @@
 -	;;
 -    esac
 -    ;;
-   sunos4*)
-     case $cc_basename in
+-  sunos4*)
+-    case $cc_basename in
 -      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
+-	# Sun C++ 4.x
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
 -      lcc)
-+      lcc*)
- 	# Lucid
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13501,36 +14177,33 @@
-     ;;
-   solaris*)
-     case $cc_basename in
+-	# Lucid
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-    esac
+-    ;;
+-  solaris*)
+-    case $cc_basename in
 -      CC)
-+      CC*)
- 	# Sun C++ 4.2, 5.x and Centerline C++
-+        archive_cmds_need_lc_CXX=yes
- 	no_undefined_flag_CXX=' -zdefs'
+-	# Sun C++ 4.2, 5.x and Centerline C++
+-	no_undefined_flag_CXX=' -zdefs'
 -	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
  
- 	hardcode_libdir_flag_spec_CXX='-R$libdir'
- 	hardcode_shlibpath_var_CXX=no
- 	case $host_os in
+-	hardcode_libdir_flag_spec_CXX='-R$libdir'
+-	hardcode_shlibpath_var_CXX=no
+-	case $host_os in
 -	  solaris2.0-5 | solaris2.0-5.*) ;;
-+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
- 	  *)
- 	    # The C++ compiler is used as linker so we must use $wl
- 	    # flag to pass the commands to the underlying system
+-	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
 -	    # linker.
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
- 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
 -	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- 	    ;;
- 	esac
- 	link_all_deplibs_CXX=yes
+-	    ;;
+-	esac
+-	link_all_deplibs_CXX=yes
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
 -	# Commands to make compiler produce verbose output that lists
 -	# what "hidden" libraries, object files and flags are used when
@@ -7309,322 +22760,794 @@
 -	# from the output so that they don't get included in the library
 -	# dependencies.
 -	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	output_verbose_link_cmd='echo'
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
- 	# Archives containing C++ object files must be created using
- 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13538,9 +14211,9 @@
- 	# in the archive.
- 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
- 	;;
+-	# Archives containing C++ object files must be created using
+-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+-	;;
 -      gcx)
-+      gcx*)
- 	# Green Hills C++ Compiler
+-	# Green Hills C++ Compiler
 -	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
-+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
  
- 	# The C++ compiler must be used to create the archive.
- 	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13550,9 +14223,9 @@
- 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
- 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	# The C++ compiler must be used to create the archive.
+-	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+-	;;
+-      *)
+-	# GNU C++ compiler with Solaris linker
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
 -	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
-+	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
  
- 	    # Commands to make compiler produce verbose output that lists
- 	    # what "hidden" libraries, object files and flags are used when
-@@ -13561,9 +14234,9 @@
- 	  else
- 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
- 	    # platform.
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  else
+-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+-	    # platform.
 -	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
-+	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
  
- 	    # Commands to make compiler produce verbose output that lists
- 	    # what "hidden" libraries, object files and flags are used when
-@@ -13576,12 +14249,63 @@
- 	;;
-     esac
-     ;;
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  fi
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds
++module_expsym_cmds=$lt_module_expsym_cmds
+ 
+-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+-	fi
+-	;;
+-    esac
+-    ;;
 -  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+    no_undefined_flag_CXX='${wl}-z,text'
-+    archive_cmds_need_lc_CXX=no
-+    hardcode_shlibpath_var_CXX=no
-+    runpath_var='LD_RUN_PATH'
-+
-+    case $cc_basename in
-+      CC*)
-+	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	;;
-+      *)
-+	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	;;
-+    esac
-+    ;;
-+  sysv5* | sco3.2v5* | sco5v6*)
-+    # Note: We can NOT use -z defs as we might desire, because we do not
-+    # link with -lc, and that would cause any symbols used from libc to
-+    # always be unresolved, which means just about no library would
-+    # ever link correctly.  If we're not using GNU ld we use -z text
-+    # though, which does catch some bad symbols but isn't as heavy-handed
-+    # as -z defs.
-+    # For security reasons, it is highly recommended that you always
-+    # use absolute paths for naming shared libraries, and exclude the
-+    # DT_RUNPATH tag from executables and libraries.  But doing so
-+    # requires that you compile everything twice, which is a pain.
-+    # So that behaviour is only enabled if SCOABSPATH is set to a
-+    # non-empty value in the environment.  Most likely only useful for
-+    # creating official distributions of packages.
-+    # This is a hack until libtool officially supports absolute path
-+    # names for shared libraries.
-+    no_undefined_flag_CXX='${wl}-z,text'
-+    allow_undefined_flag_CXX='${wl}-z,nodefs'
-     archive_cmds_need_lc_CXX=no
-+    hardcode_shlibpath_var_CXX=no
-+    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+    hardcode_libdir_separator_CXX=':'
-+    link_all_deplibs_CXX=yes
-+    export_dynamic_flag_spec_CXX='${wl}-Bexport'
-+    runpath_var='LD_RUN_PATH'
-+
-+    case $cc_basename in
-+      CC*)
-+	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	;;
-+      *)
-+	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	;;
-+    esac
-     ;;
-   tandem*)
-     case $cc_basename in
+-    archive_cmds_need_lc_CXX=no
+-    ;;
+-  tandem*)
+-    case $cc_basename in
 -      NCC)
-+      NCC*)
- 	# NonStop-UX NCC 3.20
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
-@@ -13638,7 +14362,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
+-	# NonStop-UX NCC 3.20
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-    esac
+-    ;;
+-  vxworks*)
+-    # FIXME: insert proper C++ library support
+-    ld_shlibs_CXX=no
+-    ;;
+-  *)
+-    # FIXME: insert proper C++ library support
+-    ld_shlibs_CXX=no
+-    ;;
+-esac
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+-test "$ld_shlibs_CXX" = no && can_build_shared=no
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+ 
+-GCC_CXX="$GXX"
+-LD_CXX="$LD"
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects
+ 
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects
+ 
+-cat > conftest.$ac_ext <<EOF
+-class Foo
+-{
+-public:
+-  Foo (void) { a = 0; }
+-private:
+-  int a;
+-};
+-EOF
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps
+ 
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  # Parse the compiler output and extract the necessary
+-  # objects, libraries and library flags.
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps
+ 
+-  # Sentinel used to keep track of whether or not we are before
+-  # the conftest object file.
+-  pre_test_object_deps_done=no
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path
+ 
+-  # The `*' in the case matches for architectures that use `case' in
+-  # $output_verbose_cmd can trigger glob expansion during the loop
+-  # eval without this substitution.
 -  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
  
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in
-@@ -13678,7 +14402,7 @@
-        fi
-        ;;
+-  for p in `eval $output_verbose_link_cmd`; do
+-    case $p in
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
  
+-    -L* | -R* | -l*)
+-       # Some compilers place space between "-{L,R}" and the path.
+-       # Remove the space.
+-       if test $p = "-L" \
+-	  || test $p = "-R"; then
+-	 prev=$p
+-	 continue
+-       else
+-	 prev=
+-       fi
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 case $p in
+-	 -L* | -R*)
+-	   # Internal compiler library paths should come after those
+-	   # provided the user.  The postdeps already come after the
+-	   # user supplied libs so there is no need to process them.
+-	   if test -z "$compiler_lib_search_path_CXX"; then
+-	     compiler_lib_search_path_CXX="${prev}${p}"
+-	   else
+-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+-	   fi
+-	   ;;
+-	 # The "-l" case would never come before the object being
+-	 # linked, so don't bother handling this case.
+-	 esac
+-       else
+-	 if test -z "$postdeps_CXX"; then
+-	   postdeps_CXX="${prev}${p}"
+-	 else
+-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+-	 fi
+-       fi
+-       ;;
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
+ 
 -    *.$objext|*.$libext)
-+    *.$objext)
-        # This assumes that the test object file only shows up
-        # once in the compiler output.
-        if test "$p" = "conftest.$objext"; then
-@@ -13714,6 +14438,29 @@
+-       # This assumes that the test object file only shows up
+-       # once in the compiler output.
+-       if test "$p" = "conftest.$objext"; then
+-	 pre_test_object_deps_done=yes
+-	 continue
+-       fi
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
  
- $rm -f confest.$objext
+-       if test "$pre_test_object_deps_done" = no; then
+-	 if test -z "$predep_objects_CXX"; then
+-	   predep_objects_CXX="$p"
+-	 else
+-	   predep_objects_CXX="$predep_objects_CXX $p"
+-	 fi
+-       else
+-	 if test -z "$postdep_objects_CXX"; then
+-	   postdep_objects_CXX="$p"
+-	 else
+-	   postdep_objects_CXX="$postdep_objects_CXX $p"
+-	 fi
+-       fi
+-       ;;
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
  
-+# PORTME: override above test on systems where it is broken
-+case $host_os in
-+interix3*)
-+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+  # hack all around it, let's just trust "g++" to DTRT.
-+  predep_objects_CXX=
-+  postdep_objects_CXX=
-+  postdeps_CXX=
-+  ;;
+-    *) ;; # Ignore the rest.
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
+-    esac
+-  done
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 +
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    postdeps_CXX='-lCstd -lCrun'
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "$cfgfile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
 +    ;;
 +  esac
-+  ;;
-+esac
 +
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
 +
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -13761,6 +14508,10 @@
-       # DJGPP does not support shared libraries at all
-       lt_prog_compiler_pic_CXX=
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
+ 
+-  # Clean up.
+-  rm -f a.out a.exe
+ else
+-  echo "libtool.m4: error: problem compiling CXX test program"
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ 
+-$rm -f confest.$objext
+ 
+-case " $postdeps_CXX " in
+-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+-esac
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-lt_prog_compiler_wl_CXX=
+-lt_prog_compiler_pic_CXX=
+-lt_prog_compiler_static_CXX=
++CC="$lt_save_CC"
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+ 
+-  # C++ specific cases for pic, static, wl, etc.
+-  if test "$GXX" = yes; then
+-    lt_prog_compiler_wl_CXX='-Wl,'
+-    lt_prog_compiler_static_CXX='-static'
++# Check whether --with-tags was given.
++if test "${with_tags+set}" = set; then
++  withval=$with_tags; tagnames="$withval"
++fi
+ 
+-    case $host_os in
+-    aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static_CXX='-Bstatic'
+-      fi
+-      ;;
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-    mingw* | os2* | pw32*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+-      ;;
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_prog_compiler_pic_CXX='-fno-common'
+-      ;;
+-    *djgpp*)
+-      # DJGPP does not support shared libraries at all
+-      lt_prog_compiler_pic_CXX=
+-      ;;
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic_CXX=-Kconform_pic
+-      fi
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
++  fi
++
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
++    else
++      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
++    fi
++  fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
++
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
++    "") ;;
++    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
++echo "$as_me: error: invalid tag name: $tagname" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++    esac
++
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
++
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
++	  ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++
++
++
++archive_cmds_need_lc_CXX=no
++allow_undefined_flag_CXX=
++always_export_symbols_CXX=no
++archive_expsym_cmds_CXX=
++export_dynamic_flag_spec_CXX=
++hardcode_direct_CXX=no
++hardcode_libdir_flag_spec_CXX=
++hardcode_libdir_flag_spec_ld_CXX=
++hardcode_libdir_separator_CXX=
++hardcode_minus_L_CXX=no
++hardcode_shlibpath_var_CXX=unsupported
++hardcode_automatic_CXX=no
++module_cmds_CXX=
++module_expsym_cmds_CXX=
++link_all_deplibs_CXX=unknown
++old_archive_cmds_CXX=$old_archive_cmds
++no_undefined_flag_CXX=
++whole_archive_flag_spec_CXX=
++enable_shared_with_static_runtimes_CXX=no
++
++# Dependencies to place before and after the object being linked:
++predep_objects_CXX=
++postdep_objects_CXX=
++predeps_CXX=
++postdeps_CXX=
++compiler_lib_search_path_CXX=
++
++# Source file extension for C++ test sources.
++ac_ext=cpp
++
++# Object file extension for compiled C++ test sources.
++objext=o
++objext_CXX=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  $as_unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  $as_unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++compiler_CXX=$CC
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
++
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
++else
++  lt_prog_compiler_no_builtin_flag_CXX=
++fi
++
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
++
++
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi
++
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
        ;;
-+    interix3*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-     sysv4*MP*)
-       if test -d /usr/nec; then
- 	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13769,7 +14520,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
 -      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
+-      hppa*64*|ia64*)
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
++else
++  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some variants of GNU ld only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
  	;;
        *)
-@@ -13794,18 +14545,28 @@
+-	lt_prog_compiler_pic_CXX='-fPIC'
++	test "$with_gnu_ld" != yes && break
  	;;
-       chorus*)
- 	case $cc_basename in
+       esac
+-      ;;
+-    *)
+-      lt_prog_compiler_pic_CXX='-fPIC'
+-      ;;
+-    esac
+-  else
+-    case $host_os in
+-      aix4* | aix5*)
+-	# All AIX code is PIC.
+-	if test "$host_cpu" = ia64; then
+-	  # AIX 5 now supports IA64 processor
+-	  lt_prog_compiler_static_CXX='-Bstatic'
+-	else
+-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+-	fi
+-	;;
+-      chorus*)
+-	case $cc_basename in
 -	cxch68)
-+	cxch68*)
- 	  # Green Hills C++ Compiler
- 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           lt_prog_compiler_pic_CXX='-qnocommon'
-+           lt_prog_compiler_wl_CXX='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
+-	  # Green Hills C++ Compiler
+-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+-	  ;;
+-	esac
+-	;;
+-      dgux*)
+-	case $cc_basename in
 -	  ec++)
-+	  ec++*)
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
+-	    lt_prog_compiler_pic_CXX='-KPIC'
+-	    ;;
 -	  ghcx)
-+	  ghcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13813,22 +14574,22 @@
- 	    ;;
- 	esac
- 	;;
+-	    # Green Hills C++ Compiler
+-	    lt_prog_compiler_pic_CXX='-pic'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
 -      freebsd* | kfreebsd*-gnu)
-+      freebsd* | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
- 	case $cc_basename in
+-	# FreeBSD uses GNU C++
+-	;;
+-      hpux9* | hpux10* | hpux11*)
+-	case $cc_basename in
 -	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_wl_CXX='-Wl,'
 -	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
- 	    if test "$host_cpu" != ia64; then
- 	      lt_prog_compiler_pic_CXX='+Z'
- 	    fi
- 	    ;;
+-	    if test "$host_cpu" != ia64; then
+-	      lt_prog_compiler_pic_CXX='+Z'
+-	    fi
+-	    ;;
 -	  aCC)
-+	  aCC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_wl_CXX='-Wl,'
 -	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
 -	    case "$host_cpu" in
-+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-+	    case $host_cpu in
- 	    hppa*64*|ia64*)
- 	      # +Z the default
- 	      ;;
-@@ -13841,9 +14602,13 @@
- 	    ;;
- 	esac
- 	;;
-+      interix*)
-+	# This is c89, which is MS Visual C++ (no shared libs)
-+	# Anyone wants to do a port?
-+	;;
-       irix5* | irix6* | nonstopux*)
- 	case $cc_basename in
+-	    hppa*64*|ia64*)
+-	      # +Z the default
+-	      ;;
+-	    *)
+-	      lt_prog_compiler_pic_CXX='+Z'
+-	      ;;
+-	    esac
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      irix5* | irix6* | nonstopux*)
+-	case $cc_basename in
 -	  CC)
-+	  CC*)
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_static_CXX='-non_shared'
- 	    # CC pic flag -KPIC is the default.
-@@ -13852,20 +14617,26 @@
- 	    ;;
- 	esac
- 	;;
+-	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_static_CXX='-non_shared'
+-	    # CC pic flag -KPIC is the default.
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
 -      linux*)
-+      linux* | k*bsd*-gnu)
- 	case $cc_basename in
+-	case $cc_basename in
 -	  KCC)
-+	  KCC*)
- 	    # KAI C++ Compiler
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
+-	    # KAI C++ Compiler
+-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+-	    lt_prog_compiler_pic_CXX='-fPIC'
+-	    ;;
 -	  icpc)
-+	  icpc* | ecpc*)
- 	    # Intel C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-static'
- 	    ;;
+-	    # Intel C++
+-	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_pic_CXX='-KPIC'
+-	    lt_prog_compiler_static_CXX='-static'
+-	    ;;
 -	  cxx)
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-fpic'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	  cxx*)
- 	    # Compaq C++
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
- 	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13882,25 +14653,25 @@
- 	;;
-       mvs*)
- 	case $cc_basename in
+-	    # Compaq C++
+-	    # Make sure the PIC flag is empty.  It appears that all Alpha
+-	    # Linux and Compaq Tru64 Unix objects are PIC.
+-	    lt_prog_compiler_pic_CXX=
+-	    lt_prog_compiler_static_CXX='-non_shared'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      lynxos*)
+-	;;
+-      m88k*)
+-	;;
+-      mvs*)
+-	case $cc_basename in
 -	  cxx)
-+	  cxx*)
- 	    lt_prog_compiler_pic_CXX='-W c,exportall'
- 	    ;;
- 	  *)
- 	    ;;
- 	esac
- 	;;
+-	    lt_prog_compiler_pic_CXX='-W c,exportall'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
 -      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
+-	;;
+-      osf3* | osf4* | osf5*)
+-	case $cc_basename in
 -	  KCC)
-+	  KCC*)
- 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
- 	    ;;
+-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+-	    ;;
 -	  RCC)
-+	  RCC*)
- 	    # Rational C++ 2.4.1
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
+-	    # Rational C++ 2.4.1
+-	    lt_prog_compiler_pic_CXX='-pic'
+-	    ;;
 -	  cxx)
-+	  cxx*)
- 	    # Digital/Compaq C++
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13914,24 +14685,15 @@
- 	;;
-       psos*)
- 	;;
+-	    # Digital/Compaq C++
+-	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    # Make sure the PIC flag is empty.  It appears that all Alpha
+-	    # Linux and Compaq Tru64 Unix objects are PIC.
+-	    lt_prog_compiler_pic_CXX=
+-	    lt_prog_compiler_static_CXX='-non_shared'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      psos*)
+-	;;
 -      sco*)
 -	case $cc_basename in
 -	  CC)
@@ -7634,147 +23557,163 @@
 -	    ;;
 -	esac
 -	;;
-       solaris*)
- 	case $cc_basename in
+-      solaris*)
+-	case $cc_basename in
 -	  CC)
-+	  CC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    lt_prog_compiler_wl_CXX='-Qoption ld '
- 	    ;;
+-	    # Sun C++ 4.2, 5.x and Centerline C++
+-	    lt_prog_compiler_pic_CXX='-KPIC'
+-	    lt_prog_compiler_static_CXX='-Bstatic'
+-	    lt_prog_compiler_wl_CXX='-Qoption ld '
+-	    ;;
 -	  gcx)
-+	  gcx*)
- 	    # Green Hills C++ Compiler
- 	    lt_prog_compiler_pic_CXX='-PIC'
- 	    ;;
-@@ -13941,12 +14703,12 @@
- 	;;
-       sunos4*)
- 	case $cc_basename in
+-	    # Green Hills C++ Compiler
+-	    lt_prog_compiler_pic_CXX='-PIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      sunos4*)
+-	case $cc_basename in
 -	  CC)
-+	  CC*)
- 	    # Sun C++ 4.x
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
- 	    ;;
+-	    # Sun C++ 4.x
+-	    lt_prog_compiler_pic_CXX='-pic'
+-	    lt_prog_compiler_static_CXX='-Bstatic'
+-	    ;;
 -	  lcc)
-+	  lcc*)
- 	    # Lucid
- 	    lt_prog_compiler_pic_CXX='-pic'
- 	    ;;
-@@ -13956,7 +14718,7 @@
- 	;;
-       tandem*)
- 	case $cc_basename in
+-	    # Lucid
+-	    lt_prog_compiler_pic_CXX='-pic'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      tandem*)
+-	case $cc_basename in
 -	  NCC)
-+	  NCC*)
- 	    # NonStop-UX NCC 3.20
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    ;;
-@@ -13964,7 +14726,14 @@
- 	    ;;
- 	esac
- 	;;
+-	    # NonStop-UX NCC 3.20
+-	    lt_prog_compiler_pic_CXX='-KPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
 -      unixware*)
-+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+	case $cc_basename in
-+	  CC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	esac
- 	;;
-       vxworks*)
- 	;;
-@@ -13997,18 +14766,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
+-	;;
+-      vxworks*)
+-	;;
+-      *)
+-	lt_prog_compiler_can_build_shared_CXX=no
+-	;;
+-    esac
+-  fi
+-
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
+-
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$lt_prog_compiler_pic_CXX"; then
+-
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    fi
++  done
++  IFS="$lt_save_ifs"
+ else
+-  lt_prog_compiler_pic_works_CXX=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
 -   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -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:14003: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14772: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14007: \$? = $ac_status" >&5
-+   echo "$as_me:14776: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13995: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
+-   echo "$as_me:13999: \$? = $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
 -     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_CXX=yes
-      fi
-    fi
-@@ -14029,7 +14800,7 @@
+-       lt_prog_compiler_pic_works_CXX=yes
+-     fi
+-   fi
+-   $rm conftest*
+-
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
+-
+-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+-    case $lt_prog_compiler_pic_CXX in
+-     "" | " "*) ;;
+-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+-     esac
+-else
+-    lt_prog_compiler_pic_CXX=
+-     lt_prog_compiler_can_build_shared_CXX=no
+ fi
  
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
  fi
 -case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_CXX=
-@@ -14039,6 +14810,48 @@
-     ;;
- esac
- 
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_prog_compiler_static_works_CXX=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_prog_compiler_static_works_CXX=yes
-+       fi
-+     else
-+       lt_prog_compiler_static_works_CXX=yes
-+     fi
-+   fi
-+   $rm conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    lt_prog_compiler_pic_CXX=
+-    ;;
+-  *)
+-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+-    ;;
+-esac
+-
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_cv_prog_compiler_c_o_CXX=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++  # I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
-+
-+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
-+    :
-+else
-+    lt_prog_compiler_static_CXX=
-+fi
-+
-+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
- if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-@@ -14051,38 +14864,36 @@
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
++with_gnu_ld=$lt_cv_prog_gnu_ld
  
 -   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
 -   # that will create temporary files in the current directory regardless of
@@ -7782,169 +23721,786 @@
 -   # to fail, enabling locking or at least warning the user not to do parallel
 -   # builds.
 -   chmod -w .
--
-    lt_compiler_flag="-o out/conftest2.$ac_objext"
-    # Insert the option either (1) after the last *FLAGS variable, or
-    # (2) before a word containing "conftest.", or (3) at the end.
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
+ 
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   lt_compile=`echo "$ac_compile" | $SED \
 -   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -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:14070: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14876: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14074: \$? = $ac_status" >&5
-+   echo "$as_me:14880: \$? = $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
-      # So say no if there are warnings
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14062: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
+-   echo "$as_me:14066: \$? = $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
+-     # So say no if there are warnings
 -     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_CXX=yes
-      fi
-    fi
+-       lt_cv_prog_compiler_c_o_CXX=yes
+-     fi
+-   fi
 -   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
-+   chmod u+w . 2>&5
-+   $rm conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+   $rm out/* && rmdir out
-    cd ..
-    rmdir conftest
-    $rm conftest*
-@@ -14132,7 +14943,10 @@
-     export_symbols_cmds_CXX="$ltdll_cmds"
-   ;;
-   cygwin* | mingw*)
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
++    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ 
+-hard_links="nottested"
+-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
+-  if test "$hard_links" = no; then
+-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+-    need_locks=warn
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      whole_archive_flag_spec_CXX=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
++
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
++
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
+ else
+-  need_locks=no
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+-
+-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  case $host_os in
++# PORTME: fill in a description of your system's C++ link characteristics
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
++ld_shlibs_CXX=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
+   aix4* | aix5*)
+-    # 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
+-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    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.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
+     else
+-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++	;;
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
+     fi
+-    ;;
+-  pw32*)
+-    export_symbols_cmds_CXX="$ltdll_cmds"
+-  ;;
+-  cygwin* | mingw*)
 -    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_CXX=no
-   ;;
-   *)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14143,11 +14957,6 @@
- echo "${ECHO_T}$ld_shlibs_CXX" >&6
- test "$ld_shlibs_CXX" = no && can_build_shared=no
+-  ;;
+-  *)
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
+-  esac
  
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+-test "$ld_shlibs_CXX" = no && can_build_shared=no
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
 -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"
 -fi
--
- #
- # Do we need to explicitly link libc?
- #
-@@ -14180,6 +14989,7 @@
-         libobjs=conftest.$ac_objext
-         deplibs=
-         wl=$lt_prog_compiler_wl_CXX
-+	pic_flag=$lt_prog_compiler_pic_CXX
-         compiler_flags=-v
-         linker_flags=-v
-         verstring=
-@@ -14215,7 +15025,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
++    archive_cmds_CXX=''
++    hardcode_direct_CXX=yes
++    hardcode_libdir_separator_CXX=':'
++    link_all_deplibs_CXX=yes
+ 
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$archive_cmds_need_lc_CXX" in
+-x|xyes)
+-  # Assume -lc should be added
+-  archive_cmds_need_lc_CXX=yes
++    if test "$GXX" = yes; then
++      case $host_os in aix4.[012]|aix4.[012].*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  hardcode_direct_CXX=yes
++	else
++	  # We have old collect2
++	  hardcode_direct_CXX=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L_CXX=yes
++	  hardcode_libdir_flag_spec_CXX='-L$libdir'
++	  hardcode_libdir_separator_CXX=
++	fi
++	;;
++      esac
++      shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $archive_cmds_CXX in
+-    *'~'*)
+-      # FIXME: we may have to deal with multi-command sequences.
+-      ;;
+-    '$CC '*)
+-      # Test whether the compiler implicitly links with -lc since on some
+-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-      # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    always_export_symbols_CXX=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      allow_undefined_flag_CXX='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$lt_prog_compiler_wl_CXX
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+-        allow_undefined_flag_CXX=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-        then
+-	  archive_cmds_need_lc_CXX=no
+-        else
+-	  archive_cmds_need_lc_CXX=yes
+-        fi
+-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
+-      ;;
+-    esac
+-  fi
+-  ;;
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
 -shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -14225,7 +15035,20 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
 -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+if test "$GCC" = yes; then
-+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
 +else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
+ 
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
 +fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
  
-@@ -14290,7 +15113,7 @@
- amigaos*)
-   library_names_spec='$libname.ixlibrary $libname.a'
-   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
+-    case $host_os in
+-      aix4 | aix4.[01] | aix4.[01].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	:
++      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
++	allow_undefined_flag_CXX="-z nodefs"
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+       else
+-	can_build_shared=no
++	# Determine the default libpath from the value encoded in an empty executable.
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	no_undefined_flag_CXX=' ${wl}-bernotok'
++	allow_undefined_flag_CXX=' ${wl}-berok'
++	# Exported symbols can be pulled into shared objects from archives
++	whole_archive_flag_spec_CXX='$convenience'
++	archive_cmds_need_lc_CXX=yes
++	# This is similar to how AIX traditionally builds its shared libraries.
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+-      ;;
+-    esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    fi
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag_CXX=unsupported
++      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+     else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
++      ld_shlibs_CXX=no
+     fi
+-    shlibpath_var=LIBPATH
+-  fi
+-  ;;
++    ;;
+ 
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 -  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-   ;;
+-  ;;
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
  
- beos*)
-@@ -14299,7 +15122,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
++    # as there is no search path for DLLs.
++    hardcode_libdir_flag_spec_CXX='-L$libdir'
++    allow_undefined_flag_CXX=unsupported
++    always_export_symbols_CXX=no
++    enable_shared_with_static_runtimes_CXX=yes
  
 -bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14315,7 +15138,7 @@
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++    else
++      ld_shlibs_CXX=no
++    fi
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      archive_cmds_need_lc_CXX=no
++      hardcode_direct_CXX=no
++      hardcode_automatic_CXX=yes
++      hardcode_shlibpath_var_CXX=unsupported
++      whole_archive_flag_spec_CXX=''
++      link_all_deplibs_CXX=yes
  
- cygwin* | mingw* | pw32*)
-   version_type=windows
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
 -  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
+-  need_version=no
+-  need_lib_prefix=no
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_CXX=no
++          ;;
++      esac
++      fi
++        ;;
  
-@@ -14327,7 +15150,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
 -      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -14357,7 +15181,7 @@
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
++  dgux*)
++    case $cc_basename in
++      ec++*)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      ghcx*)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  freebsd[12]*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    ld_shlibs_CXX=no
++    ;;
++  freebsd-elf*)
++    archive_cmds_need_lc_CXX=no
++    ;;
++  freebsd* | dragonfly*)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    ld_shlibs_CXX=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
++    export_dynamic_flag_spec_CXX='${wl}-E'
++    hardcode_direct_CXX=yes
++    hardcode_minus_L_CXX=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
+ 
+-    case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++    case $cc_basename in
++    CC*)
++      # FIXME: insert proper C++ library support
++      ld_shlibs_CXX=no
        ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++    aCC*)
++      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
+       fi
+       ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
 -      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
+-      ;;
      esac
      ;;
-@@ -14380,7 +15204,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_CXX=:
+ 
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
+-
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+-  soname_spec='${libname}${release}${major}$shared_ext'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14403,20 +15227,17 @@
-   dynamic_linker=no
-   ;;
- 
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
+-
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
+-
 -kfreebsd*-gnu*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -7959,103 +24515,261 @@
 -
 -freebsd*)
 -  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -14434,14 +15255,19 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
++      case $host_cpu in
++      hppa*64*|ia64*)
++	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
++        ;;
++      *)
++	export_dynamic_flag_spec_CXX='${wl}-E'
++        ;;
++      esac
++    fi
++    case $host_cpu in
++    hppa*64*|ia64*)
++      hardcode_direct_CXX=no
++      hardcode_shlibpath_var_CXX=no
+       ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
++    *)
++      hardcode_direct_CXX=yes
++      hardcode_minus_L_CXX=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
+       ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
 -  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
 -  *) # from 3.2 on
-+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
-+  freebsd*) # from 4.6 on
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-   esac
-   ;;
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
+-
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
++    esac
  
-@@ -14461,9 +15287,9 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
 -  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
+-  ia64*)
 -    shrext='.so'
-+    shrext_cmds='.so'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.so"
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -14478,7 +15304,7 @@
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+-    else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+-    fi
+-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    case $cc_basename in
++      CC*)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      aCC*)
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	esac
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case $host_cpu in
++	    hppa*64*)
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    ia64*)
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    *)
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
      ;;
-    hppa*64*)
+-   hppa*64*)
 -     shrext='.sl'
-+     shrext_cmds='.sl'
-      hardcode_into_libs=yes
-      dynamic_linker="$host_os dld.sl"
-      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14489,7 +15315,7 @@
-      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-      ;;
-    *)
+-     hardcode_into_libs=yes
+-     dynamic_linker="$host_os dld.sl"
+-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-     soname_spec='${libname}${release}${shared_ext}$major'
+-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-     ;;
+-   *)
 -    shrext='.sl'
-+    shrext_cmds='.sl'
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=SHLIB_PATH
-     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14501,6 +15327,18 @@
-   postinstall_cmds='chmod 555 $lib'
-   ;;
+-    dynamic_linker="$host_os dld.sl"
+-    shlibpath_var=SHLIB_PATH
+-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
++  interix3*)
++    hardcode_direct_CXX=no
++    hardcode_shlibpath_var_CXX=no
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    export_dynamic_flag_spec_CXX='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+     ;;
+-  esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC*)
++	# SGI C++
++	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
-+interix3*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- irix5* | irix6* | nonstopux*)
-   case $host_os in
-     nonstopux*) version_type=nonstopux ;;
-@@ -14544,29 +15382,26 @@
-   ;;
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
+-    ;;
+-  *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	  else
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	link_all_deplibs_CXX=yes
++	;;
+     esac
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
+     ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-  hardcode_into_libs=yes
+-  ;;
++  linux* | k*bsd*-gnu)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
  
- # This must be Linux ELF.
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
+-  ;;
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 
+-# This must be Linux ELF.
 -linux*)
-+linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
 -    # Some platforms are per default 64-bit, so there's no /lib64
@@ -8063,79 +24777,205 @@
 -      libsuff=64
 -    fi
 -  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
 -  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
 -  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
+-
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
+-  ;;
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
  
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
-+
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-   # powerpc, because MkLinux only supported shared libraries with the
-   # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -14576,6 +15411,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -14585,7 +15432,7 @@
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -14613,8 +15460,13 @@
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc*)
++	# Intel C++
++	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
++	archive_cmds_need_lc_CXX=no
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      pgCC*)
++        # 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'
  
- openbsd*)
-   version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-   need_lib_prefix=no
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
++	# Compaq C++
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+-nto-qnx*)
+-  version_type=linux
+-  need_lib_prefix=no
 -  need_version=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -14634,7 +15486,7 @@
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++	runpath_var=LD_RUN_PATH
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
  
- os2*)
-   libname_spec='$name'
+-openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx*)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
+ 	;;
+       *)
+-	shlibpath_overrides_runpath=yes
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
+ 	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
+-
+-os2*)
+-  libname_spec='$name'
 -  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -14652,13 +15504,6 @@
-   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-   ;;
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
++    esac
++    ;;
++  netbsd* | netbsdelf*-gnu)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      hardcode_libdir_flag_spec_CXX='-R$libdir'
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    ld_shlibs_CXX=no
++    ;;
++  openbsd*)
++    hardcode_direct_CXX=yes
++    hardcode_shlibpath_var_CXX=no
++    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      export_dynamic_flag_spec_CXX='${wl}-E'
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
  
 -sco3.2v5*)
 -  version_type=osf
@@ -8143,73 +24983,157 @@
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
--
- solaris*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -14684,7 +15529,7 @@
-   need_version=yes
-   ;;
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
  
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
+ 
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ 
 -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14717,6 +15562,29 @@
-   fi
-   ;;
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
+-  esac
+-  ;;
++	;;
++      RCC*)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx*)
++	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+    shlibpath_overrides_runpath=no
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    shlibpath_overrides_runpath=yes
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	hardcode_libdir_separator_CXX=:
+ 
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
-+
- uts4*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14732,12 +15600,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
- test "$dynamic_linker" = no && can_build_shared=no
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
-+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"
-+fi
-+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
+-*)
+-  dynamic_linker=no
+-  ;;
+-esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
+-test "$dynamic_linker" = no && can_build_shared=no
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
+ 
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-hardcode_action_CXX=
+-if test -n "$hardcode_libdir_flag_spec_CXX" || \
 -   test -n "$runpath_var CXX" || \
 -   test "X$hardcode_automatic_CXX"="Xyes" ; then
-+   test -n "$runpath_var_CXX" || \
-+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
  
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_CXX" != no &&
-@@ -14769,970 +15642,152 @@
-   enable_fast_install=needless
- fi
- 
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct_CXX" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+-     test "$hardcode_minus_L_CXX" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action_CXX=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action_CXX=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action_CXX=unsupported
+-fi
+-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+-echo "${ECHO_T}$hardcode_action_CXX" >&6
+-
+-if test "$hardcode_action_CXX" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
+-
 -striplib=
 -old_striplib=
 -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
@@ -8235,10 +25159,20 @@
 -   *)
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
--    ;;
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
+     ;;
 -  esac
 -fi
--
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
 -if test "x$enable_dlopen" != xyes; then
 -  enable_dlopen=unknown
 -  enable_dlopen_self=unknown
@@ -8246,24 +25180,48 @@
 -else
 -  lt_cv_dlopen=no
 -  lt_cv_dlopen_libs=
--
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
 -  case $host_os in
 -  beos*)
 -    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
 -    ;;
--
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
+ 
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
 -   ;;
--
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
++	;;
++      RCC*)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx*)
++	allow_undefined_flag_CXX=' -expect_unresolved \*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
++	  $rm $lib.exp'
+ 
 -  cygwin*)
 -    lt_cv_dlopen="dlopen"
 -    lt_cv_dlopen_libs=
 -   ;;
--
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
+ 
 -  darwin*)
 -  # if libdl is installed we need to link against it
 -    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -8279,6 +25237,20 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -8304,7 +25276,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -8320,63 +25293,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  # See if we are running on zsh, and set the options which allow our commands through
-+  # without removal of \ escapes.
-+  if test -n "${ZSH_VERSION+set}" ; then
-+    setopt NO_GLOB_SUBST
-+  fi
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+    SED SHELL STRIP \
-+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+    deplibs_check_method reload_flag reload_cmds need_locks \
-+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+    lt_cv_sys_global_symbol_to_c_name_address \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    old_postinstall_cmds old_postuninstall_cmds \
-+    compiler_CXX \
-+    CC_CXX \
-+    LD_CXX \
-+    lt_prog_compiler_wl_CXX \
-+    lt_prog_compiler_pic_CXX \
-+    lt_prog_compiler_static_CXX \
-+    lt_prog_compiler_no_builtin_flag_CXX \
-+    export_dynamic_flag_spec_CXX \
-+    thread_safe_flag_spec_CXX \
-+    whole_archive_flag_spec_CXX \
-+    enable_shared_with_static_runtimes_CXX \
-+    old_archive_cmds_CXX \
-+    old_archive_from_new_cmds_CXX \
-+    predep_objects_CXX \
-+    postdep_objects_CXX \
-+    predeps_CXX \
-+    postdeps_CXX \
-+    compiler_lib_search_path_CXX \
-+    archive_cmds_CXX \
-+    archive_expsym_cmds_CXX \
-+    postinstall_cmds_CXX \
-+    postuninstall_cmds_CXX \
-+    old_archive_from_expsyms_cmds_CXX \
-+    allow_undefined_flag_CXX \
-+    no_undefined_flag_CXX \
-+    export_symbols_cmds_CXX \
-+    hardcode_libdir_flag_spec_CXX \
-+    hardcode_libdir_flag_spec_ld_CXX \
-+    hardcode_libdir_separator_CXX \
-+    hardcode_automatic_CXX \
-+    module_cmds_CXX \
-+    module_expsym_cmds_CXX \
-+    lt_cv_prog_compiler_c_o_CXX \
-+    exclude_expsyms_CXX \
-+    include_expsyms_CXX; do
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -8389,43 +25307,74 @@
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
-+    case $var in
-+    old_archive_cmds_CXX | \
-+    old_archive_from_new_cmds_CXX | \
-+    archive_cmds_CXX | \
-+    archive_expsym_cmds_CXX | \
-+    module_cmds_CXX | \
-+    module_expsym_cmds_CXX | \
-+    old_archive_from_expsyms_cmds_CXX | \
-+    export_symbols_cmds_CXX | \
-+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
  
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
-+  case $lt_echo in
-+  *'\$0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
 +    ;;
-+  esac
++  psos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC*)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      lcc*)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC*)
++	# Sun C++ 4.2, 5.x and Centerline C++
++        archive_cmds_need_lc_CXX=yes
++	no_undefined_flag_CXX=' -zdefs'
++	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
  
 -fi
-+cfgfile="$ofile"
++	hardcode_libdir_flag_spec_CXX='-R$libdir'
++	hardcode_shlibpath_var_CXX=no
++	case $host_os in
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  *)
++	    # The C++ compiler is used as linker so we must use $wl
++	    # flag to pass the commands to the underlying system
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++	    ;;
++	esac
++	link_all_deplibs_CXX=yes
  
 -   ;;
-+  cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++	output_verbose_link_cmd='echo'
  
 -  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -8442,26 +25391,54 @@
 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shl_load innocuous_shl_load
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx*)
++	# Green Hills C++ Compiler
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++	# The C++ compiler must be used to create the archive.
++	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
  
 -#undef shl_load
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -8482,8 +25459,16 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	fi
++	;;
++    esac
++    ;;
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++    no_undefined_flag_CXX='${wl}-z,text'
++    archive_cmds_need_lc_CXX=no
++    hardcode_shlibpath_var_CXX=no
++    runpath_var='LD_RUN_PATH'
  
 -int
 -main ()
@@ -8502,7 +25487,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -8518,8 +25504,42 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++    case $cc_basename in
++      CC*)
++	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    no_undefined_flag_CXX='${wl}-z,text'
++    allow_undefined_flag_CXX='${wl}-z,nodefs'
++    archive_cmds_need_lc_CXX=no
++    hardcode_shlibpath_var_CXX=no
++    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    hardcode_libdir_separator_CXX=':'
++    link_all_deplibs_CXX=yes
++    export_dynamic_flag_spec_CXX='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
  
 -ac_cv_func_shl_load=no
 -fi
@@ -8544,8 +25564,42 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++    case $cc_basename in
++      CC*)
++	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC*)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++esac
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
++test "$ld_shlibs_CXX" = no && can_build_shared=no
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -8556,7 +25610,17 @@
 -char shl_load ();
 -int
 -main ()
--{
++GCC_CXX="$GXX"
++LD_CXX="$LD"
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++
++cat > conftest.$ac_ext <<EOF
++class Foo
+ {
 -shl_load ();
 -  ;
 -  return 0;
@@ -8571,7 +25635,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -8580,17 +25645,25 @@
 -	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_lib_dld_shl_load=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++  (exit $ac_status); }; then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
  
 -ac_cv_lib_dld_shl_load=no
 -fi
@@ -8617,30 +25690,38 @@
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
  
 -#undef dlopen
-+# A C compiler.
-+LTCC=$lt_LTCC
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -8661,8 +25742,29 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$compiler_lib_search_path_CXX"; then
++	     compiler_lib_search_path_CXX="${prev}${p}"
++	   else
++	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$postdeps_CXX"; then
++	   postdeps_CXX="${prev}${p}"
++	 else
++	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
++	 fi
++       fi
++       ;;
  
 -int
 -main ()
@@ -8681,7 +25783,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -8697,9 +25800,7 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
- 
+-
 -ac_cv_func_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -8723,9 +25824,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -8750,7 +25849,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -8766,8 +25866,13 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -8793,7 +25898,21 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$predep_objects_CXX"; then
++	   predep_objects_CXX="$p"
++	 else
++	   predep_objects_CXX="$predep_objects_CXX $p"
++	 fi
++       else
++	 if test -z "$postdep_objects_CXX"; then
++	   postdep_objects_CXX="$p"
++	 else
++	   postdep_objects_CXX="$postdep_objects_CXX $p"
++	 fi
++       fi
++       ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -8818,7 +25937,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -8834,7 +25954,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    *) ;; # Ignore the rest.
+ 
 -ac_cv_lib_svld_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -8859,7 +25980,9 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    esac
++  done
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -8884,7 +26007,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -8897,7 +26021,9 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_lib_dld_dld_link=yes
--else
++  # Clean up.
++  rm -f a.out a.exe
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -8923,14 +26049,34 @@
 -fi
 -
 -
++  echo "libtool.m4: error: problem compiling CXX test program"
+ fi
+ 
++$rm -f confest.$objext
+ 
 -fi
--
--
--fi
--
--    ;;
--  esac
--
++# PORTME: override above test on systems where it is broken
++case $host_os in
++interix3*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  predep_objects_CXX=
++  postdep_objects_CXX=
++  postdeps_CXX=
++  ;;
+ 
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    postdeps_CXX='-lCstd -lCrun'
+     ;;
+   esac
++  ;;
++esac
+ 
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
@@ -8947,7 +26093,7 @@
 -
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
--
+ 
 -    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
 -if test "${lt_cv_dlopen_self+set}" = set; then
@@ -8959,15 +26105,23 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15399 "configure"
+-#line 15398 "configure"
 -#include "confdefs.h"
--
++case " $postdeps_CXX " in
++*" -lc "*) archive_cmds_need_lc_CXX=no ;;
++esac
+ 
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
--
++lt_prog_compiler_wl_CXX=
++lt_prog_compiler_pic_CXX=
++lt_prog_compiler_static_CXX=
+ 
 -#include <stdio.h>
--
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -8977,7 +26131,11 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
--
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    lt_prog_compiler_wl_CXX='-Wl,'
++    lt_prog_compiler_static_CXX='-static'
+ 
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -9031,7 +26189,61 @@
 -      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
 -      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
 -      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
--    esac
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_CXX='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_CXX='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      lt_prog_compiler_pic_CXX=
++      ;;
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_CXX=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	;;
++      *)
++	lt_prog_compiler_pic_CXX='-fPIC'
++	;;
++      esac
++      ;;
++    *)
++      lt_prog_compiler_pic_CXX='-fPIC'
++      ;;
+     esac
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self=no
@@ -9057,7 +26269,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15497 "configure"
+-#line 15496 "configure"
 -#include "confdefs.h"
 -
 -#if HAVE_DLFCN_H
@@ -9129,38 +26341,296 @@
 -      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
 -      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
 -      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
--    esac
++  else
++    case $host_os in
++      aix4* | aix5*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  lt_prog_compiler_static_CXX='-Bstatic'
++	else
++	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68*)
++	  # Green Hills C++ Compiler
++	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           lt_prog_compiler_pic_CXX='-qnocommon'
++           lt_prog_compiler_wl_CXX='-Wl,'
++           ;;
++         esac
++       ;;
++      dgux*)
++	case $cc_basename in
++	  ec++*)
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  ghcx*)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | dragonfly*)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC*)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
++	    if test "$host_cpu" != ia64; then
++	      lt_prog_compiler_pic_CXX='+Z'
++	    fi
++	    ;;
++	  aCC*)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
++	    case $host_cpu in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      lt_prog_compiler_pic_CXX='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC*)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux* | k*bsd*-gnu)
++	case $cc_basename in
++	  KCC*)
++	    # KAI C++ Compiler
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  icpc* | ecpc*)
++	    # Intel C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-static'
++	    ;;
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-fpic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  cxx*)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx*)
++	    lt_prog_compiler_pic_CXX='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd* | netbsdelf*-gnu)
++	;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC*)
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    ;;
++	  RCC*)
++	    # Rational C++ 2.4.1
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  cxx*)
++	    # Digital/Compaq C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    lt_prog_compiler_wl_CXX='-Qoption ld '
++	    ;;
++	  gcx*)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.x
++	    lt_prog_compiler_pic_CXX='-pic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  lcc*)
++	    # Lucid
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC*)
++	    # NonStop-UX NCC 3.20
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	esac
++	;;
++      vxworks*)
++	;;
++      *)
++	lt_prog_compiler_can_build_shared_CXX=no
++	;;
+     esac
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self_static=no
--  fi
+   fi
 -fi
 -rm -fr conftest*
 -
--
+ 
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 -    fi
--
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+ 
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
--
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_CXX"; then
+ 
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
--
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_CXX=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:16500: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:16504: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       lt_prog_compiler_pic_works_CXX=yes
++     fi
++   fi
++   $rm conftest*
+ 
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
 -  esac
--fi
--
--
+ fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+ 
++if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++    case $lt_prog_compiler_pic_CXX in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
++     esac
++else
++    lt_prog_compiler_pic_CXX=
++     lt_prog_compiler_can_build_shared_CXX=no
++fi
+ 
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
 -# with your package, and you will get complaints that there are
@@ -9296,61 +26766,2495 @@
 -
 -# The linker used to build libraries.
 -LD=$lt_LD_CXX
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_CXX
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++fi
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_CXX=
++    ;;
++  *)
++    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
++    ;;
++esac
+ 
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works_CXX=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works_CXX=yes
++       fi
++     else
++       lt_prog_compiler_static_works_CXX=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
+ 
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+ 
+-# Do we need a version for libraries?
+-need_version=$need_version
++if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++    :
++else
++    lt_prog_compiler_static_CXX=
++fi
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_CXX=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:16604: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:16608: \$? = $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
++     # So say no if there are warnings
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_c_o_CXX=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_CXX
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+ 
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
+ 
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix4* | aix5*)
++    # 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
++      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    else
++      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    export_symbols_cmds_CXX="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs_CXX=no
++  ;;
++  *)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
+ 
+-# Library versioning type.
+-version_type=$version_type
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
++test "$ld_shlibs_CXX" = no && can_build_shared=no
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_CXX" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_CXX=yes
+ 
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_CXX in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_CXX
++	pic_flag=$lt_prog_compiler_pic_CXX
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++        allow_undefined_flag_CXX=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_CXX=no
++        else
++	  archive_cmds_need_lc_CXX=yes
++        fi
++        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
++      ;;
++    esac
++  fi
++  ;;
++esac
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_CXX
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
+ 
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_CXX
+-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_CXX
+-module_expsym_cmds=$lt_module_expsym_cmds_CXX
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_CXX
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_CXX
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_CXX
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_CXX
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
+ 
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
++freebsd1*)
++  dynamic_linker=no
++  ;;
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
+ 
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case $host_cpu in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_CXX
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct_CXX
++openbsd*)
++  version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
+ 
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L_CXX
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$hardcode_automatic_CXX
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_CXX
++sysv4 | sysv4.3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_CXX"
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols_CXX
++*)
++  dynamic_linker=no
++  ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_CXX
++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"
++fi
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
++hardcode_action_CXX=
++if test -n "$hardcode_libdir_flag_spec_CXX" || \
++   test -n "$runpath_var_CXX" || \
++   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_CXX
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_CXX" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
++     test "$hardcode_minus_L_CXX" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_CXX=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_CXX=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_CXX=unsupported
++fi
++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_CXX
++if test "$hardcode_action_CXX" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
+ 
+-# ### END LIBTOOL TAG CONFIG: $tagname
+ 
+-__EOF__
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_CXX \
++    CC_CXX \
++    LD_CXX \
++    lt_prog_compiler_wl_CXX \
++    lt_prog_compiler_pic_CXX \
++    lt_prog_compiler_static_CXX \
++    lt_prog_compiler_no_builtin_flag_CXX \
++    export_dynamic_flag_spec_CXX \
++    thread_safe_flag_spec_CXX \
++    whole_archive_flag_spec_CXX \
++    enable_shared_with_static_runtimes_CXX \
++    old_archive_cmds_CXX \
++    old_archive_from_new_cmds_CXX \
++    predep_objects_CXX \
++    postdep_objects_CXX \
++    predeps_CXX \
++    postdeps_CXX \
++    compiler_lib_search_path_CXX \
++    archive_cmds_CXX \
++    archive_expsym_cmds_CXX \
++    postinstall_cmds_CXX \
++    postuninstall_cmds_CXX \
++    old_archive_from_expsyms_cmds_CXX \
++    allow_undefined_flag_CXX \
++    no_undefined_flag_CXX \
++    export_symbols_cmds_CXX \
++    hardcode_libdir_flag_spec_CXX \
++    hardcode_libdir_flag_spec_ld_CXX \
++    hardcode_libdir_separator_CXX \
++    hardcode_automatic_CXX \
++    module_cmds_CXX \
++    module_expsym_cmds_CXX \
++    lt_cv_prog_compiler_c_o_CXX \
++    exclude_expsyms_CXX \
++    include_expsyms_CXX; do
+ 
++    case $var in
++    old_archive_cmds_CXX | \
++    old_archive_from_new_cmds_CXX | \
++    archive_cmds_CXX | \
++    archive_expsym_cmds_CXX | \
++    module_cmds_CXX | \
++    module_expsym_cmds_CXX | \
++    old_archive_from_expsyms_cmds_CXX | \
++    export_symbols_cmds_CXX | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
+ 
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  test -f Makefile && make "$ltmain"
+-fi
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
+ 
++cfgfile="$ofile"
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+ 
+-CC=$lt_save_CC
+-LDCXX=$LD
+-LD=$lt_save_LD
+-GCC=$lt_save_GCC
+-with_gnu_ldcxx=$with_gnu_ld
+-with_gnu_ld=$lt_save_with_gnu_ld
+-lt_cv_path_LDCXX=$lt_cv_path_LD
+-lt_cv_path_LD=$lt_save_path_LD
+-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+-	else
+-	  tagname=""
+-	fi
+-	;;
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+ 
+-      F77)
+-	if test -n "$F77" && test "X$F77" != "Xno"; then
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
+ 
+-ac_ext=f
+-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
+ 
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
+ 
+-archive_cmds_need_lc_F77=no
+-allow_undefined_flag_F77=
+-always_export_symbols_F77=no
+-archive_expsym_cmds_F77=
+-export_dynamic_flag_spec_F77=
+-hardcode_direct_F77=no
+-hardcode_libdir_flag_spec_F77=
+-hardcode_libdir_flag_spec_ld_F77=
+-hardcode_libdir_separator_F77=
+-hardcode_minus_L_F77=no
+-hardcode_automatic_F77=no
+-module_cmds_F77=
+-module_expsym_cmds_F77=
+-link_all_deplibs_F77=unknown
+-old_archive_cmds_F77=$old_archive_cmds
+-no_undefined_flag_F77=
+-whole_archive_flag_spec_F77=
+-enable_shared_with_static_runtimes_F77=no
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+ 
+-# Source file extension for f77 test sources.
+-ac_ext=f
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
+ 
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-objext_F77=$objext
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++# A C compiler.
++LTCC=$lt_LTCC
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+ 
++# A language-specific compiler.
++CC=$lt_compiler_CXX
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-compiler_F77=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
+ 
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+-test "$can_build_shared" = "no" && enable_shared=no
 +# The linker used to build libraries.
 +LD=$lt_LD_CXX
  
- # Whether we need hard or soft links.
- LN_S=$lt_LN_S
-@@ -15741,7 +15796,7 @@
- NM=$lt_NM
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case "$host_os" in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+-  fi
+-  ;;
+-aix4*)
+-  test "$enable_shared" = yes && enable_static=no
+-  ;;
+-esac
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
  
- # A symbol stripping program
--STRIP=$STRIP
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
++# A BSD-compatible nm program.
++NM=$lt_NM
+ 
+-test "$ld_shlibs_F77" = no && can_build_shared=no
++# A symbol stripping program
 +STRIP=$lt_STRIP
  
- # Used to examine libraries when file_magic_cmd begins "file"
- MAGIC_CMD=$MAGIC_CMD
-@@ -15772,7 +15827,7 @@
- libext="$libext"
+-GCC_F77="$G77"
+-LD_F77="$LD"
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
  
- # Shared library suffix (normally ".so").
--shrext='$shrext'
+-lt_prog_compiler_wl_F77=
+-lt_prog_compiler_pic_F77=
+-lt_prog_compiler_static_F77=
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
+ 
+-  if test "$GCC" = yes; then
+-    lt_prog_compiler_wl_F77='-Wl,'
+-    lt_prog_compiler_static_F77='-static'
++# Used on cygwin: assembler.
++AS="$AS"
+ 
+-    case $host_os in
+-      aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static_F77='-Bstatic'
+-      fi
+-      ;;
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+ 
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+-      ;;
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
+ 
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+-      ;;
++# Object file suffix (normally "o").
++objext="$ac_objext"
+ 
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_prog_compiler_pic_F77='-fno-common'
+-      ;;
++# Old archive suffix (normally "a").
++libext="$libext"
+ 
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      lt_prog_compiler_can_build_shared_F77=no
+-      enable_shared=no
+-      ;;
++# Shared library suffix (normally ".so").
 +shrext_cmds='$shrext_cmds'
  
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -15787,7 +15842,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic_F77=-Kconform_pic
+-      fi
+-      ;;
++# Executable file suffix (normally "").
++exeext="$exeext"
  
--# Must we lock files when doing compilation ?
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case "$host_cpu" in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	lt_prog_compiler_pic_F77='-fPIC'
+-	;;
+-      esac
+-      ;;
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+ 
+-    *)
+-      lt_prog_compiler_pic_F77='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static_F77='-Bstatic'
+-      else
+-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+-      ;;
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+ 
+-    hpux9* | hpux10* | hpux11*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case "$host_cpu" in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	lt_prog_compiler_pic_F77='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+-      ;;
 +# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
++need_locks=$lt_need_locks
  
- # Do we need the lib prefix for modules?
-@@ -15989,7 +16044,10 @@
-   # If there is no Makefile yet, we rely on a make rule to execute
-   # `config.status --recheck' to rerun these tests and create the
-   # libtool script then.
--  test -f Makefile && make "$ltmain"
+-    irix5* | irix6* | nonstopux*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      lt_prog_compiler_static_F77='-non_shared'
+-      ;;
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+ 
+-    newsos6)
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++# Do we need a version for libraries?
++need_version=$need_version
+ 
+-    linux*)
+-      case $CC in
+-      icc* | ecc*)
+-	lt_prog_compiler_wl_F77='-Wl,'
+-	lt_prog_compiler_pic_F77='-KPIC'
+-	lt_prog_compiler_static_F77='-static'
+-        ;;
+-      ccc*)
+-        lt_prog_compiler_wl_F77='-Wl,'
+-        # All Alpha code is PIC.
+-        lt_prog_compiler_static_F77='-non_shared'
+-        ;;
+-      esac
+-      ;;
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+ 
+-    osf3* | osf4* | osf5*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      # All OSF/1 code is PIC.
+-      lt_prog_compiler_static_F77='-non_shared'
+-      ;;
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_F77='-Kpic'
+-      lt_prog_compiler_static_F77='-dn'
+-      ;;
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+ 
+-    solaris*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
+ 
+-    sunos4*)
+-      lt_prog_compiler_wl_F77='-Qoption ld '
+-      lt_prog_compiler_pic_F77='-PIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	lt_prog_compiler_pic_F77='-Kconform_pic'
+-	lt_prog_compiler_static_F77='-Bstatic'
+-      fi
+-      ;;
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+ 
+-    uts4*)
+-      lt_prog_compiler_pic_F77='-pic'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+ 
+-    *)
+-      lt_prog_compiler_can_build_shared_F77=no
+-      ;;
+-    esac
+-  fi
++# Library versioning type.
++version_type=$version_type
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+ 
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$lt_prog_compiler_pic_F77"; then
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_prog_compiler_pic_works_F77=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16319: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
+-   echo "$as_me:16323: \$? = $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
+-     if test ! -s conftest.err; then
+-       lt_prog_compiler_pic_works_F77=yes
+-     fi
+-   fi
+-   $rm conftest*
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+-    case $lt_prog_compiler_pic_F77 in
+-     "" | " "*) ;;
+-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+-     esac
+-else
+-    lt_prog_compiler_pic_F77=
+-     lt_prog_compiler_can_build_shared_F77=no
+-fi
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+ 
+-fi
+-case "$host_os" in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    lt_prog_compiler_pic_F77=
+-    ;;
+-  *)
+-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
+-    ;;
+-esac
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_prog_compiler_c_o_F77=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
+ 
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16386: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
+-   echo "$as_me:16390: \$? = $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
+-     # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
+-       lt_cv_prog_compiler_c_o_F77=yes
+-     fi
+-   fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
+ 
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
+ 
+-hard_links="nottested"
+-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
+-  if test "$hard_links" = no; then
+-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
+-fi
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
+ 
+-  runpath_var=
+-  allow_undefined_flag_F77=
+-  enable_shared_with_static_runtimes_F77=no
+-  archive_cmds_F77=
+-  archive_expsym_cmds_F77=
+-  old_archive_From_new_cmds_F77=
+-  old_archive_from_expsyms_cmds_F77=
+-  export_dynamic_flag_spec_F77=
+-  whole_archive_flag_spec_F77=
+-  thread_safe_flag_spec_F77=
+-  hardcode_libdir_flag_spec_F77=
+-  hardcode_libdir_flag_spec_ld_F77=
+-  hardcode_libdir_separator_F77=
+-  hardcode_direct_F77=no
+-  hardcode_minus_L_F77=no
+-  hardcode_shlibpath_var_F77=unsupported
+-  link_all_deplibs_F77=unknown
+-  hardcode_automatic_F77=no
+-  module_cmds_F77=
+-  module_expsym_cmds_F77=
+-  always_export_symbols_F77=no
+-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  include_expsyms_F77=
+-  # exclude_expsyms can be an extended regexp of symbols to exclude
+-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-  # as well as any symbol that contains `d'.
+-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-  # platforms (ab)use it in PIC code, but their linkers get confused if
+-  # the symbol is explicitly referenced.  Since portable code cannot
+-  # rely on this symbol name, it's probably fine to never include it in
+-  # preloaded symbol tables.
+-  extract_expsyms_cmds=
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    if test "$GCC" != yes; then
+-      with_gnu_ld=no
+-    fi
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+ 
+-  ld_shlibs_F77=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+ 
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	ld_shlibs_F77=no
+-	cat <<EOF 1>&2
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
+ 
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+ 
+-EOF
+-      fi
+-      ;;
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+ 
+-    amigaos*)
+-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_minus_L_F77=yes
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+ 
+-      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      ld_shlibs_F77=no
+-      ;;
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	allow_undefined_flag_F77=unsupported
+-	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      allow_undefined_flag_F77=no
+-      always_export_symbols_F77=no
+-      enable_shared_with_static_runtimes_F77=yes
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ 
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	  cp $export_symbols $output_objdir/$soname.def;
+-	else
+-	  echo EXPORTS > $output_objdir/$soname.def;
+-	  cat $export_symbols >> $output_objdir/$soname.def;
+-	fi~
+-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+-      else
+-	ld_shlibs=no
+-      fi
+-      ;;
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
+ 
+-    solaris* | sysv5*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	ld_shlibs_F77=no
+-	cat <<EOF 1>&2
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
+ 
+-    sunos4*)
+-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+ 
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
+-    esac
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_CXX
+ 
+-    if test "$ld_shlibs_F77" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_F77=
+-      fi
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      allow_undefined_flag_F77=unsupported
+-      always_export_symbols_F77=yes
+-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-      # Note: this linker hardcodes the directories in LIBPATH if there
+-      # are no directories specified by -L.
+-      hardcode_minus_L_F77=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	hardcode_direct_F77=unsupported
+-      fi
+-      ;;
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_CXX
+ 
+-    aix4* | aix5*)
+-      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.
+-	aix_use_runtimelinking=no
+-	exp_sym_flag='-Bexport'
+-	no_entry_flag=""
+-      else
+-	# If we're using GNU nm, then we don't want the "-C" option.
+-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	fi
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+-	exp_sym_flag='-bexport'
+-	no_entry_flag='-bnoentry'
+-      fi
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_CXX
+ 
+-      # When large executables or shared objects are built, AIX ld can
+-      # have problems creating the table of contents.  If linking a library
+-      # or program results in "error TOC overflow" add -mminimal-toc to
+-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
+ 
+-      archive_cmds_F77=''
+-      hardcode_direct_F77=yes
+-      hardcode_libdir_separator_F77=':'
+-      link_all_deplibs_F77=yes
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_CXX
+ 
+-      if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
+-	# We only want to do this on AIX 4.2 and lower, the check
+-	# below for broken collect2 doesn't work under 4.3+
+-	  collect2name=`${CC} -print-prog-name=collect2`
+-	  if test -f "$collect2name" && \
+-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	  then
+-  	  # We have reworked collect2
+-  	  hardcode_direct_F77=yes
+-	  else
+-  	  # We have old collect2
+-  	  hardcode_direct_F77=unsupported
+-  	  # It fails to find uninstalled libraries when the uninstalled
+-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-  	  # to unsupported forces relinking
+-  	  hardcode_minus_L_F77=yes
+-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
+-  	  hardcode_libdir_separator_F77=
+-	  fi
+-	esac
+-	shared_flag='-shared'
+-      else
+-	# not using gcc
+-	if test "$host_cpu" = ia64; then
+-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-  	# chokes on -Wl,-G. The following line is correct:
+-	  shared_flag='-G'
+-	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
+-	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
+-	fi
+-      fi
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols_F77=no
+-      if test "$aix_use_runtimelinking" = yes; then
+-	# Warning - without using the other runtime loading flags (-brtl),
+-	# -berok will link without error, but may produce a broken library.
+-	allow_undefined_flag_F77='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
+-      program main
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+-      end
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_CXX"
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_CXX
+ 
+-	hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+-	  allow_undefined_flag_F77="-z nodefs"
+-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 cat >conftest.$ac_ext <<_ACEOF
+-      program main
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+-      end
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++# ### END LIBTOOL TAG CONFIG: $tagname
+ 
+-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	  # Warning - without using the other run time loading flags,
+-	  # -berok will link without error, but may produce a broken library.
+-	  no_undefined_flag_F77=' ${wl}-bernotok'
+-	  allow_undefined_flag_F77=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols_F77=yes
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec_F77=' '
+-	  archive_cmds_need_lc_F77=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
+-      fi
+-      ;;
++__EOF__
+ 
+-    amigaos*)
+-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_minus_L_F77=yes
+-      # see comment about different semantics on the GNU ld section
+-      ld_shlibs_F77=no
+-      ;;
+ 
+-    bsdi4*)
+-      export_dynamic_flag_spec_F77=-rdynamic
+-      ;;
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
 +  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
 +  fi
- fi
++fi
  
+-    cygwin* | mingw* | pw32*)
+-      # When not using gcc, we currently assume that we are using
+-      # Microsoft Visual C++.
+-      # hardcode_libdir_flag_spec is actually meaningless, as there is
+-      # no search path for DLLs.
+-      hardcode_libdir_flag_spec_F77=' '
+-      allow_undefined_flag_F77=no
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      old_archive_From_new_cmds_F77='true'
+-      # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+-      enable_shared_with_static_runtimes_F77=yes
+-      ;;
  
-@@ -16061,16 +16119,42 @@
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
+-    darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc_F77=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.012)
+-	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
+-      esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      hardcode_direct_F77=no
+-      hardcode_automatic_F77=yes
+-      hardcode_shlibpath_var_F77=unsupported
+-      whole_archive_flag_spec_F77='-all_load $convenience'
+-      link_all_deplibs_F77=yes
+-    else
+-      ld_shlibs_F77=no
+-    fi
+-      ;;
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
  
+-    dgux*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_shlibpath_var_F77=no
+-      ;;
++	else
++	  tagname=""
++	fi
++	;;
+ 
+-    freebsd1*)
+-      ld_shlibs_F77=no
+-      ;;
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
+ 
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
+-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
++archive_cmds_need_lc_F77=no
++allow_undefined_flag_F77=
++always_export_symbols_F77=no
++archive_expsym_cmds_F77=
++export_dynamic_flag_spec_F77=
++hardcode_direct_F77=no
++hardcode_libdir_flag_spec_F77=
++hardcode_libdir_flag_spec_ld_F77=
++hardcode_libdir_separator_F77=
++hardcode_minus_L_F77=no
++hardcode_automatic_F77=no
++module_cmds_F77=
++module_expsym_cmds_F77=
++link_all_deplibs_F77=unknown
++old_archive_cmds_F77=$old_archive_cmds
++no_undefined_flag_F77=
++whole_archive_flag_spec_F77=
++enable_shared_with_static_runtimes_F77=no
+ 
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      fi
+-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      hardcode_direct_F77=yes
++# Source file extension for f77 test sources.
++ac_ext=f
+ 
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      hardcode_minus_L_F77=yes
+-      export_dynamic_flag_spec_F77='${wl}-E'
+-      ;;
++# Object file extension for compiled f77 test sources.
++objext=o
++objext_F77=$objext
+ 
+-    hpux10* | hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-	  ;;
+-	*)
+-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
+-	  ;;
+-	esac
+-      else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	*)
+-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+-	  hardcode_libdir_separator_F77=:
+-	  hardcode_direct_F77=no
+-	  hardcode_shlibpath_var_F77=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_F77='-L$libdir'
+-	  hardcode_direct_F77=no
+-	  hardcode_shlibpath_var_F77=no
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_F77=yes
+-	  ;;
+-	*)
+-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator_F77=:
+-	  hardcode_direct_F77=yes
+-	  export_dynamic_flag_spec_F77='${wl}-E'
++# Code to be used in simple link tests
++lt_simple_link_test_code="      program t\n      end\n"
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_F77=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
+-      fi
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      link_all_deplibs_F77=yes
+-      ;;
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
  
+-    newsos6)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      hardcode_shlibpath_var_F77=no
+-      ;;
++# Allow CC to be a program name with arguments.
++compiler=$CC
  
+-    openbsd*)
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_F77='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_F77='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
+ 
+-    os2*)
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_minus_L_F77=yes
+-      allow_undefined_flag_F77=unsupported
+-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
@@ -9363,14 +29267,34 @@
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- compiler_F77=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+ 
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	allow_undefined_flag_F77=' -expect_unresolved \*'
+-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      ;;
+ 
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      else
+-	allow_undefined_flag_F77=' -expect_unresolved \*'
+-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++compiler_F77=$CC
 +for cc_temp in $compiler""; do
 +  case $cc_temp in
 +    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -9380,66 +29304,396 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
  
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -16083,7 +16167,7 @@
+-	# Both c and cxx compiler support -rpath directly
+-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+-      fi
+-      hardcode_libdir_separator_F77=:
+-      ;;
  
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
+-    sco3.2v5*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_F77=no
+-      export_dynamic_flag_spec_F77='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
+ 
+-    solaris*)
+-      no_undefined_flag_F77=' -z text'
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+-      else
+-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      fi
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_shlibpath_var_F77=no
+-      case $host_os in
+-      solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+-      esac
+-      link_all_deplibs_F77=yes
+-      ;;
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
++test "$can_build_shared" = "no" && enable_shared=no
+ 
+-    sunos4*)
+-      if test "x$host_vendor" = xsequent; then
+-	# Use $CC to link under sequent, because it throws in some extra .o
+-	# files that make .init and .fini sections work.
+-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+-      else
+-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
 +case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -16091,8 +16175,10 @@
-     postinstall_cmds='$RANLIB $lib'
-   fi
-   ;;
--aix4*)
--  test "$enable_shared" = yes && enable_static=no
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
 +aix4* | aix5*)
 +  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 +    test "$enable_shared" = yes && enable_static=no
 +  fi
-   ;;
- esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16105,8 +16191,6 @@
- echo "$as_me:$LINENO: result: $enable_static" >&5
- echo "${ECHO_T}$enable_static" >&6
++  ;;
++esac
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
  
--test "$ld_shlibs_F77" = no && can_build_shared=no
--
- GCC_F77="$G77"
- LD_F77="$LD"
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_F77=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
+-	  hardcode_direct_F77=no
+-        ;;
+-	motorola)
+-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_F77=no
+-      ;;
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
  
-@@ -16153,6 +16237,11 @@
-       lt_prog_compiler_pic_F77='-fno-common'
+-    sysv4.3*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_F77=no
+-      export_dynamic_flag_spec_F77='-Bexport'
+-      ;;
++GCC_F77="$G77"
++LD_F77="$LD"
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_shlibpath_var_F77=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	ld_shlibs_F77=yes
+-      fi
+-      ;;
++lt_prog_compiler_wl_F77=
++lt_prog_compiler_pic_F77=
++lt_prog_compiler_static_F77=
+ 
+-    sysv4.2uw2*)
+-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=no
+-      hardcode_shlibpath_var_F77=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag_F77='${wl}-z ${wl}text'
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-      else
+-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl_F77='-Wl,'
++    lt_prog_compiler_static_F77='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_F77=no
        ;;
  
+-    sysv5*)
+-      no_undefined_flag_F77=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      hardcode_libdir_flag_spec_F77=
+-      hardcode_shlibpath_var_F77=no
+-      runpath_var='LD_RUN_PATH'
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    uts4*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_shlibpath_var_F77=no
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
+       ;;
+ 
+-    *)
+-      ld_shlibs_F77=no
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+       ;;
+-    esac
+-  fi
+-
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
+-test "$ld_shlibs_F77" = no && can_build_shared=no
+ 
+-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"
+-fi
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_F77='-fno-common'
++      ;;
+ 
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$archive_cmds_need_lc_F77" in
+-x|xyes)
+-  # Assume -lc should be added
+-  archive_cmds_need_lc_F77=yes
 +    interix3*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
-+
-     msdosdjgpp*)
-       # Just because we use GCC doesn't mean we suddenly get shared libraries
-       # on systems that don't support them.
-@@ -16169,7 +16258,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $archive_cmds_F77 in
+-    *'~'*)
+-      # FIXME: we may have to deal with multi-command sequences.
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_F77=no
++      enable_shared=no
+       ;;
+-    '$CC '*)
+-      # Test whether the compiler implicitly links with -lc since on some
+-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-      # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$lt_prog_compiler_wl_F77
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
+-        allow_undefined_flag_F77=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-        then
+-	  archive_cmds_need_lc_F77=no
+-        else
+-	  archive_cmds_need_lc_F77=yes
+-        fi
+-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_F77=-Kconform_pic
+       fi
+-      $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+       ;;
+-    esac
+-  fi
+-  ;;
+-esac
+-
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext=".so"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
+-
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
+ 
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
+-
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
 +      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -16195,6 +16284,16 @@
- 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='-fPIC'
++	;;
++      esac
++      ;;
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
++    *)
++      lt_prog_compiler_pic_F77='-fPIC'
++      ;;
++    esac
+   else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
++    # PORTME Check for flag to pass linker flags through the system compiler.
+     case $host_os in
+-      aix4 | aix4.[01] | aix4.[01].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	:
++    aix*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
+       else
+-	can_build_shared=no
++	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
+-    esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-    fi
+-    shlibpath_var=LIBPATH
+-  fi
+-  ;;
+-
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+-  ;;
+-
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
 +      darwin*)
 +        # PIC is the default on this platform
 +        # Common symbols not allowed in MH_DYLIB files
@@ -9451,30 +29705,97 @@
 +       esac
 +       ;;
  
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -16206,7 +16305,7 @@
-       lt_prog_compiler_wl_F77='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
--      case "$host_cpu" in
+-bsdi4*)
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
+-  ;;
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      ;;
+ 
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
+-  shrext=".dll"
+-  need_version=no
+-  need_lib_prefix=no
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
 +      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -16229,13 +16328,20 @@
-       lt_prog_compiler_static_F77='-Bstatic'
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
++      ;;
+ 
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
+ 
+-    case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++    newsos6)
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
        ;;
- 
--    linux*)
--      case $CC in
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-      else
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-      fi
++
 +    linux* | k*bsd*-gnu)
 +      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_F77='-Wl,'
- 	lt_prog_compiler_pic_F77='-KPIC'
- 	lt_prog_compiler_static_F77='-static'
-         ;;
++      icc* | ecc*)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-KPIC'
++	lt_prog_compiler_static_F77='-static'
++        ;;
 +      pgcc* | pgf77* | pgf90* | pgf95*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -9482,111 +29803,319 @@
 +	lt_prog_compiler_pic_F77='-fpic'
 +	lt_prog_compiler_static_F77='-Bstatic'
 +        ;;
-       ccc*)
-         lt_prog_compiler_wl_F77='-Wl,'
-         # All Alpha code is PIC.
-@@ -16250,15 +16356,15 @@
-       lt_prog_compiler_static_F77='-non_shared'
++      ccc*)
++        lt_prog_compiler_wl_F77='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_F77='-non_shared'
++        ;;
++      esac
        ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static_F77='-non_shared'
+       ;;
+-    esac
+-    ;;
  
--    sco3.2v5*)
--      lt_prog_compiler_pic_F77='-Kpic'
--      lt_prog_compiler_static_F77='-dn'
--      ;;
--
-     solaris*)
--      lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_pic_F77='-KPIC'
-       lt_prog_compiler_static_F77='-Bstatic'
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
++    solaris*)
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
 +      case $cc_basename in
 +      f77* | f90* | f95*)
 +	lt_prog_compiler_wl_F77='-Qoption ld ';;
 +      *)
 +	lt_prog_compiler_wl_F77='-Wl,';;
 +      esac
-       ;;
++      ;;
  
-     sunos4*)
-@@ -16267,7 +16373,7 @@
-       lt_prog_compiler_static_F77='-Bstatic'
-       ;;
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+-  soname_spec='${libname}${release}${major}$shared_ext'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
++    sunos4*)
++      lt_prog_compiler_wl_F77='-Qoption ld '
++      lt_prog_compiler_pic_F77='-PIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
  
--    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
 +    sysv4 | sysv4.2uw2* | sysv4.3*)
-       lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_pic_F77='-KPIC'
-       lt_prog_compiler_static_F77='-Bstatic'
-@@ -16280,6 +16386,17 @@
-       fi
-       ;;
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
  
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic_F77='-Kconform_pic'
++	lt_prog_compiler_static_F77='-Bstatic'
++      fi
++      ;;
+ 
+-kfreebsd*-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      lt_prog_compiler_wl_F77='-Wl,'
 +      lt_prog_compiler_pic_F77='-KPIC'
 +      lt_prog_compiler_static_F77='-Bstatic'
 +      ;;
-+
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
 +    unicos*)
 +      lt_prog_compiler_wl_F77='-Wl,'
 +      lt_prog_compiler_can_build_shared_F77=no
+       ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
++
++    uts4*)
++      lt_prog_compiler_pic_F77='-pic'
++      lt_prog_compiler_static_F77='-Bstatic'
+       ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  freebsd3.01* | freebsdelf3.01*)
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  *) # from 3.2 on
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
+ 
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
++    *)
++      lt_prog_compiler_can_build_shared_F77=no
 +      ;;
++    esac
++  fi
+ 
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  case "$host_cpu" in
+-  ia64*)
+-    shrext='.so'
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+-    else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+-    fi
+-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-    ;;
+-   hppa*64*)
+-     shrext='.sl'
+-     hardcode_into_libs=yes
+-     dynamic_linker="$host_os dld.sl"
+-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-     soname_spec='${libname}${release}${shared_ext}$major'
+-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-     ;;
+-   *)
+-    shrext='.sl'
+-    dynamic_linker="$host_os dld.sl"
+-    shlibpath_var=SHLIB_PATH
+-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    ;;
+-  esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
 +
-     uts4*)
-       lt_prog_compiler_pic_F77='-pic'
-       lt_prog_compiler_static_F77='-Bstatic'
-@@ -16314,18 +16431,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_F77"; then
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_F77=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_F77"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
 +   -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:16320: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16437: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16324: \$? = $ac_status" >&5
-+   echo "$as_me:16441: \$? = $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
--     if test ! -s conftest.err; then
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:18165: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:18169: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings other than the usual output.
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_F77=yes
-      fi
-    fi
-@@ -16346,7 +16465,7 @@
- fi
- 
- fi
--case "$host_os" in
++       lt_prog_compiler_pic_works_F77=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
++
++if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++    case $lt_prog_compiler_pic_F77 in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
++     esac
++else
++    lt_prog_compiler_pic_F77=
++     lt_prog_compiler_can_build_shared_F77=no
++fi
++
++fi
 +case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_F77=
-@@ -16356,50 +16475,90 @@
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_F77=
      ;;
- esac
+   *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
+-    esac
++    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
+     ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-  hardcode_into_libs=yes
+-  ;;
++esac
  
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
+-  ;;
 +#
 +# Check to make sure the static flag actually works.
 +#
 +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
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_cv_prog_compiler_c_o_F77=no
--   $rm -r conftest 2>/dev/null
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  lt_prog_compiler_static_works_F77=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -9608,81 +30137,192 @@
 +   fi
 +   $rm conftest*
 +   LDFLAGS="$save_LDFLAGS"
-+
+ 
+-# This must be Linux ELF.
+-linux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
-+
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+ 
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
+-  ;;
 +if test x"$lt_prog_compiler_static_works_F77" = xyes; then
 +    :
 +else
 +    lt_prog_compiler_static_F77=
 +fi
+ 
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
 +
-+
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 +if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  lt_cv_prog_compiler_c_o_F77=no
 +   $rm -r conftest 2>/dev/null
-    mkdir conftest
-    cd conftest
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--   # that will create temporary files in the current directory regardless of
--   # the output directory.  Thus, making CWD read-only will cause this test
--   # to fail, enabling locking or at least warning the user not to do parallel
--   # builds.
--   chmod -w .
--
-    lt_compiler_flag="-o out/conftest2.$ac_objext"
-    # Insert the option either (1) after the last *FLAGS variable, or
-    # (2) before a word containing "conftest.", or (3) at the end.
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
 +   -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:16387: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16541: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16391: \$? = $ac_status" >&5
-+   echo "$as_me:16545: \$? = $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
-      # So say no if there are warnings
--     if test ! -s out/conftest.err; then
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:18269: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:18273: \$? = $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
++     # So say no if there are warnings
 +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 +     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 +     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_F77=yes
-      fi
-    fi
--   chmod u+w .
--   $rm conftest* out/*
--   rmdir out
++       lt_cv_prog_compiler_c_o_F77=yes
++     fi
++   fi
 +   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
 +   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
 +   $rm out/* && rmdir out
-    cd ..
-    rmdir conftest
-    $rm conftest*
-@@ -16470,6 +16629,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
+   fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
++else
++  need_locks=no
++fi
+ 
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+-nto-qnx*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++  runpath_var=
++  allow_undefined_flag_F77=
++  enable_shared_with_static_runtimes_F77=no
++  archive_cmds_F77=
++  archive_expsym_cmds_F77=
++  old_archive_From_new_cmds_F77=
++  old_archive_from_expsyms_cmds_F77=
++  export_dynamic_flag_spec_F77=
++  whole_archive_flag_spec_F77=
++  thread_safe_flag_spec_F77=
++  hardcode_libdir_flag_spec_F77=
++  hardcode_libdir_flag_spec_ld_F77=
++  hardcode_libdir_separator_F77=
++  hardcode_direct_F77=no
++  hardcode_minus_L_F77=no
++  hardcode_shlibpath_var_F77=unsupported
++  link_all_deplibs_F77=unknown
++  hardcode_automatic_F77=no
++  module_cmds_F77=
++  module_expsym_cmds_F77=
++  always_export_symbols_F77=no
++  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_F77=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
 +  # Just being paranoid about ensuring that cc_basename is set.
 +  for cc_temp in $compiler""; do
 +  case $cc_temp in
@@ -9693,24 +30333,58 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -16480,6 +16649,10 @@
-       with_gnu_ld=no
-     fi
-     ;;
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
 +  interix*)
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-@@ -16490,6 +16663,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
  
+-openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
++  ld_shlibs_F77=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
+-os2*)
+-  libname_spec='$name'
+-  shrext=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
@@ -9731,48 +30405,142 @@
 +      *\ 2.11.*) ;; # other 2.11 versions
 +      *) supports_anon_versioning=yes ;;
 +    esac
+ 
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+ 
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
++EOF
++      fi
++      ;;
+ 
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
++      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_F77=no
+       ;;
+-    siemens)
+-      need_lib_prefix=no
 +
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -16527,7 +16721,7 @@
- 	allow_undefined_flag_F77=unsupported
- 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- 	# support --undefined.  This deserves some investigation.  FIXME
--	archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_F77=unsupported
++	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
 +	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       else
- 	ld_shlibs_F77=no
-       fi
-@@ -16537,13 +16731,13 @@
-       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-       # as there is no search path for DLLs.
-       hardcode_libdir_flag_spec_F77='-L$libdir'
--      allow_undefined_flag_F77=no
++      else
++	ld_shlibs_F77=no
++      fi
+       ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_F77='-L$libdir'
 +      allow_undefined_flag_F77=unsupported
-       always_export_symbols_F77=no
-       enable_shared_with_static_runtimes_F77=yes
--      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      always_export_symbols_F77=no
++      enable_shared_with_static_runtimes_F77=yes
 +      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- 
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--        archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 +        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- 	# If the export-symbols file already is a .def file (1st line
- 	# is EXPORTS), use it as is; otherwise, prepend...
- 	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16552,23 +16746,70 @@
- 	  echo EXPORTS > $output_objdir/$soname.def;
- 	  cat $export_symbols >> $output_objdir/$soname.def;
- 	fi~
--	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       else
--	ld_shlibs=no
++      else
 +	ld_shlibs_F77=no
 +      fi
-+      ;;
-+
+       ;;
+-  esac
+-  ;;
+ 
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
 +    interix3*)
 +      hardcode_direct_F77=no
 +      hardcode_shlibpath_var_F77=no
@@ -9787,7 +30555,13 @@
 +      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
-+
+ 
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
 +    linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -9807,7 +30581,14 @@
 +	  tmp_addflag=' -nofor_main' ;;
 +	esac
 +	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
+ 
+-*)
+-  dynamic_linker=no
+-  ;;
+-esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
+-test "$dynamic_linker" = no && can_build_shared=no
 +	if test $supports_anon_versioning = yes; then
 +	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
 +  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
@@ -9817,53 +30598,171 @@
 +	link_all_deplibs_F77=no
 +      else
 +	ld_shlibs_F77=no
-       fi
-       ;;
++      fi
++      ;;
  
--    netbsd*)
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-hardcode_action_F77=
+-if test -n "$hardcode_libdir_flag_spec_F77" || \
+-   test -n "$runpath_var F77" || \
+-   test "X$hardcode_automatic_F77"="Xyes" ; then
 +    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-       else
--	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
 +	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       fi
-       ;;
++      fi
++      ;;
  
--    solaris* | sysv5*)
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct_F77" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
+-     test "$hardcode_minus_L_F77" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action_F77=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action_F77=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action_F77=unsupported
+-fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
 +    solaris*)
-       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- 	ld_shlibs_F77=no
- 	cat <<EOF 1>&2
-@@ -16582,13 +16823,40 @@
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
  
- EOF
-       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-if test "$hardcode_action_F77" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-       else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-       ;;
+-   *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-    ;;
+-  esac
+-fi
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	ld_shlibs_F77=no
-       fi
-       ;;
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
  
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
 +	ld_shlibs_F77=no
 +	cat <<_LT_EOF 1>&2
-+
+ 
 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
 +*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
 +*** your PATH or compiler configuration so that the native linker is
 +*** used, and then restart.
-+
+ 
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_F77 \
+-    CC_F77 \
+-    LD_F77 \
+-    lt_prog_compiler_wl_F77 \
+-    lt_prog_compiler_pic_F77 \
+-    lt_prog_compiler_static_F77 \
+-    lt_prog_compiler_no_builtin_flag_F77 \
+-    export_dynamic_flag_spec_F77 \
+-    thread_safe_flag_spec_F77 \
+-    whole_archive_flag_spec_F77 \
+-    enable_shared_with_static_runtimes_F77 \
+-    old_archive_cmds_F77 \
+-    old_archive_from_new_cmds_F77 \
+-    predep_objects_F77 \
+-    postdep_objects_F77 \
+-    predeps_F77 \
+-    postdeps_F77 \
+-    compiler_lib_search_path_F77 \
+-    archive_cmds_F77 \
+-    archive_expsym_cmds_F77 \
+-    postinstall_cmds_F77 \
+-    postuninstall_cmds_F77 \
+-    old_archive_from_expsyms_cmds_F77 \
+-    allow_undefined_flag_F77 \
+-    no_undefined_flag_F77 \
+-    export_symbols_cmds_F77 \
+-    hardcode_libdir_flag_spec_F77 \
+-    hardcode_libdir_flag_spec_ld_F77 \
+-    hardcode_libdir_separator_F77 \
+-    hardcode_automatic_F77 \
+-    module_cmds_F77 \
+-    module_expsym_cmds_F77 \
+-    lt_cv_prog_compiler_c_o_F77 \
+-    exclude_expsyms_F77 \
+-    include_expsyms_F77; do
 +_LT_EOF
 +	;;
 +	*)
@@ -9877,57 +30776,89 @@
 +	;;
 +      esac
 +      ;;
+ 
+-    case $var in
+-    old_archive_cmds_F77 | \
+-    old_archive_from_new_cmds_F77 | \
+-    archive_cmds_F77 | \
+-    archive_expsym_cmds_F77 | \
+-    module_cmds_F77 | \
+-    module_expsym_cmds_F77 | \
+-    old_archive_from_expsyms_cmds_F77 | \
+-    export_symbols_cmds_F77 | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++    sunos4*)
++      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
+       ;;
 +
-     sunos4*)
-       archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-       wlarc=
-@@ -16598,24 +16866,19 @@
- 
      *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	ld_shlibs_F77=no
-       fi
++      else
++	ld_shlibs_F77=no
++      fi
        ;;
      esac
+-  done
  
--    if test "$ld_shlibs_F77" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_F77=
--      fi
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
 +    if test "$ld_shlibs_F77" = no; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec_F77=
 +      export_dynamic_flag_spec_F77=
 +      whole_archive_flag_spec_F77=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16627,7 +16890,7 @@
-       # Note: this linker hardcodes the directories in LIBPATH if there
-       # are no directories specified by -L.
-       hardcode_minus_L_F77=yes
--      if test "$GCC" = yes && test -z "$link_static_flag"; then
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_F77=unsupported
++      always_export_symbols_F77=yes
++      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_F77=yes
 +      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- 	# Neither direct hardcoding nor static linking is supported with a
- 	# broken collect2.
- 	hardcode_direct_F77=unsupported
-@@ -16649,9 +16912,21 @@
- 	else
- 	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- 	fi
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_F77=unsupported
++      fi
++      ;;
+ 
+-cfgfile="$ofile"
++    aix4* | aix5*)
++      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.
 +	aix_use_runtimelinking=no
-+
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
+ 
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 +	# 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.
@@ -9941,152 +30872,262 @@
 +	  ;;
 +	esac
  
--	# KDE requires run time linking.  Make it the default.
--	aix_use_runtimelinking=yes
- 	exp_sym_flag='-bexport'
- 	no_entry_flag='-bnoentry'
-       fi
-@@ -16668,7 +16943,7 @@
-       link_all_deplibs_F77=yes
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
  
-       if test "$GCC" = yes; then
--	case $host_os in aix4.012|aix4.012.*)
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds_F77=''
++      hardcode_direct_F77=yes
++      hardcode_libdir_separator_F77=':'
++      link_all_deplibs_F77=yes
++
++      if test "$GCC" = yes; then
 +	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16687,8 +16962,12 @@
-   	  hardcode_libdir_flag_spec_F77='-L$libdir'
-   	  hardcode_libdir_separator_F77=
- 	  fi
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_F77=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_F77=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_F77=yes
++  	  hardcode_libdir_flag_spec_F77='-L$libdir'
++  	  hardcode_libdir_separator_F77=
++	  fi
 +	  ;;
- 	esac
- 	shared_flag='-shared'
++	esac
++	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
 +	  shared_flag="$shared_flag "'${wl}-G'
 +	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -16696,22 +16975,23 @@
-   	# chokes on -Wl,-G. The following line is correct:
- 	  shared_flag='-G'
- 	else
--  	if test "$aix_use_runtimelinking" = yes; then
--	    shared_flag='-qmkshrobj ${wl}-G'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
 +	  if test "$aix_use_runtimelinking" = yes; then
 +	    shared_flag='${wl}-G'
- 	  else
--	    shared_flag='-qmkshrobj'
--  	fi
++	  else
 +	    shared_flag='${wl}-bM:SRE'
 +	  fi
- 	fi
-       fi
- 
--      # Let the compiler handle the export list.
--      always_export_symbols_F77=no
++	fi
++      fi
++
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols_F77=yes
-       if test "$aix_use_runtimelinking" = yes; then
- 	# Warning - without using the other runtime loading flags (-brtl),
- 	# -berok will link without error, but may produce a broken library.
- 	allow_undefined_flag_F77='-berok'
-        # Determine the default libpath from the value encoded in an empty executable.
--	cat >conftest.$ac_ext <<_ACEOF
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_F77='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
 +       cat >conftest.$ac_ext <<_ACEOF
-       program main
- 
-       end
-@@ -16752,14 +17032,13 @@
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
--	hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
--	archive_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
--	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
 +       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
 +	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
- 	if test "$host_cpu" = ia64; then
- 	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
- 	  allow_undefined_flag_F77="-z nodefs"
--	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_F77="-z nodefs"
 +	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- 	else
- 	 # Determine the default libpath from the value encoded in an empty executable.
- 	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16808,13 +17087,11 @@
- 	  # -berok will link without error, but may produce a broken library.
- 	  no_undefined_flag_F77=' ${wl}-bernotok'
- 	  allow_undefined_flag_F77=' ${wl}-berok'
--	  # -bexpall does not export symbols beginning with underscore (_)
--	  always_export_symbols_F77=yes
- 	  # Exported symbols can be pulled into shared objects from archives
--	  whole_archive_flag_spec_F77=' '
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+ 
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+ 
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_F77
++fi
+ 
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
++	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_F77=' ${wl}-bernotok'
++	  allow_undefined_flag_F77=' ${wl}-berok'
++	  # Exported symbols can be pulled into shared objects from archives
 +	  whole_archive_flag_spec_F77='$convenience'
- 	  archive_cmds_need_lc_F77=yes
--	  # This is similar to how AIX traditionally builds it's shared libraries.
--	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  archive_cmds_need_lc_F77=yes
 +	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-       ;;
-@@ -16827,7 +17104,7 @@
-       ld_shlibs_F77=no
-       ;;
++	fi
++      fi
++      ;;
  
--    bsdi4*)
+-# The host system.
+-host_alias=$host_alias
+-host=$host
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_F77=no
++      ;;
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
 +    bsdi[45]*)
-       export_dynamic_flag_spec_F77=-rdynamic
-       ;;
++      export_dynamic_flag_spec_F77=-rdynamic
++      ;;
  
-@@ -16837,68 +17114,68 @@
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
-       hardcode_libdir_flag_spec_F77=' '
--      allow_undefined_flag_F77=no
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_F77=' '
 +      allow_undefined_flag_F77=unsupported
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
--      shrext=".dll"
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
 +      shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
--      archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # FIXME: Setting linknames here is a bad hack.
 +      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-       # The linker will automatically build a .lib file if we build a DLL.
-       old_archive_From_new_cmds_F77='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_F77='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
 +      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_F77=yes
-       ;;
++      enable_shared_with_static_runtimes_F77=yes
++      ;;
  
-     darwin* | rhapsody*)
--    if test "$GXX" = yes ; then
--      archive_cmds_need_lc_F77=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
--	;;
--      *) # Darwin 1.3 on
--	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--	else
--	  case ${MACOSX_DEPLOYMENT_TARGET} in
--	    10.012)
--	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--	      ;;
--	    10.*)
--	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
--	      ;;
--	  esac
--	fi
--	;;
+-# A C compiler.
+-LTCC=$lt_LTCC
++    darwin* | rhapsody*)
 +      case $host_os in
 +        rhapsody* | darwin1.[012])
 +         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
@@ -10105,32 +31146,13 @@
 +           esac
 +         fi
 +         ;;
-       esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      esac
 +      archive_cmds_need_lc_F77=no
-       hardcode_direct_F77=no
-       hardcode_automatic_F77=yes
-       hardcode_shlibpath_var_F77=unsupported
--      whole_archive_flag_spec_F77='-all_load $convenience'
++      hardcode_direct_F77=no
++      hardcode_automatic_F77=yes
++      hardcode_shlibpath_var_F77=unsupported
 +      whole_archive_flag_spec_F77=''
-       link_all_deplibs_F77=yes
++      link_all_deplibs_F77=yes
 +    if test "$GCC" = yes ; then
 +    	output_verbose_link_cmd='echo'
 +        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
@@ -10138,8 +31160,7 @@
 +      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 +      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      ld_shlibs_F77=no
++    else
 +      case $cc_basename in
 +        xlc*)
 +         output_verbose_link_cmd='echo'
@@ -10153,39 +31174,80 @@
 +         ld_shlibs_F77=no
 +          ;;
 +      esac
-     fi
-       ;;
++    fi
++      ;;
  
-@@ -16932,8 +17209,8 @@
-       ;;
+-# A language-specific compiler.
+-CC=$lt_compiler_F77
++    dgux*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
  
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
--      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_F77
++    freebsd1*)
++      ld_shlibs_F77=no
++      ;;
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
+ 
+-# The linker used to build libraries.
+-LD=$lt_LD_F77
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 +    freebsd* | dragonfly*)
 +      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-       hardcode_shlibpath_var_F77=no
-@@ -16941,7 +17218,7 @@
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
  
-     hpux9*)
-       if test "$GCC" = yes; then
--	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-# A BSD-compatible nm program.
+-NM=$lt_NM
++    hpux9*)
++      if test "$GCC" = yes; then
 +	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       else
- 	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       fi
-@@ -16955,47 +17232,62 @@
-       export_dynamic_flag_spec_F77='${wl}-E'
-       ;;
++      else
++	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_direct_F77=yes
  
--    hpux10* | hpux11*)
+-# A symbol stripping program
+-STRIP=$STRIP
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_F77=yes
++      export_dynamic_flag_spec_F77='${wl}-E'
++      ;;
+ 
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
 +    hpux10*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 +	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -10193,16 +31255,22 @@
 +      if test "$with_gnu_ld" = no; then
 +	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_separator_F77=:
-+
+ 
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
 +	hardcode_direct_F77=yes
 +	export_dynamic_flag_spec_F77='${wl}-E'
-+
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
 +	# hardcode_minus_L: Not really in the search PATH,
 +	# but as the default location of the library.
 +	hardcode_minus_L_F77=yes
 +      fi
 +      ;;
-+
+ 
+-# Used on cygwin: assembler.
+-AS="$AS"
 +    hpux11*)
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 +	case $host_cpu in
@@ -10211,160 +31279,177 @@
 +	  ;;
 +	ia64*)
 +	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  ;;
++	*)
 +	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       else
--	case "$host_cpu" in
--	hppa*64*|ia64*)
--	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      else
 +	case $host_cpu in
 +	hppa*64*)
 +	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
 +	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
 +	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
--	case "$host_cpu" in
--	hppa*64*)
--	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
 +	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_separator_F77=:
-+
+ 
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
 +	case $host_cpu in
 +	hppa*64*|ia64*)
- 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
--	  hardcode_libdir_separator_F77=:
--	  hardcode_direct_F77=no
--	  hardcode_shlibpath_var_F77=no
--	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_F77='-L$libdir'
- 	  hardcode_direct_F77=no
- 	  hardcode_shlibpath_var_F77=no
--
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  hardcode_minus_L_F77=yes
- 	  ;;
- 	*)
--	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
--	  hardcode_libdir_separator_F77=:
- 	  hardcode_direct_F77=yes
- 	  export_dynamic_flag_spec_F77='${wl}-E'
++	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
++	  hardcode_direct_F77=no
++	  hardcode_shlibpath_var_F77=no
++	  ;;
++	*)
++	  hardcode_direct_F77=yes
++	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17009,7 +17301,7 @@
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_F77=yes
++	  ;;
++	esac
++      fi
++      ;;
  
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
--	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_F77
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
 +	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -17019,7 +17311,7 @@
-       link_all_deplibs_F77=yes
-       ;;
++      else
++	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      link_all_deplibs_F77=yes
++      ;;
  
--    netbsd*)
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
 +    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -17042,7 +17334,8 @@
-       hardcode_direct_F77=yes
-       hardcode_shlibpath_var_F77=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
+ 
+-# Old archive suffix (normally "a").
+-libext="$libext"
++    newsos6)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_shlibpath_var_F77=no
++      ;;
+ 
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
++    openbsd*)
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_F77='${wl}-E'
-       else
-@@ -17052,7 +17345,7 @@
- 	   hardcode_libdir_flag_spec_F77='-R$libdir'
- 	   ;;
- 	 *)
--	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_F77='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_F77='-R$libdir'
++	   ;;
++	 *)
 +	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- 	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
- 	   ;;
-        esac
-@@ -17063,14 +17356,14 @@
-       hardcode_libdir_flag_spec_F77='-L$libdir'
-       hardcode_minus_L_F77=yes
-       allow_undefined_flag_F77=unsupported
--      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
+ 
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++    os2*)
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      allow_undefined_flag_F77=unsupported
 +      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-       old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
++      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
  
-     osf3*)
-       if test "$GCC" = yes; then
- 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_F77
+-pic_mode=$pic_mode
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
 +	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	allow_undefined_flag_F77=' -expect_unresolved \*'
- 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -17082,13 +17375,13 @@
-     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
- 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      ;;
+ 
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
 +	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-       else
- 	allow_undefined_flag_F77=' -expect_unresolved \*'
- 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
 +	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
  
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17096,21 +17389,15 @@
-       hardcode_libdir_separator_F77=:
-       ;;
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_F77=:
++      ;;
  
--    sco3.2v5*)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var_F77=no
--      export_dynamic_flag_spec_F77='${wl}-Bexport'
--      runpath_var=LD_RUN_PATH
--      hardcode_runpath_var=yes
--      ;;
--
-     solaris*)
-       no_undefined_flag_F77=' -z text'
-       if test "$GCC" = yes; then
--	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
++    solaris*)
++      no_undefined_flag_F77=' -z text'
++      if test "$GCC" = yes; then
 +	wlarc='${wl}'
 +	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
++      else
 +	wlarc=''
- 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17119,8 +17406,18 @@
-       hardcode_shlibpath_var_F77=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_shlibpath_var_F77=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
 +      *)
 + 	# The compiler driver will combine linker options so we
 + 	# cannot just pass the convience library names through
@@ -10377,58 +31462,91 @@
 + 	*)
 + 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
 + 	esac ;;
-       esac
-       link_all_deplibs_F77=yes
-       ;;
-@@ -17129,7 +17426,7 @@
-       if test "x$host_vendor" = xsequent; then
- 	# Use $CC to link under sequent, because it throws in some extra .o
- 	# files that make .init and .fini sections work.
--	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++      esac
++      link_all_deplibs_F77=yes
++      ;;
+ 
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
 +	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
- 	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-       fi
-@@ -17177,36 +17474,45 @@
-       fi
-       ;;
++      else
++	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
  
--    sysv4.2uw2*)
--      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_F77=yes
--      hardcode_minus_L_F77=no
+-# Do we need a version for libraries?
+-need_version=$need_version
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_F77='$CC -r -o $output$reload_objs'
++	  hardcode_direct_F77=no
++        ;;
++	motorola)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_F77=no
++      ;;
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
++    sysv4.3*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_F77=no
++      export_dynamic_flag_spec_F77='-Bexport'
++      ;;
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_F77=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_F77=yes
++      fi
++      ;;
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
 +      no_undefined_flag_F77='${wl}-z,text'
 +      archive_cmds_need_lc_F77=no
-       hardcode_shlibpath_var_F77=no
--      hardcode_runpath_var=yes
--      runpath_var=LD_RUN_PATH
--      ;;
++      hardcode_shlibpath_var_F77=no
 +      runpath_var='LD_RUN_PATH'
  
--   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
--      no_undefined_flag_F77='${wl}-z ${wl}text'
-       if test "$GCC" = yes; then
--	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_F77
++      if test "$GCC" = yes; then
 +	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
--	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++      else
 +	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       fi
--      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var_F77=no
-       ;;
++      fi
++      ;;
  
--    sysv5*)
--      no_undefined_flag_F77=' -z text'
--      # $CC -shared without GNU ld will not create a library from C++
--      # object files and a static libstdc++, better avoid it by now
--      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
--      hardcode_libdir_flag_spec_F77=
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
 +    sysv5* | sco3.2v5* | sco5v6*)
 +      # Note: We can NOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
@@ -10439,13 +31557,15 @@
 +      no_undefined_flag_F77='${wl}-z,text'
 +      allow_undefined_flag_F77='${wl}-z,nodefs'
 +      archive_cmds_need_lc_F77=no
-       hardcode_shlibpath_var_F77=no
++      hardcode_shlibpath_var_F77=no
 +      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +      hardcode_libdir_separator_F77=':'
 +      link_all_deplibs_F77=yes
 +      export_dynamic_flag_spec_F77='${wl}-Bexport'
-       runpath_var='LD_RUN_PATH'
-+
++      runpath_var='LD_RUN_PATH'
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
 +      if test "$GCC" = yes; then
 +	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -10453,43 +31573,120 @@
 +	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
-       ;;
++      ;;
  
-     uts4*)
-@@ -17225,11 +17531,6 @@
- echo "${ECHO_T}$ld_shlibs_F77" >&6
- test "$ld_shlibs_F77" = no && can_build_shared=no
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
++    uts4*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
  
--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"
--fi
--
- #
- # Do we need to explicitly link libc?
- #
-@@ -17262,6 +17563,7 @@
-         libobjs=conftest.$ac_objext
-         deplibs=
-         wl=$lt_prog_compiler_wl_F77
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
++    *)
++      ld_shlibs_F77=no
++      ;;
++    esac
++  fi
+ 
+-# Library versioning type.
+-version_type=$version_type
++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6; }
++test "$ld_shlibs_F77" = no && can_build_shared=no
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_F77" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_F77=yes
+ 
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_F77 in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_F77
 +	pic_flag=$lt_prog_compiler_pic_F77
-         compiler_flags=-v
-         linker_flags=-v
-         verstring=
-@@ -17297,7 +17599,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
++        allow_undefined_flag_F77=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_F77=no
++        else
++	  archive_cmds_need_lc_F77=yes
++        fi
++        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
++      ;;
++    esac
++  fi
++  ;;
++esac
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_F77
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
 +shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -17307,7 +17609,20 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
 +if test "$GCC" = yes; then
 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -10504,82 +31701,224 @@
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
++need_lib_prefix=unknown
++hardcode_into_libs=no
  
-@@ -17372,7 +17687,7 @@
- amigaos*)
-   library_names_spec='$libname.ixlibrary $libname.a'
-   # Create ${libname}_ixlibrary.a entries in /sys/libs.
--  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_F77
+-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_F77
+-module_expsym_cmds=$lt_module_expsym_cmds_F77
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-   ;;
++  ;;
  
- beos*)
-@@ -17381,7 +17696,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_F77
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
  
--bsdi4*)
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_F77
 +bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17397,7 +17712,7 @@
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
  
- cygwin* | mingw* | pw32*)
-   version_type=windows
--  shrext=".dll"
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_F77
++cygwin* | mingw* | pw32*)
++  version_type=windows
 +  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
++  need_version=no
++  need_lib_prefix=no
  
-@@ -17409,7 +17724,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname'
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_F77
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -17439,7 +17755,7 @@
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
+ 
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
 +      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-     ;;
-@@ -17462,7 +17778,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
--  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++      ;;
++    esac
++    ;;
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17485,20 +17801,17 @@
-   dynamic_linker=no
-   ;;
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
  
--kfreebsd*-gnu*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
--
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_F77
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_F77
++freebsd1*)
++  dynamic_linker=no
++  ;;
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -10591,65 +31930,101 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -17516,14 +17829,19 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  freebsd3.01* | freebsdelf3.01*)
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
 +  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
--  *) # from 3.2 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
 +  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
 +  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
 +  freebsd*) # from 4.6 on
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
-   esac
-   ;;
++  esac
++  ;;
  
-@@ -17543,9 +17861,9 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  case "$host_cpu" in
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
+ 
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
 +  case $host_cpu in
-   ia64*)
--    shrext='.so'
++  ia64*)
 +    shrext_cmds='.so'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.so"
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -17560,7 +17878,7 @@
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-    hppa*64*)
--     shrext='.sl'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
 +     shrext_cmds='.sl'
-      hardcode_into_libs=yes
-      dynamic_linker="$host_os dld.sl"
-      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17571,7 +17889,7 @@
-      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-      ;;
-    *)
--    shrext='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
 +    shrext_cmds='.sl'
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=SHLIB_PATH
-     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17583,6 +17901,18 @@
-   postinstall_cmds='chmod 555 $lib'
-   ;;
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
  
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -10661,51 +32036,91 @@
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
-+
- irix5* | irix6* | nonstopux*)
-   case $host_os in
-     nonstopux*) version_type=nonstopux ;;
-@@ -17626,29 +17956,26 @@
-   ;;
  
- # This must be Linux ELF.
--linux*)
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++# This must be Linux ELF.
 +linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
--  libsuff=
--  if test "x$LINUX_64_MODE" = x64; then
--    # Some platforms are per default 64-bit, so there's no /lib64
--    if test -d /lib64; then
--      libsuff=64
--    fi
--  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
--  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
--  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
  
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
-+
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-   # powerpc, because MkLinux only supported shared libraries with the
-   # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -17658,6 +17985,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
  
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_F77
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -10717,70 +32132,176 @@
 +  hardcode_into_libs=yes
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -17667,7 +18006,7 @@
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -17695,8 +18034,13 @@
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
  
- openbsd*)
-   version_type=sunos
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct_F77
++openbsd*)
++  version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
-   need_lib_prefix=no
--  need_version=no
++  need_lib_prefix=no
 +  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
 +  case $host_os in
 +    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
 +    *)                         need_version=no  ;;
 +  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -17716,7 +18060,7 @@
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
  
- os2*)
-   libname_spec='$name'
--  shrext=".dll"
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L_F77
++os2*)
++  libname_spec='$name'
 +  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -17734,13 +18078,6 @@
-   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-   ;;
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
  
--sco3.2v5*)
--  version_type=osf
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
- solaris*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -17766,7 +18103,7 @@
-   need_version=yes
-   ;;
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
  
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$hardcode_automatic_F77
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_F77
 +sysv4 | sysv4.3*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17799,6 +18136,29 @@
-   fi
-   ;;
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
  
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -10803,428 +32324,657 @@
 +  fi
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
-+
- uts4*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17814,12 +18174,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
- test "$dynamic_linker" = no && can_build_shared=no
  
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols_F77
++*)
++  dynamic_linker=no
++  ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_F77
 +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"
 +fi
-+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
--   test -n "$runpath_var F77" || \
--   test "X$hardcode_automatic_F77"="Xyes" ; then
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
++hardcode_action_F77=
++if test -n "$hardcode_libdir_flag_spec_F77" || \
 +   test -n "$runpath_var_F77" || \
 +   test "X$hardcode_automatic_F77" = "Xyes" ; then
  
-   # We can hardcode non-existant directories.
-   if test "$hardcode_direct_F77" != no &&
-@@ -17851,36 +18216,6 @@
-   enable_fast_install=needless
- fi
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_F77
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_F77" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
++     test "$hardcode_minus_L_F77" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_F77=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_F77=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_F77=unsupported
++fi
++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6; }
  
--striplib=
--old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_F77
++if test "$hardcode_action_F77" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
+ 
+-# ### END LIBTOOL TAG CONFIG: $tagname
+ 
+-__EOF__
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_F77 \
++    CC_F77 \
++    LD_F77 \
++    lt_prog_compiler_wl_F77 \
++    lt_prog_compiler_pic_F77 \
++    lt_prog_compiler_static_F77 \
++    lt_prog_compiler_no_builtin_flag_F77 \
++    export_dynamic_flag_spec_F77 \
++    thread_safe_flag_spec_F77 \
++    whole_archive_flag_spec_F77 \
++    enable_shared_with_static_runtimes_F77 \
++    old_archive_cmds_F77 \
++    old_archive_from_new_cmds_F77 \
++    predep_objects_F77 \
++    postdep_objects_F77 \
++    predeps_F77 \
++    postdeps_F77 \
++    compiler_lib_search_path_F77 \
++    archive_cmds_F77 \
++    archive_expsym_cmds_F77 \
++    postinstall_cmds_F77 \
++    postuninstall_cmds_F77 \
++    old_archive_from_expsyms_cmds_F77 \
++    allow_undefined_flag_F77 \
++    no_undefined_flag_F77 \
++    export_symbols_cmds_F77 \
++    hardcode_libdir_flag_spec_F77 \
++    hardcode_libdir_flag_spec_ld_F77 \
++    hardcode_libdir_separator_F77 \
++    hardcode_automatic_F77 \
++    module_cmds_F77 \
++    module_expsym_cmds_F77 \
++    lt_cv_prog_compiler_c_o_F77 \
++    exclude_expsyms_F77 \
++    include_expsyms_F77; do
+ 
++    case $var in
++    old_archive_cmds_F77 | \
++    old_archive_from_new_cmds_F77 | \
++    archive_cmds_F77 | \
++    archive_expsym_cmds_F77 | \
++    module_cmds_F77 | \
++    module_expsym_cmds_F77 | \
++    old_archive_from_expsyms_cmds_F77 | \
++    export_symbols_cmds_F77 | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
+ 
 -else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--       else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  test -f Makefile && make "$ltmain"
 -fi
--       ;;
--   *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--    ;;
--  esac
--fi
--
--
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
  
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17895,7 +18230,8 @@
-   # Now quote all the things that may contain metacharacters while being
-   # careful not to overquote the AC_SUBSTed values.  We take copies of the
-   # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+    SED SHELL STRIP \
-     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-     deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17995,6 +18331,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
++cfgfile="$ofile"
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+ 
+-CC="$lt_save_CC"
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+-	else
+-	  tagname=""
+-	fi
+-	;;
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+ 
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
+ 
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
+ 
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_F77
+ 
+-# Source file extension for Java test sources.
+-ac_ext=java
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
+ 
+-# Object file extension for compiled Java test sources.
+-objext=o
+-objext_GCJ=$objext
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++# The host system.
++host_alias=$host_alias
++host=$host
 +host_os=$host_os
-+
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
 +# The build system.
 +build_alias=$build_alias
 +build=$build
 +build_os=$build_os
  
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -18006,6 +18348,9 @@
- # A C compiler.
- LTCC=$lt_LTCC
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
  
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
++# A C compiler.
++LTCC=$lt_LTCC
+ 
 +# LTCC compiler flags.
 +LTCFLAGS=$lt_LTCFLAGS
-+
- # A language-specific compiler.
- CC=$lt_compiler_F77
  
-@@ -18025,7 +18370,7 @@
- NM=$lt_NM
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-compiler_GCJ=$CC
++# A language-specific compiler.
++CC=$lt_compiler_F77
  
- # A symbol stripping program
--STRIP=$STRIP
-+STRIP=$lt_STRIP
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-archive_cmds_need_lc_GCJ=no
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_F77
  
- # Used to examine libraries when file_magic_cmd begins "file"
- MAGIC_CMD=$MAGIC_CMD
-@@ -18056,7 +18401,7 @@
- libext="$libext"
++# An ERE matcher.
++EGREP=$lt_EGREP
  
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
+-lt_prog_compiler_no_builtin_flag_GCJ=
++# The linker used to build libraries.
++LD=$lt_LD_F77
  
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -18071,7 +18416,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+-if test "$GCC" = yes; then
+-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
  
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
++# A BSD-compatible nm program.
++NM=$lt_NM
  
- # Do we need the lib prefix for modules?
-@@ -18273,7 +18618,10 @@
-   # If there is no Makefile yet, we rely on a make rule to execute
-   # `config.status --recheck' to rerun these tests and create the
-   # libtool script then.
--  test -f Makefile && make "$ltmain"
-+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+  if test -f "$ltmain_in"; then
-+    test -f Makefile && make "$ltmain"
-+  fi
- fi
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_prog_compiler_rtti_exceptions=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="-fno-rtti -fno-exceptions"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18355: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
+-   echo "$as_me:18359: \$? = $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
+-     if test ! -s conftest.err; then
+-       lt_cv_prog_compiler_rtti_exceptions=yes
+-     fi
+-   fi
+-   $rm conftest*
++# A symbol stripping program
++STRIP=$lt_STRIP
  
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
  
-@@ -18306,26 +18654,55 @@
- lt_simple_compile_test_code="class foo {}\n"
+-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+-else
+-    :
+-fi
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
  
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+-fi
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
  
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-lt_prog_compiler_wl_GCJ=
+-lt_prog_compiler_pic_GCJ=
+-lt_prog_compiler_static_GCJ=
++# Used on cygwin: assembler.
++AS="$AS"
  
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
+-  if test "$GCC" = yes; then
+-    lt_prog_compiler_wl_GCJ='-Wl,'
+-    lt_prog_compiler_static_GCJ='-static'
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
+-    case $host_os in
+-      aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static_GCJ='-Bstatic'
+-      fi
+-      ;;
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_F77
  
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- compiler_GCJ=$CC
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+-      ;;
++# Object file suffix (normally "o").
++objext="$ac_objext"
  
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- archive_cmds_need_lc_GCJ=no
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
++# Old archive suffix (normally "a").
++libext="$libext"
  
-+old_archive_cmds_GCJ=$old_archive_cmds
-+
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
-@@ -18352,18 +18729,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -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:18358: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18735: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18362: \$? = $ac_status" >&5
-+   echo "$as_me:18739: \$? = $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
--     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-      fi
-    fi
-@@ -18424,6 +18803,11 @@
-       lt_prog_compiler_pic_GCJ='-fno-common'
-       ;;
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+-      ;;
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
  
-+    interix3*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+
-     msdosdjgpp*)
-       # Just because we use GCC doesn't mean we suddenly get shared libraries
-       # on systems that don't support them.
-@@ -18440,7 +18824,7 @@
-     hpux*)
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_prog_compiler_pic_GCJ='-fno-common'
+-      ;;
++# Executable file suffix (normally "").
++exeext="$exeext"
+ 
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      lt_prog_compiler_can_build_shared_GCJ=no
+-      enable_shared=no
+-      ;;
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_F77
++pic_mode=$pic_mode
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic_GCJ=-Kconform_pic
+-      fi
+-      ;;
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
 -      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18466,6 +18850,16 @@
- 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         lt_prog_compiler_pic_GCJ='-qnocommon'
-+         lt_prog_compiler_wl_GCJ='-Wl,'
-+         ;;
-+       esac
-+       ;;
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	lt_prog_compiler_pic_GCJ='-fPIC'
+-	;;
+-      esac
+-      ;;
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -18477,7 +18871,7 @@
-       lt_prog_compiler_wl_GCJ='-Wl,'
-       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-       # not for PA HP-UX.
+-    *)
+-      lt_prog_compiler_pic_GCJ='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static_GCJ='-Bstatic'
+-      else
+-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
+ 
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+-      ;;
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+ 
+-    hpux9* | hpux10* | hpux11*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
 -      case "$host_cpu" in
-+      case $host_cpu in
-       hppa*64*|ia64*)
- 	# +Z the default
- 	;;
-@@ -18500,13 +18894,20 @@
-       lt_prog_compiler_static_GCJ='-Bstatic'
-       ;;
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	lt_prog_compiler_pic_GCJ='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
+-      ;;
++# Do we need a version for libraries?
++need_version=$need_version
  
+-    irix5* | irix6* | nonstopux*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      lt_prog_compiler_static_GCJ='-non_shared'
+-      ;;
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+ 
+-    newsos6)
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+ 
 -    linux*)
 -      case $CC in
-+    linux* | k*bsd*-gnu)
-+      case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_GCJ='-Wl,'
- 	lt_prog_compiler_pic_GCJ='-KPIC'
- 	lt_prog_compiler_static_GCJ='-static'
-         ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl_GCJ='-Wl,'
-+	lt_prog_compiler_pic_GCJ='-fpic'
-+	lt_prog_compiler_static_GCJ='-Bstatic'
-+        ;;
-       ccc*)
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         # All Alpha code is PIC.
-@@ -18521,15 +18922,15 @@
-       lt_prog_compiler_static_GCJ='-non_shared'
-       ;;
+-      icc* | ecc*)
+-	lt_prog_compiler_wl_GCJ='-Wl,'
+-	lt_prog_compiler_pic_GCJ='-KPIC'
+-	lt_prog_compiler_static_GCJ='-static'
+-        ;;
+-      ccc*)
+-        lt_prog_compiler_wl_GCJ='-Wl,'
+-        # All Alpha code is PIC.
+-        lt_prog_compiler_static_GCJ='-non_shared'
+-        ;;
+-      esac
+-      ;;
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
+-    osf3* | osf4* | osf5*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      # All OSF/1 code is PIC.
+-      lt_prog_compiler_static_GCJ='-non_shared'
+-      ;;
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_F77
+ 
 -    sco3.2v5*)
 -      lt_prog_compiler_pic_GCJ='-Kpic'
 -      lt_prog_compiler_static_GCJ='-dn'
 -      ;;
--
-     solaris*)
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
+ 
+-    solaris*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
-       lt_prog_compiler_pic_GCJ='-KPIC'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl_GCJ='-Wl,';;
-+      esac
-       ;;
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
  
-     sunos4*)
-@@ -18538,7 +18939,7 @@
-       lt_prog_compiler_static_GCJ='-Bstatic'
-       ;;
+-    sunos4*)
+-      lt_prog_compiler_wl_GCJ='-Qoption ld '
+-      lt_prog_compiler_pic_GCJ='-PIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
  
 -    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-       lt_prog_compiler_wl_GCJ='-Wl,'
-       lt_prog_compiler_pic_GCJ='-KPIC'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18551,6 +18952,17 @@
-       fi
-       ;;
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
  
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_pic_GCJ='-KPIC'
-+      lt_prog_compiler_static_GCJ='-Bstatic'
-+      ;;
-+
-+    unicos*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_can_build_shared_GCJ=no
-+      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_GCJ='-pic'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18585,18 +18997,20 @@
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    # The option is referenced via a variable to avoid confusing sed.
-    lt_compile=`echo "$ac_compile" | $SED \
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
+-	lt_prog_compiler_static_GCJ='-Bstatic'
+-      fi
+-      ;;
++# Library versioning type.
++version_type=$version_type
+ 
+-    uts4*)
+-      lt_prog_compiler_pic_GCJ='-pic'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+ 
+-    *)
+-      lt_prog_compiler_can_build_shared_GCJ=no
+-      ;;
+-    esac
+-  fi
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+ 
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$lt_prog_compiler_pic_GCJ"; then
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_F77
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_prog_compiler_pic_works_GCJ=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
 -   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -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:18591: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19003: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18595: \$? = $ac_status" >&5
-+   echo "$as_me:19007: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18588: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
+-   echo "$as_me:18592: \$? = $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
 -     if test ! -s conftest.err; then
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_prog_compiler_pic_works_GCJ=yes
-      fi
-    fi
-@@ -18617,7 +19031,7 @@
- fi
+-       lt_prog_compiler_pic_works_GCJ=yes
+-     fi
+-   fi
+-   $rm conftest*
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
  
- fi
+-fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
+ 
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+-    case $lt_prog_compiler_pic_GCJ in
+-     "" | " "*) ;;
+-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+-     esac
+-else
+-    lt_prog_compiler_pic_GCJ=
+-     lt_prog_compiler_can_build_shared_GCJ=no
+-fi
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_F77
++archive_expsym_cmds=$lt_archive_expsym_cmds_F77
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
+ 
+-fi
 -case "$host_os" in
-+case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
-   *djgpp*)
-     lt_prog_compiler_pic_GCJ=
-@@ -18627,6 +19041,48 @@
-     ;;
- esac
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    lt_prog_compiler_pic_GCJ=
+-    ;;
+-  *)
+-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
+-    ;;
+-esac
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_F77
++module_expsym_cmds=$lt_module_expsym_cmds_F77
  
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_prog_compiler_static_works_GCJ=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_prog_compiler_static_works_GCJ=yes
-+       fi
-+     else
-+       lt_prog_compiler_static_works_GCJ=yes
-+     fi
-+   fi
-+   $rm conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
-+
-+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-+    :
-+else
-+    lt_prog_compiler_static_GCJ=
-+fi
-+
-+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
- if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-@@ -18639,38 +19095,36 @@
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_prog_compiler_c_o_GCJ=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
  
 -   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
 -   # that will create temporary files in the current directory regardless of
@@ -11232,262 +32982,300 @@
 -   # to fail, enabling locking or at least warning the user not to do parallel
 -   # builds.
 -   chmod -w .
--
-    lt_compiler_flag="-o out/conftest2.$ac_objext"
-    # Insert the option either (1) after the last *FLAGS variable, or
-    # (2) before a word containing "conftest.", or (3) at the end.
-    # Note that $ac_compile itself does not contain backslashes and begins
-    # with a dollar sign (not a hyphen), so the echo should work correctly.
-    lt_compile=`echo "$ac_compile" | $SED \
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_F77
+ 
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   lt_compile=`echo "$ac_compile" | $SED \
 -   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -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:18658: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19107: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18662: \$? = $ac_status" >&5
-+   echo "$as_me:19111: \$? = $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
-      # So say no if there are warnings
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18655: $lt_compile\"" >&5)
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
+-   echo "$as_me:18659: \$? = $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
+-     # So say no if there are warnings
 -     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_GCJ=yes
-      fi
-    fi
+-       lt_cv_prog_compiler_c_o_GCJ=yes
+-     fi
+-   fi
 -   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
-+   chmod u+w . 2>&5
-+   $rm conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+   $rm out/* && rmdir out
-    cd ..
-    rmdir conftest
-    $rm conftest*
-@@ -18741,6 +19195,16 @@
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-   extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_F77
  
-   case $host_os in
-   cygwin* | mingw* | pw32*)
-@@ -18751,6 +19215,10 @@
-       with_gnu_ld=no
-     fi
-     ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-@@ -18761,6 +19229,27 @@
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_F77
  
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_GCJ=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-     # See if GNU ld supports shared libraries.
-     case $host_os in
-     aix3* | aix4* | aix5*)
-@@ -18798,7 +19287,7 @@
- 	allow_undefined_flag_GCJ=unsupported
- 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- 	# support --undefined.  This deserves some investigation.  FIXME
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_F77
+ 
+-hard_links="nottested"
+-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
+-  if test "$hard_links" = no; then
+-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
+-fi
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+ 
+-  runpath_var=
+-  allow_undefined_flag_GCJ=
+-  enable_shared_with_static_runtimes_GCJ=no
+-  archive_cmds_GCJ=
+-  archive_expsym_cmds_GCJ=
+-  old_archive_From_new_cmds_GCJ=
+-  old_archive_from_expsyms_cmds_GCJ=
+-  export_dynamic_flag_spec_GCJ=
+-  whole_archive_flag_spec_GCJ=
+-  thread_safe_flag_spec_GCJ=
+-  hardcode_libdir_flag_spec_GCJ=
+-  hardcode_libdir_flag_spec_ld_GCJ=
+-  hardcode_libdir_separator_GCJ=
+-  hardcode_direct_GCJ=no
+-  hardcode_minus_L_GCJ=no
+-  hardcode_shlibpath_var_GCJ=unsupported
+-  link_all_deplibs_GCJ=unknown
+-  hardcode_automatic_GCJ=no
+-  module_cmds_GCJ=
+-  module_expsym_cmds_GCJ=
+-  always_export_symbols_GCJ=no
+-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  include_expsyms_GCJ=
+-  # exclude_expsyms can be an extended regexp of symbols to exclude
+-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-  # as well as any symbol that contains `d'.
+-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-  # platforms (ab)use it in PIC code, but their linkers get confused if
+-  # the symbol is explicitly referenced.  Since portable code cannot
+-  # rely on this symbol name, it's probably fine to never include it in
+-  # preloaded symbol tables.
+-  extract_expsyms_cmds=
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    if test "$GCC" != yes; then
+-      with_gnu_ld=no
+-    fi
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_F77
+ 
+-  ld_shlibs_GCJ=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_F77
+ 
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	ld_shlibs_GCJ=no
+-	cat <<EOF 1>&2
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+ 
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+ 
+-EOF
+-      fi
+-      ;;
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
+-    amigaos*)
+-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_minus_L_GCJ=yes
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
+-      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      ld_shlibs_GCJ=no
+-      ;;
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ 
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	allow_undefined_flag_GCJ=unsupported
+-	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
 -	archive_cmds_GCJ='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       else
- 	ld_shlibs_GCJ=no
-       fi
-@@ -18808,13 +19297,13 @@
-       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-       # as there is no search path for DLLs.
-       hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      else
+-	ld_shlibs_GCJ=no
+-      fi
+-      ;;
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
+ 
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      allow_undefined_flag_GCJ=no
-+      allow_undefined_flag_GCJ=unsupported
-       always_export_symbols_GCJ=no
-       enable_shared_with_static_runtimes_GCJ=yes
+-      always_export_symbols_GCJ=no
+-      enable_shared_with_static_runtimes_GCJ=yes
 -      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
  
-       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- 	# If the export-symbols file already is a .def file (1st line
- 	# is EXPORTS), use it as is; otherwise, prepend...
- 	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18823,23 +19312,70 @@
- 	  echo EXPORTS > $output_objdir/$soname.def;
- 	  cat $export_symbols >> $output_objdir/$soname.def;
- 	fi~
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	  cp $export_symbols $output_objdir/$soname.def;
+-	else
+-	  echo EXPORTS > $output_objdir/$soname.def;
+-	  cat $export_symbols >> $output_objdir/$soname.def;
+-	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       else
+-      else
 -	ld_shlibs=no
-+	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
-+    interix3*)
-+      hardcode_direct_GCJ=no
-+      hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec_GCJ='${wl}-E'
-+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+      # Instead, shared libraries are loaded at an image base (0x10000000 by
-+      # default) and relocated if they conflict, which is a slow very memory
-+      # consuming and fragmenting process.  To avoid this, we pick a random,
-+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
-+
-+    linux* | k*bsd*-gnu)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+	if test $supports_anon_versioning = yes; then
-+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	link_all_deplibs_GCJ=no
-+      else
-+	ld_shlibs_GCJ=no
-       fi
-       ;;
+-      fi
+-      ;;
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-       else
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
 -	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       fi
-       ;;
+-      fi
+-      ;;
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_F77
  
 -    solaris* | sysv5*)
-+    solaris*)
-       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- 	ld_shlibs_GCJ=no
- 	cat <<EOF 1>&2
-@@ -18853,13 +19389,40 @@
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	ld_shlibs_GCJ=no
+-	cat <<EOF 1>&2
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
  
- EOF
-       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	ld_shlibs_GCJ=no
-       fi
-       ;;
+-      else
+-	ld_shlibs_GCJ=no
+-      fi
+-      ;;
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
  
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+	ld_shlibs_GCJ=no
-+	cat <<_LT_EOF 1>&2
+-    sunos4*)
+-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
 +
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_F77
 +
-+_LT_EOF
-+	;;
-+	*)
-+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-+	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-+	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-+	  else
-+	    ld_shlibs_GCJ=no
-+	  fi
-+	;;
-+      esac
-+      ;;
-+
-     sunos4*)
-       archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-       wlarc=
-@@ -18869,24 +19432,19 @@
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_F77
  
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	ld_shlibs_GCJ=no
-       fi
-       ;;
-     esac
+-      else
+-	ld_shlibs_GCJ=no
+-      fi
+-      ;;
+-    esac
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
  
 -    if test "$ld_shlibs_GCJ" = yes; then
 -      runpath_var=LD_RUN_PATH
@@ -11499,168 +33287,304 @@
 -      else
 -  	whole_archive_flag_spec_GCJ=
 -      fi
-+    if test "$ld_shlibs_GCJ" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec_GCJ=
-+      export_dynamic_flag_spec_GCJ=
-+      whole_archive_flag_spec_GCJ=
-     fi
-   else
-     # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18898,7 +19456,7 @@
-       # Note: this linker hardcodes the directories in LIBPATH if there
-       # are no directories specified by -L.
-       hardcode_minus_L_GCJ=yes
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      allow_undefined_flag_GCJ=unsupported
+-      always_export_symbols_GCJ=yes
+-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-      # Note: this linker hardcodes the directories in LIBPATH if there
+-      # are no directories specified by -L.
+-      hardcode_minus_L_GCJ=yes
 -      if test "$GCC" = yes && test -z "$link_static_flag"; then
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- 	# Neither direct hardcoding nor static linking is supported with a
- 	# broken collect2.
- 	hardcode_direct_GCJ=unsupported
-@@ -18920,9 +19478,21 @@
- 	else
- 	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- 	fi
-+	aix_use_runtimelinking=no
-+
-+	# Test if we are trying to use run time linking or normal
-+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
-+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+	  for ld_flag in $LDFLAGS; do
-+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+  	    aix_use_runtimelinking=yes
-+  	    break
-+  	  fi
-+	  done
-+	  ;;
-+	esac
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	hardcode_direct_GCJ=unsupported
+-      fi
+-      ;;
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_F77
  
+-    aix4* | aix5*)
+-      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.
+-	aix_use_runtimelinking=no
+-	exp_sym_flag='-Bexport'
+-	no_entry_flag=""
+-      else
+-	# If we're using GNU nm, then we don't want the "-C" option.
+-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	fi
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
+ 
 -	# KDE requires run time linking.  Make it the default.
 -	aix_use_runtimelinking=yes
- 	exp_sym_flag='-bexport'
- 	no_entry_flag='-bnoentry'
-       fi
-@@ -18939,7 +19509,7 @@
-       link_all_deplibs_GCJ=yes
+-	exp_sym_flag='-bexport'
+-	no_entry_flag='-bnoentry'
+-      fi
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_F77
  
-       if test "$GCC" = yes; then
+-      # When large executables or shared objects are built, AIX ld can
+-      # have problems creating the table of contents.  If linking a library
+-      # or program results in "error TOC overflow" add -mminimal-toc to
+-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-      archive_cmds_GCJ=''
+-      hardcode_direct_GCJ=yes
+-      hardcode_libdir_separator_GCJ=':'
+-      link_all_deplibs_GCJ=yes
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+-      if test "$GCC" = yes; then
 -	case $host_os in aix4.012|aix4.012.*)
-+	case $host_os in aix4.[012]|aix4.[012].*)
- 	# We only want to do this on AIX 4.2 and lower, the check
- 	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -18958,8 +19528,12 @@
-   	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-   	  hardcode_libdir_separator_GCJ=
- 	  fi
-+	  ;;
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -18967,22 +19541,23 @@
-   	# chokes on -Wl,-G. The following line is correct:
- 	  shared_flag='-G'
- 	else
+-	# We only want to do this on AIX 4.2 and lower, the check
+-	# below for broken collect2 doesn't work under 4.3+
+-	  collect2name=`${CC} -print-prog-name=collect2`
+-	  if test -f "$collect2name" && \
+-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	  then
+-  	  # We have reworked collect2
+-  	  hardcode_direct_GCJ=yes
+-	  else
+-  	  # We have old collect2
+-  	  hardcode_direct_GCJ=unsupported
+-  	  # It fails to find uninstalled libraries when the uninstalled
+-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-  	  # to unsupported forces relinking
+-  	  hardcode_minus_L_GCJ=yes
+-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-  	  hardcode_libdir_separator_GCJ=
+-	  fi
+-	esac
+-	shared_flag='-shared'
+-      else
+-	# not using gcc
+-	if test "$host_cpu" = ia64; then
+-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-  	# chokes on -Wl,-G. The following line is correct:
+-	  shared_flag='-G'
+-	else
 -  	if test "$aix_use_runtimelinking" = yes; then
 -	    shared_flag='-qmkshrobj ${wl}-G'
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
- 	  else
+-	  else
 -	    shared_flag='-qmkshrobj'
 -  	fi
-+	    shared_flag='${wl}-bM:SRE'
-+	  fi
- 	fi
-       fi
+-	fi
+-      fi
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_F77"
  
 -      # Let the compiler handle the export list.
 -      always_export_symbols_GCJ=no
-+      # It seems that -bexpall does not export symbols beginning with
-+      # underscore (_), so it is better to generate a list of symbols to export.
-+      always_export_symbols_GCJ=yes
-       if test "$aix_use_runtimelinking" = yes; then
- 	# Warning - without using the other runtime loading flags (-brtl),
- 	# -berok will link without error, but may produce a broken library.
- 	allow_undefined_flag_GCJ='-berok'
-        # Determine the default libpath from the value encoded in an empty executable.
+-      if test "$aix_use_runtimelinking" = yes; then
+-	# Warning - without using the other runtime loading flags (-brtl),
+-	# -berok will link without error, but may produce a broken library.
+-	allow_undefined_flag_GCJ='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
 -	cat >conftest.$ac_ext <<_ACEOF
-+       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -19033,14 +19608,13 @@
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_F77
  
+-int
+-main ()
+-{
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_F77
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_F77
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_F77
+ 
 -	hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	archive_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
 -	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
- 	if test "$host_cpu" = ia64; then
- 	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
- 	  allow_undefined_flag_GCJ="-z nodefs"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
+-	  allow_undefined_flag_GCJ="-z nodefs"
 -	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- 	else
- 	 # Determine the default libpath from the value encoded in an empty executable.
- 	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19099,13 +19673,11 @@
- 	  # -berok will link without error, but may produce a broken library.
- 	  no_undefined_flag_GCJ=' ${wl}-bernotok'
- 	  allow_undefined_flag_GCJ=' ${wl}-berok'
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++# ### END LIBTOOL TAG CONFIG: $tagname
+ 
+-int
+-main ()
+-{
++__EOF__
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-
+-	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	  # Warning - without using the other run time loading flags,
+-	  # -berok will link without error, but may produce a broken library.
+-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
+-	  allow_undefined_flag_GCJ=' ${wl}-berok'
 -	  # -bexpall does not export symbols beginning with underscore (_)
 -	  always_export_symbols_GCJ=yes
- 	  # Exported symbols can be pulled into shared objects from archives
+-	  # Exported symbols can be pulled into shared objects from archives
 -	  whole_archive_flag_spec_GCJ=' '
-+	  whole_archive_flag_spec_GCJ='$convenience'
- 	  archive_cmds_need_lc_GCJ=yes
+-	  archive_cmds_need_lc_GCJ=yes
 -	  # This is similar to how AIX traditionally builds it's shared libraries.
 -	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-       ;;
-@@ -19118,7 +19690,7 @@
-       ld_shlibs_GCJ=no
-       ;;
+-	fi
+-      fi
+-      ;;
  
+-    amigaos*)
+-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_minus_L_GCJ=yes
+-      # see comment about different semantics on the GNU ld section
+-      ld_shlibs_GCJ=no
+-      ;;
+ 
 -    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_GCJ=-rdynamic
-       ;;
+-      export_dynamic_flag_spec_GCJ=-rdynamic
+-      ;;
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
-@@ -19128,68 +19700,68 @@
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
-       hardcode_libdir_flag_spec_GCJ=' '
+-    cygwin* | mingw* | pw32*)
+-      # When not using gcc, we currently assume that we are using
+-      # Microsoft Visual C++.
+-      # hardcode_libdir_flag_spec is actually meaningless, as there is
+-      # no search path for DLLs.
+-      hardcode_libdir_flag_spec_GCJ=' '
 -      allow_undefined_flag_GCJ=no
-+      allow_undefined_flag_GCJ=unsupported
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
 -      shrext=".dll"
-+      shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
+-      # FIXME: Setting linknames here is a bad hack.
 -      archive_cmds_GCJ='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-       # The linker will automatically build a .lib file if we build a DLL.
-       old_archive_From_new_cmds_GCJ='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      old_archive_From_new_cmds_GCJ='true'
+-      # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
 -      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-       enable_shared_with_static_runtimes_GCJ=yes
-       ;;
+-      enable_shared_with_static_runtimes_GCJ=yes
+-      ;;
++CC="$lt_save_CC"
  
-     darwin* | rhapsody*)
+-    darwin* | rhapsody*)
 -    if test "$GXX" = yes ; then
 -      archive_cmds_need_lc_GCJ=no
 -      case "$host_os" in
@@ -11670,7 +33594,7 @@
 -      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
 -	  allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--	else
+ 	else
 -	  case ${MACOSX_DEPLOYMENT_TARGET} in
 -	    10.012)
 -	      allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
@@ -11679,27 +33603,10 @@
 -	      allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
 -	      ;;
 -	  esac
--	fi
--	;;
-+      case $host_os in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-       esac
++	  tagname=""
+ 	fi
+ 	;;
+-      esac
 -    	lt_int_apple_cc_single_mod=no
 -    	output_verbose_link_cmd='echo'
 -    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -11718,218 +33625,260 @@
 -          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -        fi
 -          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      archive_cmds_need_lc_GCJ=no
-       hardcode_direct_GCJ=no
-       hardcode_automatic_GCJ=yes
-       hardcode_shlibpath_var_GCJ=unsupported
+-      hardcode_direct_GCJ=no
+-      hardcode_automatic_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=unsupported
 -      whole_archive_flag_spec_GCJ='-all_load $convenience'
-+      whole_archive_flag_spec_GCJ=''
-       link_all_deplibs_GCJ=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
+-      link_all_deplibs_GCJ=yes
+-    else
 -      ld_shlibs_GCJ=no
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_GCJ=no
-+          ;;
-+      esac
-     fi
-       ;;
+-    fi
+-      ;;
  
-@@ -19223,8 +19795,8 @@
-       ;;
+-    dgux*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd1*)
+-      ld_shlibs_GCJ=no
+-      ;;
+ 
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
+-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
++# Source file extension for Java test sources.
++ac_ext=java
+ 
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
++# Object file extension for compiled Java test sources.
++objext=o
++objext_GCJ=$objext
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 -    freebsd* | kfreebsd*-gnu)
 -      archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | dragonfly*)
-+      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-       hardcode_shlibpath_var_GCJ=no
-@@ -19232,7 +19804,7 @@
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}\n"
  
-     hpux9*)
-       if test "$GCC" = yes; then
+-    hpux9*)
+-      if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       else
- 	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       fi
-@@ -19246,47 +19818,62 @@
-       export_dynamic_flag_spec_GCJ='${wl}-E'
-       ;;
+-      else
+-	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      hardcode_direct_GCJ=yes
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
  
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      hardcode_minus_L_GCJ=yes
+-      export_dynamic_flag_spec_GCJ='${wl}-E'
+-      ;;
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
 -    hpux10* | hpux11*)
-+    hpux10*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 -	case "$host_cpu" in
 -	hppa*64*|ia64*)
 -	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_separator_GCJ=:
-+
-+	hardcode_direct_GCJ=yes
-+	export_dynamic_flag_spec_GCJ='${wl}-E'
-+
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	hardcode_minus_L_GCJ=yes
-+      fi
-+      ;;
-+
-+    hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
+-	  ;;
+-	*)
 -	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
-+	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       else
+-	  ;;
+-	esac
+-      else
 -	case "$host_cpu" in
 -	hppa*64*|ia64*)
 -	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
+-	  ;;
+-	*)
 -	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       fi
-       if test "$with_gnu_ld" = no; then
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
 -	case "$host_cpu" in
 -	hppa*64*)
 -	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_separator_GCJ=:
-+
-+	case $host_cpu in
-+	hppa*64*|ia64*)
- 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
 -	  hardcode_libdir_separator_GCJ=:
 -	  hardcode_direct_GCJ=no
 -	  hardcode_shlibpath_var_GCJ=no
 -	  ;;
 -	ia64*)
 -	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
- 	  hardcode_direct_GCJ=no
- 	  hardcode_shlibpath_var_GCJ=no
--
+-	  hardcode_direct_GCJ=no
+-	  hardcode_shlibpath_var_GCJ=no
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L_GCJ=yes
- 	  ;;
- 	*)
+-	  ;;
+-	*)
 -	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 -	  hardcode_libdir_separator_GCJ=:
- 	  hardcode_direct_GCJ=yes
- 	  export_dynamic_flag_spec_GCJ='${wl}-E'
+-	  hardcode_direct_GCJ=yes
+-	  export_dynamic_flag_spec_GCJ='${wl}-E'
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
  
-@@ -19300,7 +19887,7 @@
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_GCJ=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
++# Allow CC to be a program name with arguments.
++compiler=$CC
  
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19310,7 +19897,7 @@
-       link_all_deplibs_GCJ=yes
-       ;;
+-      else
+-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      link_all_deplibs_GCJ=yes
+-      ;;
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -19333,7 +19920,8 @@
-       hardcode_direct_GCJ=yes
-       hardcode_shlibpath_var_GCJ=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
+ 
+-    newsos6)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    openbsd*)
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_GCJ='${wl}-E'
-       else
-@@ -19343,7 +19931,7 @@
- 	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
- 	   ;;
- 	 *)
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_GCJ='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-	   ;;
+-	 *)
 -	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-+	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- 	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- 	   ;;
-        esac
-@@ -19354,14 +19942,14 @@
-       hardcode_libdir_flag_spec_GCJ='-L$libdir'
-       hardcode_minus_L_GCJ=yes
-       allow_undefined_flag_GCJ=unsupported
+-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++compiler_GCJ=$CC
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+-    os2*)
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_minus_L_GCJ=yes
+-      allow_undefined_flag_GCJ=unsupported
 -      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
-+      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-       old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
+-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
  
-     osf3*)
-       if test "$GCC" = yes; then
- 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
 -	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
- 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19373,13 +19961,13 @@
-     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
- 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-      else
+-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      ;;
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++archive_cmds_need_lc_GCJ=no
+ 
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
 -	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-       else
- 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
- 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      else
+-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
 -	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
++old_archive_cmds_GCJ=$old_archive_cmds
  
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19387,21 +19975,15 @@
-       hardcode_libdir_separator_GCJ=:
-       ;;
+-	# Both c and cxx compiler support -rpath directly
+-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+-      fi
+-      hardcode_libdir_separator_GCJ=:
+-      ;;
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
  
 -    sco3.2v5*)
 -      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -11938,78 +33887,157 @@
 -      runpath_var=LD_RUN_PATH
 -      hardcode_runpath_var=yes
 -      ;;
--
-     solaris*)
-       no_undefined_flag_GCJ=' -z text'
-       if test "$GCC" = yes; then
++lt_prog_compiler_no_builtin_flag_GCJ=
+ 
+-    solaris*)
+-      no_undefined_flag_GCJ=' -z text'
+-      if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	wlarc='${wl}'
-+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
-+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-       else
-+	wlarc=''
- 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19410,8 +19992,18 @@
-       hardcode_shlibpath_var_GCJ=no
-       case $host_os in
-       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      else
+-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_shlibpath_var_GCJ=no
+-      case $host_os in
+-      solaris2.[0-5] | solaris2.[0-5].*) ;;
 -      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
 -	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
-       link_all_deplibs_GCJ=yes
-       ;;
-@@ -19420,7 +20012,7 @@
-       if test "x$host_vendor" = xsequent; then
- 	# Use $CC to link under sequent, because it throws in some extra .o
- 	# files that make .init and .fini sections work.
+-      esac
+-      link_all_deplibs_GCJ=yes
+-      ;;
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+ 
+-    sunos4*)
+-      if test "x$host_vendor" = xsequent; then
+-	# Use $CC to link under sequent, because it throws in some extra .o
+-	# files that make .init and .fini sections work.
 -	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
-+	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
- 	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-       fi
-@@ -19468,36 +20060,45 @@
-       fi
-       ;;
+-      else
+-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
  
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_GCJ=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
+-	  hardcode_direct_GCJ=no
+-        ;;
+-	motorola)
+-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:20492: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:20496: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
++
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
++else
++    :
++fi
++
++fi
+ 
+-    sysv4.3*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_GCJ=no
+-      export_dynamic_flag_spec_GCJ='-Bexport'
+-      ;;
++lt_prog_compiler_wl_GCJ=
++lt_prog_compiler_pic_GCJ=
++lt_prog_compiler_static_GCJ=
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_shlibpath_var_GCJ=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	ld_shlibs_GCJ=yes
+-      fi
+-      ;;
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
 -    sysv4.2uw2*)
 -      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_direct_GCJ=yes
 -      hardcode_minus_L_GCJ=no
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+      no_undefined_flag_GCJ='${wl}-z,text'
-+      archive_cmds_need_lc_GCJ=no
-       hardcode_shlibpath_var_GCJ=no
+-      hardcode_shlibpath_var_GCJ=no
 -      hardcode_runpath_var=yes
 -      runpath_var=LD_RUN_PATH
 -      ;;
-+      runpath_var='LD_RUN_PATH'
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl_GCJ='-Wl,'
++    lt_prog_compiler_static_GCJ='-static'
  
 -   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
 -      no_undefined_flag_GCJ='${wl}-z ${wl}text'
-       if test "$GCC" = yes; then
+-      if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
+-      else
 -	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_GCJ='-Bstatic'
        fi
 -      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var_GCJ=no
@@ -12023,143 +34051,427 @@
 -      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
 -      hardcode_libdir_flag_spec_GCJ=
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      no_undefined_flag_GCJ='${wl}-z,text'
-+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-+      archive_cmds_need_lc_GCJ=no
-       hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+      hardcode_libdir_separator_GCJ=':'
-+      link_all_deplibs_GCJ=yes
-+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-       runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
+-      hardcode_shlibpath_var_GCJ=no
+-      runpath_var='LD_RUN_PATH'
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
        ;;
  
-     uts4*)
-@@ -19516,11 +20117,6 @@
- echo "${ECHO_T}$ld_shlibs_GCJ" >&6
- test "$ld_shlibs_GCJ" = no && can_build_shared=no
+-    uts4*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_shlibpath_var_GCJ=no
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
+       ;;
  
+-    *)
+-      ld_shlibs_GCJ=no
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+       ;;
+-    esac
+-  fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+-test "$ld_shlibs_GCJ" = no && can_build_shared=no
+-
 -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"
 -fi
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_GCJ='-fno-common'
++      ;;
+ 
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$archive_cmds_need_lc_GCJ" in
+-x|xyes)
+-  # Assume -lc should be added
+-  archive_cmds_need_lc_GCJ=yes
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $archive_cmds_GCJ in
+-    *'~'*)
+-      # FIXME: we may have to deal with multi-command sequences.
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_GCJ=no
++      enable_shared=no
+       ;;
+-    '$CC '*)
+-      # Test whether the compiler implicitly links with -lc since on some
+-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-      # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$lt_prog_compiler_wl_GCJ
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
+-        allow_undefined_flag_GCJ=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-        then
+-	  archive_cmds_need_lc_GCJ=no
+-        else
+-	  archive_cmds_need_lc_GCJ=yes
+-        fi
+-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_GCJ=-Kconform_pic
+       fi
+-      $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
+       ;;
+-    esac
+-  fi
+-  ;;
+-esac
 -
- #
- # Do we need to explicitly link libc?
- #
-@@ -19553,6 +20149,7 @@
-         libobjs=conftest.$ac_objext
-         deplibs=
-         wl=$lt_prog_compiler_wl_GCJ
-+	pic_flag=$lt_prog_compiler_pic_GCJ
-         compiler_flags=-v
-         linker_flags=-v
-         verstring=
-@@ -19588,7 +20185,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
 -shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -19598,7 +20195,20 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
 -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+if test "$GCC" = yes; then
-+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
+-
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
+-
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
  
-@@ -19663,7 +20273,7 @@
- amigaos*)
-   library_names_spec='$libname.ixlibrary $libname.a'
-   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='-fPIC'
++	;;
++      esac
++      ;;
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
++    *)
++      lt_prog_compiler_pic_GCJ='-fPIC'
++      ;;
++    esac
+   else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
++    # PORTME Check for flag to pass linker flags through the system compiler.
+     case $host_os in
+-      aix4 | aix4.[01] | aix4.[01].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	:
++    aix*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_GCJ='-Bstatic'
+       else
+-	can_build_shared=no
++	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
+-    esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-    fi
+-    shlibpath_var=LIBPATH
+-  fi
+-  ;;
+-
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 -  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-   ;;
+-  ;;
+-
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic_GCJ='-qnocommon'
++         lt_prog_compiler_wl_GCJ='-Wl,'
++         ;;
++       esac
++       ;;
  
- beos*)
-@@ -19672,7 +20282,7 @@
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
 -bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19688,7 +20298,7 @@
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
+-  ;;
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      ;;
  
- cygwin* | mingw* | pw32*)
-   version_type=windows
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
 -  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
+-  need_version=no
+-  need_lib_prefix=no
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
++      ;;
  
-@@ -19700,7 +20310,8 @@
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
 -      $install_prog $dir/$dlname \$dldir/$dlname'
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-@@ -19730,7 +20341,7 @@
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
+ 
+-    case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++    newsos6)
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-      else
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-      fi
++
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
++      icc* | ecc*)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-KPIC'
++	lt_prog_compiler_static_GCJ='-static'
++        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-fpic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl_GCJ='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_GCJ='-non_shared'
++        ;;
++      esac
+       ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
 -      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static_GCJ='-non_shared'
        ;;
-     esac
-     ;;
-@@ -19753,7 +20364,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
+-    esac
+-    ;;
+ 
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
++    solaris*)
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl_GCJ='-Wl,';;
++      esac
++      ;;
+ 
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+-  soname_spec='${libname}${release}${major}$shared_ext'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-   if test "$GCC" = yes; then
-     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19776,20 +20387,17 @@
-   dynamic_linker=no
-   ;;
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
++    sunos4*)
++      lt_prog_compiler_wl_GCJ='-Qoption ld '
++      lt_prog_compiler_pic_GCJ='-PIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
  
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
+ 
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic_GCJ='-Kconform_pic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      fi
++      ;;
+ 
 -kfreebsd*-gnu*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -12171,59 +34483,78 @@
 -  hardcode_into_libs=yes
 -  dynamic_linker='GNU ld.so'
 -  ;;
--
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
+ 
 -freebsd*)
 -  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -19807,14 +20415,19 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
++    unicos*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_can_build_shared_GCJ=no
+       ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
++
++    uts4*)
++      lt_prog_compiler_pic_GCJ='-pic'
++      lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
 -  freebsd3.01* | freebsdelf3.01*)
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
 -  *) # from 3.2 on
-+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
-+  freebsd*) # from 4.6 on
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-   esac
-   ;;
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
  
-@@ -19834,1140 +20447,359 @@
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
++    *)
++      lt_prog_compiler_can_build_shared_GCJ=no
++      ;;
++    esac
++  fi
+ 
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
 -  case "$host_cpu" in
-+  case $host_cpu in
-   ia64*)
+-  ia64*)
 -    shrext='.so'
-+    shrext_cmds='.so'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.so"
-     shlibpath_var=LD_LIBRARY_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -    soname_spec='${libname}${release}${shared_ext}$major'
 -    if test "X$HPUX_IA64_MODE" = X32; then
 -      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
@@ -12255,7 +34586,14 @@
 -  # HP-UX runs *really* slowly unless shared libraries are mode 555.
 -  postinstall_cmds='chmod 555 $lib'
 -  ;;
--
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_GCJ"; then
+ 
 -irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -    nonstopux*) version_type=nonstopux ;;
@@ -12273,8 +34611,61 @@
 -  case $host_os in
 -  irix5* | nonstopux*)
 -    libsuff= shlibsuff=
--    ;;
--  *)
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_GCJ=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:20760: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:20764: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       lt_prog_compiler_pic_works_GCJ=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
++
++if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++    case $lt_prog_compiler_pic_GCJ in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
++     esac
++else
++    lt_prog_compiler_pic_GCJ=
++     lt_prog_compiler_can_build_shared_GCJ=no
++fi
++
++fi
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_GCJ=
+     ;;
+   *)
 -    case $LD in # libtool.m4 will add one of these switches to LD
 -    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
 -      libsuff= shlibsuff= libmagic=32-bit;;
@@ -12284,7 +34675,8 @@
 -      libsuff=64 shlibsuff=64 libmagic=64-bit;;
 -    *) libsuff= shlibsuff= libmagic=never-match;;
 -    esac
--    ;;
++    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
+     ;;
 -  esac
 -  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 -  shlibpath_overrides_runpath=no
@@ -12292,12 +34684,43 @@
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 -  hardcode_into_libs=yes
 -  ;;
--
++esac
+ 
 -# No shared lib support for Linux oldld, aout, or coff.
 -linux*oldld* | linux*aout* | linux*coff*)
 -  dynamic_linker=no
 -  ;;
--
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
++if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works_GCJ=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works_GCJ=yes
++       fi
++     else
++       lt_prog_compiler_static_works_GCJ=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
+ 
 -# This must be Linux ELF.
 -linux*)
 -  version_type=linux
@@ -12321,7 +34744,10 @@
 -  # Some rework will be needed to allow for fast_install
 -  # before this can be enabled.
 -  hardcode_into_libs=yes
--
++fi
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+ 
 -  # We used to test for /lib/ld.so.1 and disable shared libraries on
 -  # powerpc, because MkLinux only supported shared libraries with the
 -  # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -12330,7 +34756,12 @@
 -  # assume the GNU/Linux dynamic linker is in use.
 -  dynamic_linker='GNU/Linux ld.so'
 -  ;;
--
++if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++    :
++else
++    lt_prog_compiler_static_GCJ=
++fi
+ 
 -netbsd*)
 -  version_type=sunos
 -  need_lib_prefix=no
@@ -12343,19 +34774,93 @@
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
 -    soname_spec='${libname}${release}${shared_ext}$major'
 -    dynamic_linker='NetBSD ld.elf_so'
--  fi
++
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
++if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_GCJ=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -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:20864: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:20868: \$? = $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
++     # So say no if there are warnings
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_c_o_GCJ=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
+   fi
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
 -  ;;
--
++else
++  need_locks=no
++fi
+ 
 -newsos6)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  ;;
--
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
 -nto-qnx*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -12365,7 +34870,71 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  ;;
--
++  runpath_var=
++  allow_undefined_flag_GCJ=
++  enable_shared_with_static_runtimes_GCJ=no
++  archive_cmds_GCJ=
++  archive_expsym_cmds_GCJ=
++  old_archive_From_new_cmds_GCJ=
++  old_archive_from_expsyms_cmds_GCJ=
++  export_dynamic_flag_spec_GCJ=
++  whole_archive_flag_spec_GCJ=
++  thread_safe_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_ld_GCJ=
++  hardcode_libdir_separator_GCJ=
++  hardcode_direct_GCJ=no
++  hardcode_minus_L_GCJ=no
++  hardcode_shlibpath_var_GCJ=unsupported
++  link_all_deplibs_GCJ=unknown
++  hardcode_automatic_GCJ=no
++  module_cmds_GCJ=
++  module_expsym_cmds_GCJ=
++  always_export_symbols_GCJ=no
++  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_GCJ=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
+ 
 -openbsd*)
 -  version_type=sunos
 -  need_lib_prefix=no
@@ -12386,7 +34955,11 @@
 -    shlibpath_overrides_runpath=yes
 -  fi
 -  ;;
--
++  ld_shlibs_GCJ=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
 -os2*)
 -  libname_spec='$name'
 -  shrext=".dll"
@@ -12395,7 +34968,27 @@
 -  dynamic_linker='OS/2 ld.exe'
 -  shlibpath_var=LIBPATH
 -  ;;
--
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_GCJ=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
+ 
 -osf3* | osf4* | osf5*)
 -  version_type=osf
 -  need_lib_prefix=no
@@ -12406,14 +34999,26 @@
 -  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
 -  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
 -  ;;
--
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
+ 
 -sco3.2v5*)
 -  version_type=osf
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
--
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+ 
 -solaris*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -12426,7 +35031,10 @@
 -  # ldd complains unless libraries are executable
 -  postinstall_cmds='chmod +x $lib'
 -  ;;
--
++EOF
++      fi
++      ;;
+ 
 -sunos4*)
 -  version_type=sunos
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -12438,7 +35046,11 @@
 -  fi
 -  need_version=yes
 -  ;;
--
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
+ 
 -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12450,19 +35062,60 @@
 -      need_lib_prefix=no
 -      export_dynamic_flag_spec='${wl}-Blargedynsym'
 -      runpath_var=LD_RUN_PATH
--      ;;
++      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_GCJ=no
+       ;;
 -    siemens)
 -      need_lib_prefix=no
--      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_GCJ=unsupported
++	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
+       ;;
 -    motorola)
 -      need_lib_prefix=no
 -      need_version=no
 -      shlibpath_overrides_runpath=no
 -      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
--      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=no
++      enable_shared_with_static_runtimes_GCJ=yes
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
+       ;;
 -  esac
 -  ;;
--
+ 
 -sysv4*MP*)
 -  if test -d /usr/nec ;then
 -    version_type=linux
@@ -12471,14 +35124,47 @@
 -    shlibpath_var=LD_LIBRARY_PATH
 -  fi
 -  ;;
--
++    interix3*)
++      hardcode_direct_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec_GCJ='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
+ 
 -uts4*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
--
++    linux* | k*bsd*-gnu)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
 -*)
 -  dynamic_linker=no
 -  ;;
@@ -12486,14 +35172,34 @@
 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6
 -test "$dynamic_linker" = no && can_build_shared=no
--
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs_GCJ=no
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
+ 
 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 -hardcode_action_GCJ=
 -if test -n "$hardcode_libdir_flag_spec_GCJ" || \
 -   test -n "$runpath_var GCJ" || \
 -   test "X$hardcode_automatic_GCJ"="Xyes" ; then
--
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
+ 
 -  # We can hardcode non-existant directories.
 -  if test "$hardcode_direct_GCJ" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -12514,7 +35220,11 @@
 -fi
 -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
 -echo "${ECHO_T}$hardcode_action_GCJ" >&6
--
++    solaris*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
+ 
 -if test "$hardcode_action_GCJ" = relink; then
 -  # Fast installation is not supported
 -  enable_fast_install=no
@@ -12523,7 +35233,13 @@
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
 -fi
--
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
 -striplib=
 -old_striplib=
 -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
@@ -12552,7 +35268,15 @@
 -    ;;
 -  esac
 -fi
--
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
+ 
 -if test "x$enable_dlopen" != xyes; then
 -  enable_dlopen=unknown
 -  enable_dlopen_self=unknown
@@ -12560,24 +35284,54 @@
 -else
 -  lt_cv_dlopen=no
 -  lt_cv_dlopen_libs=
--
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++	ld_shlibs_GCJ=no
++	cat <<_LT_EOF 1>&2
+ 
 -  case $host_os in
 -  beos*)
 -    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
 -    ;;
--
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
 -   ;;
--
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    ld_shlibs_GCJ=no
++	  fi
++	;;
++      esac
++      ;;
+ 
 -  cygwin*)
 -    lt_cv_dlopen="dlopen"
 -    lt_cv_dlopen_libs=
 -   ;;
--
++    sunos4*)
++      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
 -  darwin*)
 -  # if libdl is installed we need to link against it
 -    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -12593,7 +35347,16 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++    esac
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -12618,7 +35381,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -12634,7 +35398,29 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    if test "$ld_shlibs_GCJ" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec_GCJ=
++      export_dynamic_flag_spec_GCJ=
++      whole_archive_flag_spec_GCJ=
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=yes
++      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_GCJ=yes
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_GCJ=unsupported
++      fi
++      ;;
+ 
 -ac_cv_lib_dl_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -12646,15 +35432,51 @@
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
--
++    aix4* | aix5*)
++      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.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
+ 
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
--
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	  ;;
++	esac
+ 
 -fi
--
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
+ 
 -   ;;
--
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
 -  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
@@ -12662,11 +35484,66 @@
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++      archive_cmds_GCJ=''
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[012]|aix4.[012].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_GCJ=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_GCJ=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_GCJ=yes
++  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
++  	  hardcode_libdir_separator_GCJ=
++	  fi
++	  ;;
++	esac
++	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++	  fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_GCJ=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_GCJ='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shl_load innocuous_shl_load
@@ -12703,41 +35580,63 @@
 -#ifdef __cplusplus
 -}
 -#endif
--
--int
--main ()
--{
+ 
+ int
+ main ()
+ {
 -return f != shl_load;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
 -  ac_cv_func_shl_load=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -ac_cv_func_shl_load=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -12752,16 +35651,41 @@
 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldld  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_GCJ="-z nodefs"
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -12769,40 +35693,68 @@
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
--int
--main ()
--{
+ int
+ main ()
+ {
 -shl_load ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
 -  ac_cv_lib_dld_shl_load=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -ac_cv_lib_dld_shl_load=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -12828,20 +35780,377 @@
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
--
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_GCJ=' ${wl}-bernotok'
++	  allow_undefined_flag_GCJ=' ${wl}-berok'
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec_GCJ='$convenience'
++	  archive_cmds_need_lc_GCJ=yes
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_GCJ=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec_GCJ=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ=' '
++      allow_undefined_flag_GCJ=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_GCJ='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes_GCJ=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc_GCJ=no
++      hardcode_direct_GCJ=no
++      hardcode_automatic_GCJ=yes
++      hardcode_shlibpath_var_GCJ=unsupported
++      whole_archive_flag_spec_GCJ=''
++      link_all_deplibs_GCJ=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_GCJ=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs_GCJ=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_direct_GCJ=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-E'
++      ;;
++
++    hpux10*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_GCJ=:
++
++	hardcode_direct_GCJ=yes
++	export_dynamic_flag_spec_GCJ='${wl}-E'
++
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	hardcode_minus_L_GCJ=yes
++      fi
++      ;;
++
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case $host_cpu in
++	hppa*64*)
++	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_GCJ=:
++
++	case $host_cpu in
++	hppa*64*|ia64*)
++	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
++	  hardcode_direct_GCJ=no
++	  hardcode_shlibpath_var_GCJ=no
++	  ;;
++	*)
++	  hardcode_direct_GCJ=yes
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_GCJ=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      link_all_deplibs_GCJ=yes
++      ;;
++
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    newsos6)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    openbsd*)
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_GCJ='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      allow_undefined_flag_GCJ=unsupported
++      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_GCJ=:
++      ;;
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++    solaris*)
++      no_undefined_flag_GCJ=' -z text'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	wlarc=''
++	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
++      esac
++      link_all_deplibs_GCJ=yes
++      ;;
+ 
 -#undef dlopen
--
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -12861,7 +36170,28 @@
 -#ifdef __cplusplus
 -}
 -#endif
--
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
++	  hardcode_direct_GCJ=no
++        ;;
++	motorola)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
 -int
 -main ()
 -{
@@ -12879,7 +36209,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -12895,7 +36226,12 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    sysv4.3*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_GCJ=no
++      export_dynamic_flag_spec_GCJ='-Bexport'
++      ;;
+ 
 -ac_cv_func_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -12919,7 +36255,16 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_GCJ=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_GCJ=yes
++      fi
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -12944,7 +36289,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -12960,7 +36306,12 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++      no_undefined_flag_GCJ='${wl}-z,text'
++      archive_cmds_need_lc_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
++      runpath_var='LD_RUN_PATH'
+ 
 -ac_cv_lib_dl_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -12985,7 +36336,15 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -13010,7 +36369,8 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -13026,7 +36386,23 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      no_undefined_flag_GCJ='${wl}-z,text'
++      allow_undefined_flag_GCJ='${wl}-z,nodefs'
++      archive_cmds_need_lc_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
++      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
++      runpath_var='LD_RUN_PATH'
+ 
 -ac_cv_lib_svld_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -13051,7 +36427,15 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -13076,23 +36460,98 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++    uts4*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    *)
++      ld_shlibs_GCJ=no
++      ;;
++    esac
++  fi
++
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
++test "$ld_shlibs_GCJ" = no && can_build_shared=no
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_GCJ" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_GCJ=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_GCJ in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_GCJ
++	pic_flag=$lt_prog_compiler_pic_GCJ
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
++        allow_undefined_flag_GCJ=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_lib_dld_dld_link=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_GCJ=no
++        else
++	  archive_cmds_need_lc_GCJ=yes
++        fi
++        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
++      ;;
++    esac
++  fi
++  ;;
++esac
+ 
 -ac_cv_lib_dld_dld_link=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -13103,7 +36562,313 @@
 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
+ 
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
 -fi
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
+ 
+-fi
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
+ 
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
+ 
+-fi
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
+ 
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
+ 
+-fi
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
+ 
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
+ 
+-fi
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
+ 
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+   esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
+ 
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+   else
+-    enable_dlopen=no
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+   fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++freebsd1*)
++  dynamic_linker=no
++  ;;
+ 
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
+ 
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20778 "configure"
+-#include "confdefs.h"
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case $host_cpu in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +    soname_spec='${libname}${release}${shared_ext}$major'
 +    if test "X$HPUX_IA64_MODE" = X32; then
 +      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
@@ -13136,6 +36901,7 @@
 +  postinstall_cmds='chmod 555 $lib'
 +  ;;
  
+-#include <stdio.h>
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -13148,7 +36914,15 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--fi
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
 +irix5* | irix6* | nonstopux*)
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
@@ -13186,12 +36960,35 @@
 +  hardcode_into_libs=yes
 +  ;;
  
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
 +# No shared lib support for Linux oldld, aout, or coff.
 +linux*oldld* | linux*aout* | linux*coff*)
 +  dynamic_linker=no
 +  ;;
  
--fi
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
 +# This must be Linux ELF.
 +linux* | k*bsd*-gnu)
 +  version_type=linux
@@ -13207,13 +37004,17 @@
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
  
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
- 
--fi
++
 +  # We used to test for /lib/ld.so.1 and disable shared libraries on
 +  # powerpc, because MkLinux only supported shared libraries with the
 +  # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -13223,6 +37024,12 @@
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
  
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -13235,7 +37042,24 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
  
--fi
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
@@ -13248,12 +37072,18 @@
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +    soname_spec='${libname}${release}${shared_ext}$major'
 +    dynamic_linker='NetBSD ld.elf_so'
-+  fi
+   fi
+-fi
+-rm -fr conftest*
+-
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 +  ;;
  
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 +newsos6)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -13261,7 +37091,21 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--fi
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20876 "configure"
+-#include "confdefs.h"
 +nto-qnx*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -13272,7 +37116,9 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--    ;;
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
 +openbsd*)
 +  version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
@@ -13281,10 +37127,7 @@
 +  case $host_os in
 +    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
 +    *)                         need_version=no  ;;
-   esac
--
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
++  esac
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -13297,41 +37140,11 @@
 +	shlibpath_overrides_runpath=yes
 +	;;
 +      esac
-   else
--    enable_dlopen=no
++  else
 +    shlibpath_overrides_runpath=yes
-   fi
++  fi
 +  ;;
  
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
--    save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
--
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 20772 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
 -#include <stdio.h>
 +os2*)
 +  libname_spec='$name'
@@ -13466,9 +37279,9 @@
 -    (./conftest; exit; ) 2>/dev/null
 -    lt_status=$?
 -    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -13490,81 +37303,13 @@
      esac
 -  else :
 -    # compilation failed
--    lt_cv_dlopen_self=no
+-    lt_cv_dlopen_self_static=no
    fi
 -fi
 -rm -fr conftest*
--
--
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
--
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self_static=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 20870 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
--
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
- 
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
++
 +uts4*)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -13572,52 +37317,38 @@
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
  
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
 +*)
 +  dynamic_linker=no
 +  ;;
 +esac
-+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
 +test "$dynamic_linker" = no && can_build_shared=no
  
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
--    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self_static=no
--  fi
 +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"
  fi
--rm -fr conftest*
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-    fi
  
-+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 +hardcode_action_GCJ=
 +if test -n "$hardcode_libdir_flag_spec_GCJ" || \
 +   test -n "$runpath_var_GCJ" || \
 +   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
  
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct_GCJ" != no &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -13635,23 +37366,9 @@
 +  # We cannot hardcode anything, or else we can only hardcode existing
 +  # directories.
 +  hardcode_action_GCJ=unsupported
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
--    fi
--
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
--
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
-+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6
++fi
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
  
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
@@ -13667,7 +37384,7 @@
  fi
  
  
-@@ -20984,7 +20816,8 @@
+@@ -20990,7 +22603,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -13677,7 +37394,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21084,6 +20917,12 @@
+@@ -21090,6 +22704,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -13690,7 +37407,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21095,6 +20934,9 @@
+@@ -21101,6 +22721,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -13700,7 +37417,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21114,7 +20956,7 @@
+@@ -21120,7 +22743,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -13709,7 +37426,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21145,7 +20987,7 @@
+@@ -21151,7 +22774,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -13718,7 +37435,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21160,7 +21002,7 @@
+@@ -21166,7 +22789,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -13727,7 +37444,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21362,7 +21204,10 @@
+@@ -21368,7 +22991,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -13739,7 +37456,15 @@
  fi
  
  
-@@ -21401,15 +21246,42 @@
+@@ -21388,7 +23014,6 @@
+       RC)
+ 
+ 
+-
+ # Source file extension for RC test sources.
+ ac_ext=rc
+ 
+@@ -21407,15 +23032,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -13782,7 +37507,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21425,7 +21297,8 @@
+@@ -21431,7 +23083,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -13792,7 +37517,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21525,6 +21398,12 @@
+@@ -21531,6 +23184,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -13805,7 +37530,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21536,6 +21415,9 @@
+@@ -21542,6 +23201,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -13815,7 +37540,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21555,7 +21437,7 @@
+@@ -21561,7 +23223,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -13824,7 +37549,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21586,7 +21468,7 @@
+@@ -21592,7 +23254,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -13833,7 +37558,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21601,7 +21483,7 @@
+@@ -21607,7 +23269,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -13842,7 +37567,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21803,7 +21685,10 @@
+@@ -21809,7 +23471,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -13854,7 +37579,7 @@
  fi
  
  
-@@ -21850,7 +21735,7 @@
+@@ -21856,7 +23521,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -13863,7 +37588,228 @@
  
  # Prevent multiple expansion
  
-@@ -22249,9 +22134,6 @@
+@@ -21911,8 +23576,8 @@
+ 
+     # Extract the first word of "msgfmt", so it can be a program name with args.
+ 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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MSGFMT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -21938,17 +23603,17 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test -n "$MSGFMT"; then
+-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-echo "${ECHO_T}$MSGFMT" >&6
++  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+     # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GMSGFMT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -21963,32 +23628,33 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+   ;;
+ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+-
+ if test -n "$GMSGFMT"; then
+-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-echo "${ECHO_T}$GMSGFMT" >&6
++  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
++
+      if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
+-        echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
++        { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
++echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
+         GMSGFMT=":"
+       fi
+       MSGFMT=$GMSGFMT
+@@ -21997,8 +23663,8 @@
+ 
+       # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_XGETTEXT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22024,11 +23690,11 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test -n "$XGETTEXT"; then
+-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-echo "${ECHO_T}$XGETTEXT" >&6
++  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -22036,8 +23702,8 @@
+ 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ 	  : ;
+ 	else
+-	  echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
+-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
++	  { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
+ 	  XGETTEXT=":"
+ 	fi
+       fi
+@@ -22131,8 +23797,7 @@
+ 
+ 
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22144,8 +23809,8 @@
+     ac_save_CXXFLAGS="$CXXFLAGS"
+     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
+ 
+-    echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
+-echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
++echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
+     if test "${kde_cv_stl_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22173,24 +23838,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22199,15 +23876,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_stl_works=no
++	kde_cv_stl_works=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+ 
+-   echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
+-echo "${ECHO_T}$kde_cv_stl_works" >&6
++   { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
++echo "${ECHO_T}$kde_cv_stl_works" >&6; }
+ 
+    if test "$kde_cv_stl_works" = "yes"; then
+      # back compatible
+@@ -22236,15 +23914,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for strlcat" >&5
+-echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcat" >&5
++echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22256,9 +23933,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -13873,7 +37819,180 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22468,9 +22350,6 @@
+@@ -22284,24 +23958,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22310,9 +23996,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcat=no
++	kde_cv_func_strlcat=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -22325,11 +24012,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
++echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
++echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22350,8 +24037,7 @@
+ if test "x$kde_cv_proto_strlcat" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22389,24 +24075,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22416,10 +24114,11 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_strlcat="strlcat unavailable"
++	kde_cv_proto_strlcat="strlcat unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -22432,8 +24131,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
+ 
+ if test "x$kde_cv_func_strlcat" = xyes; then
+ 
+@@ -22457,15 +24156,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for strlcpy" >&5
+-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcpy" >&5
++echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcpy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22477,9 +24175,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -13883,7 +38002,2481 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24651,9 +24530,6 @@
+@@ -22504,24 +24199,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22530,9 +24237,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcpy=no
++	kde_cv_func_strlcpy=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -22545,11 +24253,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
++echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcpy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22570,8 +24278,7 @@
+ if test "x$kde_cv_proto_strlcpy" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22608,24 +24315,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22635,10 +24354,11 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_strlcpy="strlcpy unavailable"
++	kde_cv_proto_strlcpy="strlcpy unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -22651,8 +24371,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
+ 
+ if test "x$kde_cv_func_strlcpy" = xyes; then
+ 
+@@ -22675,8 +24395,8 @@
+ 
+ 
+ 
+-      echo "$as_me:$LINENO: checking for main in -lutil" >&5
+-echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for main in -lutil" >&5
++echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_util_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22693,30 +24413,42 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22725,20 +24457,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_util_main=no
++	ac_cv_lib_util_main=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_util_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
++echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
+ if test $ac_cv_lib_util_main = yes; then
+   LIBUTIL="-lutil"
+ fi
+ 
+-   echo "$as_me:$LINENO: checking for main in -lcompat" >&5
+-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
++echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_compat_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22755,30 +24488,42 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22787,21 +24532,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_compat_main=no
++	ac_cv_lib_compat_main=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
++echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
+ if test $ac_cv_lib_compat_main = yes; then
+   LIBCOMPAT="-lcompat"
+ fi
+ 
+    kde_have_crypt=
+-   echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
++echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_crypt_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22814,40 +24560,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22856,19 +24614,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypt_crypt=no
++	ac_cv_lib_crypt_crypt=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
+ if test $ac_cv_lib_crypt_crypt = yes; then
+   LIBCRYPT="-lcrypt"; kde_have_crypt=yes
+ else
+-  echo "$as_me:$LINENO: checking for crypt in -lc" >&5
+-echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
++echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22881,40 +24640,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22923,14 +24694,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_c_crypt=no
++	ac_cv_lib_c_crypt=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
+ if test $ac_cv_lib_c_crypt = yes; then
+   kde_have_crypt=yes
+ else
+@@ -22956,13 +24728,13 @@
+ 
+    fi
+ 
+-   echo "$as_me:$LINENO: checking for socklen_t" >&5
+-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+    if test "${kde_cv_socklen_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-      ac_ext=cc
++      ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22991,24 +24763,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23020,8 +24804,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23031,17 +24817,17 @@
+ 
+ fi
+ 
+-   echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t" >&6
++   { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
++echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
+    if test $kde_cv_socklen_t = no; then
+-      echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
+-echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
++echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
+       if test "${kde_cv_socklen_t_equiv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+          kde_cv_socklen_t_equiv=int
+-         ac_ext=cc
++         ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -23070,24 +24856,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23099,8 +24897,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+          done
+          ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23111,8 +24911,8 @@
+ 
+ fi
+ 
+-      echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
++echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
+    fi
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -23125,8 +24925,8 @@
+ _ACEOF
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23139,40 +24939,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23181,21 +24993,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dnet_dnet_ntoa=no
++	ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23208,40 +25021,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23250,21 +25075,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dnet_stub_dnet_ntoa=no
++	ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+ 
+    fi
+-   echo "$as_me:$LINENO: checking for inet_ntoa" >&5
+-echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
++echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
+ if test "${ac_cv_func_inet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23291,53 +25117,59 @@
+ 
+ #undef inet_ntoa
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char inet_ntoa ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
++#if defined __stub_inet_ntoa || defined __stub___inet_ntoa
+ choke me
+-#else
+-char (*f) () = inet_ntoa;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != inet_ntoa;
++return inet_ntoa ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23346,17 +25178,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_inet_ntoa=no
++	ac_cv_func_inet_ntoa=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
+ 
+    if test $ac_cv_func_inet_ntoa = no; then
+-     echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
+-echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
++echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23369,40 +25202,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char inet_ntoa ();
+ int
+ main ()
+ {
+-inet_ntoa ();
++return inet_ntoa ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23411,21 +25256,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_nsl_inet_ntoa=no
++	ac_cv_lib_nsl_inet_ntoa=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
+ if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+    fi
+-   echo "$as_me:$LINENO: checking for connect" >&5
+-echo $ECHO_N "checking for connect... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23452,53 +25298,59 @@
+ 
+ #undef connect
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char connect ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_connect) || defined (__stub___connect)
++#if defined __stub_connect || defined __stub___connect
+ choke me
+-#else
+-char (*f) () = connect;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != connect;
++return connect ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23507,17 +25359,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_connect=no
++	ac_cv_func_connect=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-echo "${ECHO_T}$ac_cv_func_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+ 
+    if test $ac_cv_func_connect = no; then
+-      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23530,40 +25383,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char connect ();
+ int
+ main ()
+ {
+-connect ();
++return connect ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23572,22 +25437,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_socket_connect=no
++	ac_cv_lib_socket_connect=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+ 
+    fi
+ 
+-   echo "$as_me:$LINENO: checking for remove" >&5
+-echo $ECHO_N "checking for remove... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for remove" >&5
++echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23614,53 +25480,59 @@
+ 
+ #undef remove
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char remove ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_remove) || defined (__stub___remove)
++#if defined __stub_remove || defined __stub___remove
+ choke me
+-#else
+-char (*f) () = remove;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != remove;
++return remove ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23669,17 +25541,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_remove=no
++	ac_cv_func_remove=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-echo "${ECHO_T}$ac_cv_func_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
++echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+ 
+    if test $ac_cv_func_remove = no; then
+-      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23692,40 +25565,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char remove ();
+ int
+ main ()
+ {
+-remove ();
++return remove ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23734,14 +25619,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_posix_remove=no
++	ac_cv_lib_posix_remove=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+@@ -23749,8 +25635,8 @@
+    fi
+ 
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-   echo "$as_me:$LINENO: checking for shmat" >&5
+-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for shmat" >&5
++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23777,53 +25663,59 @@
+ 
+ #undef shmat
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shmat ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shmat) || defined (__stub___shmat)
++#if defined __stub_shmat || defined __stub___shmat
+ choke me
+-#else
+-char (*f) () = shmat;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != shmat;
++return shmat ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23832,18 +25724,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_shmat=no
++	ac_cv_func_shmat=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-echo "${ECHO_T}$ac_cv_func_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
++echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+ if test $ac_cv_func_shmat = yes; then
+   :
+ else
+-  echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23856,40 +25749,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shmat ();
+ int
+ main ()
+ {
+-shmat ();
++return shmat ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23898,14 +25803,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ipc_shmat=no
++	ac_cv_lib_ipc_shmat=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+@@ -23919,18 +25825,19 @@
+ for ac_header in sys/types.h stdint.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23941,24 +25848,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23967,15 +25886,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23984,8 +25904,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -24009,9 +25934,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24035,25 +25961,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24071,18 +25991,19 @@
+ for ac_header in sys/bitypes.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24093,24 +26014,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24119,15 +26052,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24136,8 +26070,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -24161,9 +26100,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24187,25 +26127,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24219,8 +26153,8 @@
+ 
+ 
+    # darwin requires a poll emulation library
+-   echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
+-echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
++echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_poll_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24233,40 +26167,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char poll ();
+ int
+ main ()
+ {
+-poll ();
++return poll ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24275,14 +26221,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_poll_poll=no
++	ac_cv_lib_poll_poll=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
+-echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
++echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
+ if test $ac_cv_lib_poll_poll = yes; then
+   LIB_POLL="-lpoll"
+ fi
+@@ -24293,18 +26240,19 @@
+ for ac_header in Carbon/Carbon.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24315,24 +26263,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24341,15 +26301,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24358,8 +26319,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -24383,9 +26349,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24409,25 +26376,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24442,17 +26403,17 @@
+ 
+    # CoreAudio framework
+    if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24463,24 +26424,36 @@
+ #include <CoreAudio/CoreAudio.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24489,15 +26462,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24506,8 +26480,13 @@
+ /* end confdefs.h.  */
+ #include <CoreAudio/CoreAudio.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -24531,9 +26510,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24557,25 +26537,18 @@
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+@@ -24592,8 +26565,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
+-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
++echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
+   kde_libs_safe="$LIBS"
+   LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -24619,31 +26592,43 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+       LIBRESOLV="-lresolv"
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_RES_INIT 1
+@@ -24654,25 +26639,25 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	 { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   LIBS=$kde_libs_safe
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for res_init" >&5
+-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for res_init" >&5
++echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
+ if test "${kde_cv_func_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -24684,9 +26669,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -13893,70 +40486,9377 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29543,7 +29419,7 @@
+@@ -24712,24 +26694,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24738,9 +26732,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_res_init=no
++	kde_cv_func_res_init=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+ ac_ext=c
+@@ -24753,11 +26748,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
+-echo "${ECHO_T}$kde_cv_func_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
++echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
+-echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
++echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24778,8 +26773,7 @@
+ if test "x$kde_cv_proto_res_init" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -24817,24 +26811,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24844,10 +26850,11 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_res_init="res_init unavailable"
++	kde_cv_proto_res_init="res_init unavailable"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+ ac_ext=c
+@@ -24860,8 +26867,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
+-echo "${ECHO_T}$kde_cv_proto_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
++echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
+ 
+ if test "x$kde_cv_func_res_init" = xyes; then
+ 
+@@ -24888,8 +26895,8 @@
+    LIBSOCKET="$X_EXTRA_LIBS"
+ 
+ 
+-   echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
+-echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
++echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ucb_killpg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24902,40 +26909,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char killpg ();
+ int
+ main ()
+ {
+-killpg ();
++return killpg ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24944,27 +26963,28 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ucb_killpg=no
++	ac_cv_lib_ucb_killpg=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
+-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
++echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
+ if test $ac_cv_lib_ucb_killpg = yes; then
+   LIBUCB="-lucb"
+ fi
+ 
+ 
+    case $host in     *-*-lynxos* )
+-        echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
+-echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
++echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
+         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+-        echo "$as_me:$LINENO: result: disabled" >&5
+-echo "${ECHO_T}disabled" >&6
+-        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: result: disabled" >&5
++echo "${ECHO_T}disabled" >&6; }
++        { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24977,40 +26997,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char gethostbyname ();
+ int
+ main ()
+ {
+-gethostbyname ();
++return gethostbyname ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25019,22 +27051,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_bsd_gethostbyname=no
++	ac_cv_lib_bsd_gethostbyname=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   LIBSOCKET="-lbsd"
+ fi
+           ;;
+     esac
+ 
+-     echo "$as_me:$LINENO: checking for int" >&5
+-echo $ECHO_N "checking for int... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+ if test "${ac_cv_type_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25045,36 +27078,49 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef int ac__type_new_;
+ int
+ main ()
+ {
+-if ((int *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (int))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25083,20 +27129,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_int=no
++	ac_cv_type_int=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+-echo "${ECHO_T}$ac_cv_type_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of int" >&5
+-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_int" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -25109,10 +27156,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25120,24 +27168,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25150,10 +27210,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25161,24 +27222,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25187,30 +27260,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25218,24 +27293,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25248,10 +27335,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25259,24 +27347,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25285,24 +27385,27 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25313,10 +27416,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25324,24 +27428,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25350,26 +27466,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25377,8 +27487,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (int)); }
+-unsigned long ulongval () { return (long) (sizeof (int)); }
++		   typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25387,35 +27498,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (int))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25426,28 +27546,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+ else
+   ac_cv_sizeof_int=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+ 
+-   echo "$as_me:$LINENO: checking for short" >&5
+-echo $ECHO_N "checking for short... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+ if test "${ac_cv_type_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25458,36 +27577,49 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef short ac__type_new_;
+ int
+ main ()
+ {
+-if ((short *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (short))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25496,20 +27628,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_short=no
++	ac_cv_type_short=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+-echo "${ECHO_T}$ac_cv_type_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of short" >&5
+-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_short" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -25522,10 +27655,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25533,24 +27667,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25563,10 +27709,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25574,24 +27721,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25600,30 +27759,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25631,24 +27792,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25661,10 +27834,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25672,24 +27846,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25698,24 +27884,27 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25726,10 +27915,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25737,24 +27927,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25763,26 +27965,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25790,8 +27986,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (short)); }
+-unsigned long ulongval () { return (long) (sizeof (short)); }
++		   typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25800,35 +27997,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (short))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25839,28 +28045,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+ else
+   ac_cv_sizeof_short=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25871,36 +28076,49 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef long ac__type_new_;
+ int
+ main ()
+ {
+-if ((long *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (long))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25909,20 +28127,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_long=no
++	ac_cv_type_long=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -25935,10 +28154,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25946,24 +28166,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25976,10 +28208,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25987,24 +28220,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26013,30 +28258,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26044,24 +28291,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26074,10 +28333,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26085,24 +28345,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26111,24 +28383,27 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26139,10 +28414,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26150,24 +28426,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26176,26 +28464,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -26203,8 +28485,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
++		   typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26213,35 +28496,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (long))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26252,28 +28544,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+ else
+   ac_cv_sizeof_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for char *" >&5
+-echo $ECHO_N "checking for char *... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for char *" >&5
++echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+ if test "${ac_cv_type_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26284,36 +28575,49 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef char * ac__type_new_;
+ int
+ main ()
+ {
+-if ((char * *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (char *))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26322,20 +28626,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_char_p=no
++	ac_cv_type_char_p=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+-echo "${ECHO_T}$ac_cv_type_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
++echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of char *" >&5
+-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of char *" >&5
++echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_char_p" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -26348,10 +28653,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26359,24 +28665,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26389,10 +28707,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26400,24 +28719,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26426,30 +28757,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26457,24 +28790,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26487,10 +28832,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26498,24 +28844,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26524,24 +28882,27 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26552,10 +28913,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26563,24 +28925,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26589,26 +28963,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char_p=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -26616,8 +28984,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (char *)); }
+-unsigned long ulongval () { return (long) (sizeof (char *)); }
++		   typedef char * ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26626,35 +28995,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (char *))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26665,30 +29043,29 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+ else
+   ac_cv_sizeof_char_p=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+ _ACEOF
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26701,40 +29078,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26743,14 +29132,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
++	ac_cv_lib_dl_dlopen=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ 
+ LIBDL="-ldl"
+@@ -26759,8 +29149,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
+-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
++echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26773,40 +29163,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shl_unload ();
+ int
+ main ()
+ {
+-shl_unload ();
++return shl_unload ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26815,14 +29217,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_shl_unload=no
++	ac_cv_lib_dld_shl_unload=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
+ if test $ac_cv_lib_dld_shl_unload = yes; then
+ 
+ LIBDL="-ldld"
+@@ -26836,8 +29239,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26848,36 +29251,49 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((size_t *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (size_t))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26886,20 +29302,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_size_t=no
++	ac_cv_type_size_t=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of size_t" >&5
+-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of size_t" >&5
++echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_size_t" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -26912,10 +29329,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26923,24 +29341,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26953,10 +29383,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26964,24 +29395,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26990,30 +29433,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27021,24 +29466,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27051,10 +29508,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27062,24 +29520,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27088,24 +29558,27 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27116,10 +29589,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27127,24 +29601,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27153,26 +29639,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_size_t=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27180,8 +29660,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (size_t)); }
+-unsigned long ulongval () { return (long) (sizeof (size_t)); }
++		   typedef size_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27190,35 +29671,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (size_t))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (size_t))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (size_t))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27229,29 +29719,28 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+ else
+   ac_cv_sizeof_size_t=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+ 
+ 
+-  echo "$as_me:$LINENO: checking for unsigned long" >&5
+-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for unsigned long" >&5
++echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_unsigned_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27262,36 +29751,49 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef unsigned long ac__type_new_;
+ int
+ main ()
+ {
+-if ((unsigned long *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (unsigned long))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27300,20 +29802,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_unsigned_long=no
++	ac_cv_type_unsigned_long=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of unsigned long" >&5
+-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
++echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_unsigned_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -27326,10 +29829,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27337,24 +29841,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27367,10 +29883,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27378,24 +29895,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27404,30 +29933,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27435,24 +29966,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27465,10 +30008,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27476,24 +30020,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27502,24 +30058,27 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27530,10 +30089,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27541,24 +30101,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27567,26 +30139,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27594,8 +30160,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (unsigned long)); }
+-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
++		   typedef unsigned long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27604,35 +30171,44 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (unsigned long))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (unsigned long))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (unsigned long))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27643,30 +30219,29 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+ else
+   ac_cv_sizeof_unsigned_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+ _ACEOF
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
++echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27687,36 +30262,48 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       { { echo "$as_me:$LINENO: error:
+        Apparently on your system our assumption sizeof size_t == sizeof unsigned long
+        does not apply. Please mail kde-devel at kde.org with a description of your system!
+@@ -27728,18 +30315,18 @@
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-  echo "$as_me:$LINENO: checking for PIE support" >&5
+-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++
++  { echo "$as_me:$LINENO: checking for PIE support" >&5
++echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
+ if test "${kde_cv_val_pie_support+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -27769,24 +30356,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27795,9 +30394,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_pie_support=no
++	kde_cv_val_pie_support=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+     CXXFLAGS=$safe_CXXFLAGS
+@@ -27810,26 +30410,26 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
+-echo "${ECHO_T}$kde_cv_val_pie_support" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
++echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
+ 
+-  echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
+-echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
++echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
+ 
+-  # Check whether --enable-pie or --disable-pie was given.
++  # Check whether --enable-pie was given.
+ if test "${enable_pie+set}" = set; then
+-  enableval="$enable_pie"
+-  kde_has_pie_support=$enableval
++  enableval=$enable_pie; kde_has_pie_support=$enableval
+ else
+   kde_has_pie_support=detect
+-fi;
++fi
++
+ 
+   if test "$kde_has_pie_support" = "detect"; then
+     kde_has_pie_support=$kde_cv_val_pie_support
+   fi
+ 
+-  echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
+-echo "${ECHO_T}$kde_has_pie_support" >&6
++  { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
++echo "${ECHO_T}$kde_has_pie_support" >&6; }
+ 
+   KDE_USE_FPIE=""
+   KDE_USE_PIE=""
+@@ -27848,18 +30448,19 @@
+ for ac_header in crt_externs.h
  do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27870,24 +30471,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27896,15 +30509,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27913,8 +30527,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -27938,9 +30557,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -27964,25 +30584,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -27994,8 +30608,8 @@
+ 
+ done
+ 
+-echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
+-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
++echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
+ if test "${ac_cv_func__NSGetEnviron+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28022,53 +30636,59 @@
+ 
+ #undef _NSGetEnviron
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char _NSGetEnviron ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
++#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
+ choke me
+-#else
+-char (*f) () = _NSGetEnviron;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != _NSGetEnviron;
++return _NSGetEnviron ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28077,13 +30697,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func__NSGetEnviron=no
++	ac_cv_func__NSGetEnviron=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+-echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
++echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
+ if test $ac_cv_func__NSGetEnviron = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -28104,9 +30725,9 @@
+ for ac_func in vsnprintf snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -28132,53 +30753,59 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28187,13 +30814,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -28210,32 +30839,32 @@
+ 
+ 
+ 
+-# Check whether --enable-embedded or --disable-embedded was given.
++# Check whether --enable-embedded was given.
+ if test "${enable_embedded+set}" = set; then
+-  enableval="$enable_embedded"
+-  kde_use_qt_emb=$enableval
++  enableval=$enable_embedded; kde_use_qt_emb=$enableval
+ else
+   kde_use_qt_emb=no
+ 
+-fi;
++fi
++
+ 
+-# Check whether --enable-qtopia or --disable-qtopia was given.
++# Check whether --enable-qtopia was given.
+ if test "${enable_qtopia+set}" = set; then
+-  enableval="$enable_qtopia"
+-  kde_use_qt_emb_palm=$enableval
++  enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval
+ else
+   kde_use_qt_emb_palm=no
+ 
+-fi;
++fi
++
+ 
+-# Check whether --enable-mac or --disable-mac was given.
++# Check whether --enable-mac was given.
+ if test "${enable_mac+set}" = set; then
+-  enableval="$enable_mac"
+-  kde_use_qt_mac=$enableval
++  enableval=$enable_mac; kde_use_qt_mac=$enableval
+ else
+   kde_use_qt_mac=no
+ 
+-fi;
++fi
++
+ 
+ # used to disable x11-specific stuff on special platforms
+ 
+@@ -28251,8 +30880,8 @@
+ 
+ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+ 
+-echo "$as_me:$LINENO: checking for X" >&5
+-echo $ECHO_N "checking for X... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X" >&5
++echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+ 
+ if test "${kde_cv_have_x+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -28289,8 +30918,13 @@
+ /* end confdefs.h.  */
+ #include <$x_direct_test_include>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -28357,6 +30991,7 @@
+     fi
+   done
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = NO
+ 
+@@ -28386,24 +31021,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28414,7 +31061,7 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-LIBS="$ac_save_LIBS"
++	LIBS="$ac_save_LIBS"
+ # First see if replacing the include by lib works.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+@@ -28462,7 +31109,8 @@
+   done
+ done
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = NO
+ 
+@@ -28472,21 +31120,26 @@
+ *-*-solaris*)
+   ;;
+ *)
+-  rm -fr conftest.dir
++  rm -f -r conftest.dir
+ if mkdir conftest.dir; then
+   cd conftest.dir
+-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+   cat >Imakefile <<'_ACEOF'
+-acfindx:
+-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
++incroot:
++	@echo incroot='${INCROOT}'
++usrlibdir:
++	@echo usrlibdir='${USRLIBDIR}'
++libdir:
++	@echo libdir='${LIBDIR}'
+ _ACEOF
+-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
++  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
++    for ac_var in incroot usrlibdir libdir; do
++      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
++    done
+     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+     for ac_extension in a so sl; do
+-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+-	 test -f $ac_im_libdir/libX11.$ac_extension; then
++      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
++	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ 	ac_im_usrlibdir=$ac_im_libdir; break
+       fi
+     done
+@@ -28494,7 +31147,7 @@
+     # bogus both because they are the default anyway, and because
+     # using them would break gcc on systems where it needs fixed includes.
+     case $ac_im_incroot in
+-	/usr/include) ;;
++	/usr/include) ac_x_includes= ;;
+ 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+     esac
+     case $ac_im_usrlibdir in
+@@ -28503,7 +31156,7 @@
+     esac
+   fi
+   cd ..
+-  rm -fr conftest.dir
++  rm -f -r conftest.dir
+ fi
+ 
+   if test -z "$ac_x_includes"; then
+@@ -28547,12 +31200,12 @@
+ eval "$kde_cv_have_x"
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:$LINENO: result: $have_x" >&5
+-echo "${ECHO_T}$have_x" >&6
++  { echo "$as_me:$LINENO: result: $have_x" >&5
++echo "${ECHO_T}$have_x" >&6; }
+   no_x=yes
+ else
+-  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
++echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
+ fi
+ 
+ if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+@@ -28580,8 +31233,8 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
+-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28594,40 +31247,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char IceConnectionNumber ();
+ int
+ main ()
+ {
+-IceConnectionNumber ();
++return IceConnectionNumber ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28636,14 +31301,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ICE_IceConnectionNumber=no
++	ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   LIBSM="-lSM -lICE"
+ fi
+@@ -28652,8 +31318,8 @@
+ 
+ LIB_X11='-lX11 $(LIBSOCKET)'
+ 
+-echo "$as_me:$LINENO: checking for libXext" >&5
+-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libXext" >&5
++echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
+ if test "${kde_cv_have_libXext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28687,24 +31353,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28713,10 +31391,11 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_have_libXext=no
++	kde_cv_have_libXext=no
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ LDFLAGS=$kde_ldflags_safe
+@@ -28725,8 +31404,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+-echo "${ECHO_T}$kde_cv_have_libXext" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
++echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
+ 
+ if test "$kde_cv_have_libXext" = "no"; then
+   { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+@@ -28788,8 +31467,8 @@
+     else
+       PTHREAD_LIBS_save="$PTHREAD_LIBS"
+       PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+-      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
+ 
+      kde_save_LDFLAGS="$LDFLAGS"
+           kde_save_LIBS="$LIBS"
+@@ -28800,9 +31479,9 @@
+ 	;;
+      esac
+      as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -28814,40 +31493,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28856,14 +31547,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Lib=no"
++	eval "$as_ac_Lib=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   LIBPTHREAD="$PTHREAD_LIBS_save"
+ fi
+@@ -28876,8 +31569,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD"; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28890,40 +31583,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28932,14 +31637,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_pthread_pthread_create=no
++	ac_cv_lib_pthread_pthread_create=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+   LIBPTHREAD="-lpthread"
+ fi
+@@ -28947,8 +31653,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD" ; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+     kde_safe_libs=$LIBS
+     LIBS="$LIBS -lpthread"
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -28967,40 +31673,53 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         LIBPTHREAD="-lpthread"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS=$kde_safe_libs
+   fi
+@@ -29015,16 +31734,15 @@
+       USE_THREADS=""
+       if test -z "$LIBPTHREAD"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
+-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
++echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
+ kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -29051,24 +31769,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29077,8 +31807,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -29091,13 +31823,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_THREADS="-D_THREAD_SAFE -pthread"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -29109,16 +31841,15 @@
+     case $host_os in
+  	solaris*)
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
+-echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
++echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
+ kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -29145,24 +31876,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29171,8 +31914,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -29185,13 +31930,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_THREADS="-mt"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -29218,17 +31963,17 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for extra includes" >&5
+-echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra includes" >&5
++echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
+ 
+-# Check whether --with-extra-includes or --without-extra-includes was given.
++# Check whether --with-extra-includes was given.
+ if test "${with_extra_includes+set}" = set; then
+-  withval="$with_extra_includes"
+-  kde_use_extra_includes="$withval"
++  withval=$with_extra_includes; kde_use_extra_includes="$withval"
+ else
+   kde_use_extra_includes=NONE
+ 
+-fi;
++fi
++
+ kde_extra_includes=
+ if test -n "$kde_use_extra_includes" && \
+    test "$kde_use_extra_includes" != "NONE"; then
+@@ -29246,21 +31991,21 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
+-echo "${ECHO_T}$kde_use_extra_includes" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
++echo "${ECHO_T}$kde_use_extra_includes" >&6; }
+ 
+ kde_extra_libs=
+-echo "$as_me:$LINENO: checking for extra libs" >&5
+-echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra libs" >&5
++echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
+ 
+-# Check whether --with-extra-libs or --without-extra-libs was given.
++# Check whether --with-extra-libs was given.
+ if test "${with_extra_libs+set}" = set; then
+-  withval="$with_extra_libs"
+-  kde_use_extra_libs=$withval
++  withval=$with_extra_libs; kde_use_extra_libs=$withval
+ else
+   kde_use_extra_libs=NONE
+ 
+-fi;
++fi
++
+ if test -n "$kde_use_extra_libs" && \
+    test "$kde_use_extra_libs" != "NONE"; then
+ 
+@@ -29279,14 +32024,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
+-echo "${ECHO_T}$kde_use_extra_libs" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
++echo "${ECHO_T}$kde_use_extra_libs" >&6; }
+ 
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libz" >&5
+-echo $ECHO_N "checking for libz... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libz" >&5
++echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_z+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29320,24 +32065,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29346,9 +32103,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_z=no"
++	eval "ac_cv_lib_z=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29361,8 +32119,8 @@
+ _ACEOF
+ 
+   LIBZ="$ac_cv_lib_z"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+-echo "${ECHO_T}$ac_cv_lib_z" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
++echo "${ECHO_T}$ac_cv_lib_z" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: not found.
+           Possibly configure picks up an outdated version
+@@ -29382,8 +32140,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libpng" >&5
+-echo $ECHO_N "checking for libpng... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libpng" >&5
++echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29419,24 +32177,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29445,10 +32215,11 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_png=no"
++	eval "ac_cv_lib_png=no"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29462,19 +32233,19 @@
+ 
+   LIBPNG="$ac_cv_lib_png"
+ 
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+-echo "${ECHO_T}$ac_cv_lib_png" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
++echo "${ECHO_T}$ac_cv_lib_png" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   LIBPNG=""
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libjpeg6b" >&5
+-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
++echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_6b+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29507,24 +32278,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29533,9 +32316,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_jpeg_6b=no"
++	eval "ac_cv_lib_jpeg_6b=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29545,14 +32329,14 @@
+ 
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
+   LIBJPEG="$ac_cv_lib_jpeg_6b"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+-echo "$as_me:$LINENO: checking for libjpeg" >&5
+-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg" >&5
++echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_normal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29585,24 +32369,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29611,9 +32407,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_jpeg_normal=no"
++	eval "ac_cv_lib_jpeg_normal=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29623,11 +32420,11 @@
+ 
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
+   LIBJPEG="$ac_cv_lib_jpeg_normal"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+        LIBJPEG=
+ 
+@@ -29647,7 +32444,7 @@
+ do
    for j in jpeglib.h;
    do
--    echo "configure: 29546: $i/$j" >&5
-+    echo "configure: 29422: $i/$j" >&5
+-    echo "configure: 29650: $i/$j" >&5
++    echo "configure: 32447: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29841,7 +29717,7 @@
+@@ -29694,14 +32491,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for perl" >&5
+-echo $ECHO_N "checking for perl... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for perl" >&5
++echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
+    if test -n "$PERL"; then
+         kde_cv_path="$PERL";
+    else
+         kde_cache=`echo perl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -29744,8 +32541,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+ 		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
+ We need perl to generate some code." >&5
+@@ -29754,8 +32551,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       PERL=$kde_cv_path
+ 
+    fi
+@@ -29769,10 +32566,9 @@
+ 
+ 
+ 
+-# Check whether --enable-mt or --disable-mt was given.
++# Check whether --enable-mt was given.
+ if test "${enable_mt+set}" = set; then
+-  enableval="$enable_mt"
+-  kde_use_qt_mt=$enableval
++  enableval=$enable_mt; kde_use_qt_mt=$enableval
+ else
+ 
+     if test $kde_qtver = 3; then
+@@ -29782,7 +32578,8 @@
+     fi
+ 
+ 
+-fi;
++fi
++
+ 
+ USING_QT_MT=""
+ 
+@@ -29802,13 +32599,13 @@
+   else
+     kde_check_threading_default=yes
+   fi
+-  # Check whether --enable-threading or --disable-threading was given.
++  # Check whether --enable-threading was given.
+ if test "${enable_threading+set}" = set; then
+-  enableval="$enable_threading"
+-  kde_use_threading=$enableval
++  enableval=$enable_threading; kde_use_threading=$enableval
+ else
+   kde_use_threading=$kde_check_threading_default
+-fi;
++fi
++
+   if test "x$kde_use_threading" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -29880,8 +32677,8 @@
+   LIBQT="$LIBQT $LIBDL"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for Qt" >&5
+-echo $ECHO_N "checking for Qt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt" >&5
++echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
+ 
+ if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
+ LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
+@@ -29890,34 +32687,34 @@
+ qt_libraries=""
+ qt_includes=""
+ 
+-# Check whether --with-qt-dir or --without-qt-dir was given.
++# Check whether --with-qt-dir was given.
+ if test "${with_qt_dir+set}" = set; then
+-  withval="$with_qt_dir"
+-    ac_qt_includes="$withval"/include
++  withval=$with_qt_dir;   ac_qt_includes="$withval"/include
+        ac_qt_libraries="$withval"/lib${kdelibsuff}
+        ac_qt_bindir="$withval"/bin
+ 
+-fi;
++fi
++
+ 
+ 
+-# Check whether --with-qt-includes or --without-qt-includes was given.
++# Check whether --with-qt-includes was given.
+ if test "${with_qt_includes+set}" = set; then
+-  withval="$with_qt_includes"
+-
++  withval=$with_qt_includes;
+        ac_qt_includes="$withval"
+ 
+-fi;
++fi
++
+ 
+ kde_qt_libs_given=no
+ 
+ 
+-# Check whether --with-qt-libraries or --without-qt-libraries was given.
++# Check whether --with-qt-libraries was given.
+ if test "${with_qt_libraries+set}" = set; then
+-  withval="$with_qt_libraries"
+-    ac_qt_libraries="$withval"
++  withval=$with_qt_libraries;   ac_qt_libraries="$withval"
+        kde_qt_libs_given=yes
+ 
+-fi;
++fi
++
+ 
+ if test "${ac_cv_have_qt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -29945,7 +32742,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29844: $i/$j" >&5
-+    echo "configure: 29720: $i/$j" >&5
+-    echo "configure: 29948: $i/$j" >&5
++    echo "configure: 32745: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30677,7 +30553,7 @@
+@@ -29982,8 +32779,7 @@
+ ac_qt_libraries="$qt_libdir"
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -30120,13 +32916,13 @@
+ eval "$ac_cv_have_qt"
+ 
+ if test "$have_qt" != yes; then
+-  echo "$as_me:$LINENO: result: $have_qt" >&5
+-echo "${ECHO_T}$have_qt" >&6;
++  { echo "$as_me:$LINENO: result: $have_qt" >&5
++echo "${ECHO_T}$have_qt" >&6; };
+ else
+   ac_cv_have_qt="have_qt=yes \
+     ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
+-  echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
+-echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
++echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
+ 
+   qt_libraries="$ac_qt_libraries"
+   qt_includes="$ac_qt_includes"
+@@ -30135,15 +32931,14 @@
+ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
+ 
+ 
+-echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
+-echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
++echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_direct+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -30264,12 +33059,12 @@
+ 
+ 
+ if test "$kde_cv_qt_direct" = "yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   qt_libraries=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -30307,14 +33102,14 @@
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for moc" >&5
+-echo $ECHO_N "checking for moc... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for moc" >&5
++echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
+    if test -n "$MOC"; then
+         kde_cv_path="$MOC";
+    else
+         kde_cache=`echo moc | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30357,8 +33152,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
+ Please check whether you installed Qt correctly.
+@@ -30379,22 +33174,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MOC=$kde_cv_path
+ 
+    fi
+ 
+    if test -z "$UIC_NOT_NEEDED"; then
+ 
+-   echo "$as_me:$LINENO: checking for uic" >&5
+-echo $ECHO_N "checking for uic... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for uic" >&5
++echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
+    if test -n "$UIC_PATH"; then
+         kde_cv_path="$UIC_PATH";
+    else
+         kde_cache=`echo uic | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30437,12 +33232,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+       UIC_PATH=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       UIC_PATH=$kde_cv_path
+ 
+    fi
+@@ -30472,10 +33267,10 @@
+ 
+        if test $kde_qtver = 3; then
+ 
+-    echo "$as_me:$LINENO: checking whether uic supports -L " >&5
+-echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
++echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
+     kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
+-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30498,22 +33293,22 @@
+ 
+ 
+     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         :
+         ac_uic_supports_libpath=yes
+     else
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         :
+         ac_uic_supports_libpath=no
+     fi
+ 
+ 
+-    echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
+-echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
++echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
+     kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
+-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30536,13 +33331,13 @@
+ 
+ 
+     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         :
+         ac_uic_supports_nounload=yes
+     else
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         :
+         ac_uic_supports_nounload=no
+     fi
+@@ -30573,15 +33368,14 @@
+ 
+ 
+ if test -n "$LIBJPEG"; then
+-echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
+-echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
++echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_jpeg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -30614,24 +33408,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -30640,9 +33446,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "kde_cv_qt_jpeg=yes"
++	eval "kde_cv_qt_jpeg=yes"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30658,12 +33465,12 @@
+ 
+ 
+ if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   LIBJPEG_QT='$(LIBJPEG)'
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   LIBJPEG_QT=
+ fi
+ 
+@@ -30694,15 +33501,15 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for rpath" >&5
+-echo $ECHO_N "checking for rpath... $ECHO_C" >&6
+-# Check whether --enable-rpath or --disable-rpath was given.
++{ echo "$as_me:$LINENO: checking for rpath" >&5
++echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
++# Check whether --enable-rpath was given.
+ if test "${enable_rpath+set}" = set; then
+-  enableval="$enable_rpath"
+-  USE_RPATH=$enableval
++  enableval=$enable_rpath; USE_RPATH=$enableval
+ else
+   USE_RPATH=yes
+-fi;
++fi
++
+ 
+ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
+ 
+@@ -30726,11 +33533,11 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: result: $USE_RPATH" >&5
+-echo "${ECHO_T}$USE_RPATH" >&6
++{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
++echo "${ECHO_T}$USE_RPATH" >&6; }
+ 
+-echo "$as_me:$LINENO: checking for KDE" >&5
+-echo $ECHO_N "checking for KDE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE" >&5
++echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
+ 
+ if test "${prefix}" != NONE; then
+   kde_includes=${includedir}
+@@ -30782,7 +33589,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30680: $i/$j" >&5
-+    echo "configure: 30556: $i/$j" >&5
+-    echo "configure: 30785: $i/$j" >&5
++    echo "configure: 33592: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30707,7 +30583,7 @@
+@@ -30812,7 +33619,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30710: $i/$j" >&5
-+    echo "configure: 30586: $i/$j" >&5
+-    echo "configure: 30815: $i/$j" >&5
++    echo "configure: 33622: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30725,7 +30601,7 @@
+@@ -30830,7 +33637,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30728: $i/$j" >&5
-+    echo "configure: 30604: $i/$j" >&5
+-    echo "configure: 30833: $i/$j" >&5
++    echo "configure: 33640: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32248,7 +32124,7 @@
+@@ -30889,12 +33696,12 @@
+  fi
+  if test "$exec_prefix" = NONE; then
+   ac_kde_exec_prefix="$ac_kde_prefix"
+-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
++  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
+  else
+   ac_kde_exec_prefix="$exec_prefix"
+-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
++  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
+  fi
+ 
+  kde_libraries="${libdir}"
+@@ -30903,8 +33710,8 @@
+ else
+   ac_cv_have_kde="have_kde=yes \
+     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
+-  echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
+-echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
++echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
+ 
+   kde_libraries="$ac_kde_libraries"
+   kde_includes="$ac_kde_includes"
+@@ -30942,8 +33749,8 @@
+ 
+ if test x$ac_uic_supports_libpath = xyes; then
+ 
+-echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
+-echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
++echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
+ if test "${kde_cv_uic_plugins+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -30986,8 +33793,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+-echo "${ECHO_T}$kde_cv_uic_plugins" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
++echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
+ if test "$kde_cv_uic_plugins" != yes; then
+ 	{ { echo "$as_me:$LINENO: error:
+ you need to install kdelibs first.
+@@ -31019,10 +33826,9 @@
+ 
+ 
+ 
+-  # Check whether --enable-path-check or --disable-path-check was given.
++  # Check whether --enable-path-check was given.
+ if test "${enable_path_check+set}" = set; then
+-  enableval="$enable_path_check"
+-
++  enableval=$enable_path_check;
+   if test "$enableval" = "no";
+     then ac_use_path_checking="default"
+     else ac_use_path_checking=""
+@@ -31036,13 +33842,14 @@
+   fi
+ 
+ 
+-fi;
++fi
++
+ 
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for KDE paths" >&5
+-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE paths" >&5
++echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
+ kde_result=""
+ kde_cached_paths=yes
+ if test "${kde_cv_all_paths+set}" = set; then
+@@ -31153,15 +33960,14 @@
+ else
+ 
+   if test $kde_qtver = 1; then
+-     echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
+-
++     { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
+ 
+-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+ 
++    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
++echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+ 
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -31213,8 +34019,8 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-   echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++   { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  else
+    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31253,8 +34059,8 @@
+      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+   fi
+ 
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ 
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -31262,8 +34068,8 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+ Check, if your compiler is installed correctly and if you have used the
+@@ -31456,15 +34262,14 @@
+ else
+ 
+   if test $kde_qtver = 1; then
+-     echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
++     { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
+ 
+ 
+-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
++echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -31516,8 +34321,8 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-   echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++   { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  else
+    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31556,8 +34361,8 @@
+      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+   fi
+ 
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ 
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -31565,8 +34370,8 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+ Check, if your compiler is installed correctly and if you have used the
+@@ -31658,22 +34463,22 @@
+    { (exit 1); exit 1; }; }
+ else
+   rm -f conftest*
+-  echo "$as_me:$LINENO: result: $kde_result" >&5
+-echo "${ECHO_T}$kde_result" >&6
++  { echo "$as_me:$LINENO: result: $kde_result" >&5
++echo "${ECHO_T}$kde_result" >&6; }
+ fi
+ 
+ bindir=$kde_bindir
+ 
+ 
+ 
+-# Check whether --with-arts or --without-arts was given.
++# Check whether --with-arts was given.
+ if test "${with_arts+set}" = set; then
+-  withval="$with_arts"
+-  build_arts=$withval
++  withval=$with_arts; build_arts=$withval
+ else
+   build_arts=yes
+ 
+-fi;
++fi
++
+ 
+ 
+ if test "$build_arts" '!=' "no"; then
+@@ -31706,14 +34511,14 @@
+ 
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
+ 
+-   echo "$as_me:$LINENO: checking for dcopidl" >&5
+-echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dcopidl" >&5
++echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
+    if test -n "$DCOPIDL"; then
+         kde_cv_path="$DCOPIDL";
+    else
+         kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31756,8 +34561,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
+ Please check whether you installed KDE correctly.
+@@ -31768,21 +34573,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DCOPIDL=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
+-echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
++echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
+    if test -n "$DCOPIDL2CPP"; then
+         kde_cv_path="$DCOPIDL2CPP";
+    else
+         kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31825,8 +34630,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
+ Please check whether you installed KDE correctly.
+@@ -31837,22 +34642,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DCOPIDL2CPP=$kde_cv_path
+ 
+    fi
+ 
+         if test "$build_arts" '!=' "no"; then
+ 
+-   echo "$as_me:$LINENO: checking for mcopidl" >&5
+-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for mcopidl" >&5
++echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
+    if test -n "$MCOPIDL"; then
+         kde_cv_path="$MCOPIDL";
+    else
+         kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31895,8 +34700,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+ Please check whether you installed aRts correctly or use
+@@ -31909,21 +34714,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MCOPIDL=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for artsc-config" >&5
+-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for artsc-config" >&5
++echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
+    if test -n "$ARTSCCONFIG"; then
+         kde_cv_path="$ARTSCCONFIG";
+    else
+         kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31966,8 +34771,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+ Please check whether you installed aRts correctly or use
+@@ -31980,22 +34785,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       ARTSCCONFIG=$kde_cv_path
+ 
+    fi
+ 
+         fi
+ 
+-   echo "$as_me:$LINENO: checking for meinproc" >&5
+-echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for meinproc" >&5
++echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
+    if test -n "$MEINPROC"; then
+         kde_cv_path="$MEINPROC";
+    else
+         kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32038,12 +34843,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MEINPROC=$kde_cv_path
+ 
+    fi
+@@ -32072,14 +34877,14 @@
+ 
+         if test -n "$kde32ornewer"; then
+ 
+-   echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
+-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
++echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
+    if test -n "$KCONFIG_COMPILER"; then
+         kde_cv_path="$KCONFIG_COMPILER";
+    else
+         kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32122,8 +34927,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+ Please check whether you installed KDE correctly.
+@@ -32134,21 +34939,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       KCONFIG_COMPILER=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dcopidlng" >&5
+-echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dcopidlng" >&5
++echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
+    if test -n "$DCOPIDLNG"; then
+         kde_cv_path="$DCOPIDLNG";
+    else
+         kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32191,8 +34996,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
+ Please check whether you installed KDE correctly.
+@@ -32203,8 +35008,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DCOPIDLNG=$kde_cv_path
+ 
+    fi
+@@ -32212,14 +35017,14 @@
+         fi
+         if test -n "$kde33ornewer"; then
+ 
+-   echo "$as_me:$LINENO: checking for makekdewidgets" >&5
+-echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
++echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
+    if test -n "$MAKEKDEWIDGETS"; then
+         kde_cv_path="$MAKEKDEWIDGETS";
+    else
+         kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32262,8 +35067,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+ Please check whether you installed KDE correctly.
+@@ -32274,8 +35079,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MAKEKDEWIDGETS=$kde_cv_path
+ 
+    fi
+@@ -32283,14 +35088,14 @@
+ 
+         fi
+ 
+-   echo "$as_me:$LINENO: checking for xmllint" >&5
+-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for xmllint" >&5
++echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+    if test -n "$XMLLINT"; then
+         kde_cv_path="$XMLLINT";
+    else
+         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32333,12 +35138,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+       XMLLINT=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       XMLLINT=$kde_cv_path
+ 
+    fi
+@@ -32353,7 +35158,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32251: $i/$j" >&5
-+    echo "configure: 32127: $i/$j" >&5
+-    echo "configure: 32356: $i/$j" >&5
++    echo "configure: 35161: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32769,7 +32645,7 @@
+@@ -32516,13 +35321,12 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
++echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6; }
+ 
+   if test "x$GXX" = "xyes"; then
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -32543,13 +35347,13 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "GCC visibility push" >/dev/null 2>&1; then
+ 
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+       kde_stdc_visibility_patched=yes
+ else
+ 
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+                    visibility support. Disabling -fvisibility=hidden" >&5
+ echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+@@ -32569,16 +35373,15 @@
+ 
+     kde_have_gcc_visibility=no
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
++echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; }
+ kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -32605,24 +35408,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -32631,8 +35446,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -32645,28 +35462,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+       kde_have_gcc_visibility=yes
+-                              # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
++                              # Check whether --enable-gcc-hidden-visibility was given.
+ if test "${enable_gcc_hidden_visibility+set}" = set; then
+-  enableval="$enable_gcc_hidden_visibility"
+-  kde_have_gcc_visibility=$enableval
++  enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
+ else
+   kde_have_gcc_visibility=no
+-fi;
++fi
+ 
+-      echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
++
++      { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
++echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
+ if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-           ac_ext=cc
++           ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -32701,24 +35517,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -32727,9 +35555,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_qt_gcc_visibility_patched=yes
++	kde_cv_val_qt_gcc_visibility_patched=yes
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+           CXXFLAGS=$safe_CXXFLAGS
+           ac_ext=c
+@@ -32741,21 +35570,20 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
++echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
+ 
+       if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ 
+-    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
++echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
+ if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-         ac_ext=cc
++         ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -32795,24 +35623,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -32821,9 +35661,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_gcc_visibility_bug=yes
++	kde_cv_val_gcc_visibility_bug=yes
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+         CXXFLAGS=$safe_CXXFLAGS
+@@ -32837,8 +35678,8 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
++echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
+ 
+     if test x$kde_cv_val_gcc_visibility_bug = xno; then
+       CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+@@ -32854,8 +35695,8 @@
+       fi
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -32864,8 +35705,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for Qt docs" >&5
+-echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt docs" >&5
++echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
+ kde_qtdir=
+ if test "${with_qt_dir+set}" = set; then
+   kde_qtdir="$with_qt_dir"
+@@ -32877,7 +35718,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 32772: $i/$j" >&5
-+    echo "configure: 32648: $i/$j" >&5
+-    echo "configure: 32880: $i/$j" >&5
++    echo "configure: 35721: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -34718,6 +34594,13 @@
+@@ -32886,20 +35727,20 @@
+   done
+ done
+ 
+-echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
+-echo "${ECHO_T}$QTDOCDIR" >&6
++{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
++echo "${ECHO_T}$QTDOCDIR" >&6; }
+ 
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dot" >&5
+-echo $ECHO_N "checking for dot... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dot" >&5
++echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
+    if test -n "$DOT"; then
+         kde_cv_path="$DOT";
+    else
+         kde_cache=`echo dot | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32942,12 +35783,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DOT=$kde_cv_path
+ 
+    fi
+@@ -32959,14 +35800,14 @@
+ fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for doxygen" >&5
+-echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for doxygen" >&5
++echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
+    if test -n "$DOXYGEN"; then
+         kde_cv_path="$DOXYGEN";
+    else
+         kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -33009,12 +35850,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DOXYGEN=$kde_cv_path
+ 
+    fi
+@@ -33038,8 +35879,8 @@
+ 
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_PKGCONFIGFOUND+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33052,26 +35893,28 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_PKGCONFIGFOUND="yes"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ PKGCONFIGFOUND=$ac_cv_prog_PKGCONFIGFOUND
+ if test -n "$PKGCONFIGFOUND"; then
+-  echo "$as_me:$LINENO: result: $PKGCONFIGFOUND" >&5
+-echo "${ECHO_T}$PKGCONFIGFOUND" >&6
++  { echo "$as_me:$LINENO: result: $PKGCONFIGFOUND" >&5
++echo "${ECHO_T}$PKGCONFIGFOUND" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
++
+ ###############################################################################
+ # END PKG-CONFIG CHECK
+ ###############################################################################
+@@ -33087,13 +35930,12 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
++echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6; }
+ 
+   if test "x$GXX" = "xyes"; then
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -33114,13 +35956,13 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "GCC visibility push" >/dev/null 2>&1; then
+ 
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+       kde_stdc_visibility_patched=yes
+ else
+ 
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+                    visibility support. Disabling -fvisibility=hidden" >&5
+ echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+@@ -33140,16 +35982,15 @@
+ 
+     kde_have_gcc_visibility=no
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
++echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; }
+ kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -33176,24 +36017,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33202,8 +36055,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -33216,28 +36071,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+       kde_have_gcc_visibility=yes
+-                              # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
++                              # Check whether --enable-gcc-hidden-visibility was given.
+ if test "${enable_gcc_hidden_visibility+set}" = set; then
+-  enableval="$enable_gcc_hidden_visibility"
+-  kde_have_gcc_visibility=$enableval
++  enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
+ else
+   kde_have_gcc_visibility=no
+-fi;
++fi
++
+ 
+-      echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
++echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
+ if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-           ac_ext=cc
++           ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -33272,24 +36126,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33298,9 +36164,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_qt_gcc_visibility_patched=yes
++	kde_cv_val_qt_gcc_visibility_patched=yes
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+           CXXFLAGS=$safe_CXXFLAGS
+           ac_ext=c
+@@ -33312,21 +36179,20 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
++echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
+ 
+       if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ 
+-    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
++echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
+ if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-         ac_ext=cc
++         ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -33366,24 +36232,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33392,9 +36270,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_gcc_visibility_bug=yes
++	kde_cv_val_gcc_visibility_bug=yes
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+         CXXFLAGS=$safe_CXXFLAGS
+@@ -33408,8 +36287,8 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
++echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
+ 
+     if test x$kde_cv_val_gcc_visibility_bug = xno; then
+       CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+@@ -33425,8 +36304,8 @@
+       fi
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -33442,13 +36321,13 @@
+ 
+ if test -d $srcdir/libkipi; then
+     have_libkipi=yes
+-    echo "$as_me:$LINENO: checking for libkipi in our sources" >&5
+-echo $ECHO_N "checking for libkipi in our sources... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for libkipi in our sources" >&5
++echo $ECHO_N "checking for libkipi in our sources... $ECHO_C" >&6; }
+     LIBKIPI_CFLAGS='-I$(top_builddir)/libkipi -I$(top_srcdir)/libkipi'
+     LIBKIPI_LIBS='$(top_builddir)/libkipi/libkipi/libkipi.la'
+     LIBKIPI_LIBS_DEP='$(LIBKIPI_LIBS)'
+-    echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
++    { echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6; }
+ 
+ 
+ 
+@@ -33471,8 +36350,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33487,28 +36366,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+@@ -33519,25 +36399,25 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for libkipi >= 0.1.5" >&5
+-echo $ECHO_N "checking for libkipi >= 0.1.5... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for libkipi >= 0.1.5" >&5
++echo $ECHO_N "checking for libkipi >= 0.1.5... $ECHO_C" >&6; }
+ 
+         if $PKG_CONFIG --exists "libkipi >= 0.1.5" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             succeeded=yes
+ 
+-            echo "$as_me:$LINENO: checking LIBKIPI_CFLAGS" >&5
+-echo $ECHO_N "checking LIBKIPI_CFLAGS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking LIBKIPI_CFLAGS" >&5
++echo $ECHO_N "checking LIBKIPI_CFLAGS... $ECHO_C" >&6; }
+             LIBKIPI_CFLAGS=`$PKG_CONFIG --cflags "libkipi >= 0.1.5"`
+-            echo "$as_me:$LINENO: result: $LIBKIPI_CFLAGS" >&5
+-echo "${ECHO_T}$LIBKIPI_CFLAGS" >&6
++            { echo "$as_me:$LINENO: result: $LIBKIPI_CFLAGS" >&5
++echo "${ECHO_T}$LIBKIPI_CFLAGS" >&6; }
+ 
+-            echo "$as_me:$LINENO: checking LIBKIPI_LIBS" >&5
+-echo $ECHO_N "checking LIBKIPI_LIBS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking LIBKIPI_LIBS" >&5
++echo $ECHO_N "checking LIBKIPI_LIBS... $ECHO_C" >&6; }
+             LIBKIPI_LIBS=`$PKG_CONFIG --libs "libkipi >= 0.1.5"`
+-            echo "$as_me:$LINENO: result: $LIBKIPI_LIBS" >&5
+-echo "${ECHO_T}$LIBKIPI_LIBS" >&6
++            { echo "$as_me:$LINENO: result: $LIBKIPI_LIBS" >&5
++echo "${ECHO_T}$LIBKIPI_LIBS" >&6; }
+         else
+             LIBKIPI_CFLAGS=""
+             LIBKIPI_LIBS=""
+@@ -33566,17 +36446,17 @@
+ 	if test "x$have_libkipi" = "xno"; then
+ 	   LIBKIPI_CFLAGS=""
+ 	   LIBKIPI_LIBS=""
+-           echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++           { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 	else
+-	   echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
++	   { echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6; }
+ 	fi
+      else
+         LIBKIPI_CFLAGS=""
+ 	LIBKIPI_LIBS=""
+-        echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++        { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+      fi
+ 
+ 
+@@ -33591,8 +36471,8 @@
+ #------------------------------------------------------------------
+ 
+ have_tiff=no
+-echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5
+-echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5
++echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33605,40 +36485,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char TIFFWriteScanline ();
+ int
+ main ()
+ {
+-TIFFWriteScanline ();
++return TIFFWriteScanline ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33647,14 +36539,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_tiff_TIFFWriteScanline=no
++	ac_cv_lib_tiff_TIFFWriteScanline=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5
+-echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5
++echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; }
+ if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then
+   have_tiff=yes
+ else
+@@ -33668,8 +36561,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -33679,17 +36571,17 @@
+ 
+ 
+    if test "${ac_cv_header_tiffio_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for tiffio.h" >&5
+-echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for tiffio.h" >&5
++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_tiffio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking tiffio.h usability" >&5
+-echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5
++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33700,24 +36592,36 @@
+ #include <tiffio.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33726,15 +36630,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking tiffio.h presence" >&5
+-echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5
++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33743,8 +36648,13 @@
+ /* end confdefs.h.  */
+ #include <tiffio.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++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_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -33768,9 +36678,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -33794,25 +36705,18 @@
+ echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for tiffio.h" >&5
+-echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5
++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_tiffio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_tiffio_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_tiffio_h = yes; then
+@@ -33869,8 +36773,8 @@
+ have_gphoto=no
+ # Extract the first word of "gphoto2-config", so it can be a program name with args.
+ set dummy gphoto2-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GPHOTO_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33885,31 +36789,32 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GPHOTO_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   ;;
+ esac
+ fi
+ GPHOTO_CONFIG=$ac_cv_path_GPHOTO_CONFIG
+-
+ if test -n "$GPHOTO_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $GPHOTO_CONFIG" >&5
+-echo "${ECHO_T}$GPHOTO_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $GPHOTO_CONFIG" >&5
++echo "${ECHO_T}$GPHOTO_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ # Extract the first word of "gphoto2-port-config", so it can be a program name with args.
+ set dummy gphoto2-port-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GPHOTO_PORT_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33924,27 +36829,28 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GPHOTO_PORT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   ;;
+ esac
+ fi
+ GPHOTO_PORT_CONFIG=$ac_cv_path_GPHOTO_PORT_CONFIG
+-
+ if test -n "$GPHOTO_PORT_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $GPHOTO_PORT_CONFIG" >&5
+-echo "${ECHO_T}$GPHOTO_PORT_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $GPHOTO_PORT_CONFIG" >&5
++echo "${ECHO_T}$GPHOTO_PORT_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ if test -n "${GPHOTO_CONFIG}"; then
+   GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`"
+ 
+@@ -33981,8 +36887,8 @@
+ have_xslt=no
+ # Extract the first word of "xslt-config", so it can be a program name with args.
+ set dummy xslt-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_XSLT_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33997,27 +36903,28 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_XSLT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   ;;
+ esac
+ fi
+ XSLT_CONFIG=$ac_cv_path_XSLT_CONFIG
+-
+ if test -n "$XSLT_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5
+-echo "${ECHO_T}$XSLT_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5
++echo "${ECHO_T}$XSLT_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ if test -n "${XSLT_CONFIG}"; then
+   LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
+ 
+@@ -34062,8 +36969,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34078,28 +36985,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+@@ -34110,25 +37018,25 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for exiv2 >= 0.12" >&5
+-echo $ECHO_N "checking for exiv2 >= 0.12... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for exiv2 >= 0.12" >&5
++echo $ECHO_N "checking for exiv2 >= 0.12... $ECHO_C" >&6; }
+ 
+         if $PKG_CONFIG --exists "exiv2 >= 0.12" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             succeeded=yes
+ 
+-            echo "$as_me:$LINENO: checking EXIV2_CFLAGS" >&5
+-echo $ECHO_N "checking EXIV2_CFLAGS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking EXIV2_CFLAGS" >&5
++echo $ECHO_N "checking EXIV2_CFLAGS... $ECHO_C" >&6; }
+             EXIV2_CFLAGS=`$PKG_CONFIG --cflags "exiv2 >= 0.12"`
+-            echo "$as_me:$LINENO: result: $EXIV2_CFLAGS" >&5
+-echo "${ECHO_T}$EXIV2_CFLAGS" >&6
++            { echo "$as_me:$LINENO: result: $EXIV2_CFLAGS" >&5
++echo "${ECHO_T}$EXIV2_CFLAGS" >&6; }
+ 
+-            echo "$as_me:$LINENO: checking EXIV2_LIBS" >&5
+-echo $ECHO_N "checking EXIV2_LIBS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking EXIV2_LIBS" >&5
++echo $ECHO_N "checking EXIV2_LIBS... $ECHO_C" >&6; }
+             EXIV2_LIBS=`$PKG_CONFIG --libs "exiv2 >= 0.12"`
+-            echo "$as_me:$LINENO: result: $EXIV2_LIBS" >&5
+-echo "${ECHO_T}$EXIV2_LIBS" >&6
++            { echo "$as_me:$LINENO: result: $EXIV2_LIBS" >&5
++echo "${ECHO_T}$EXIV2_LIBS" >&6; }
+         else
+             EXIV2_CFLAGS=""
+             EXIV2_LIBS=""
+@@ -34187,8 +37095,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34203,28 +37111,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+@@ -34235,25 +37144,25 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for libgpod-1.0 > 0.4.0" >&5
+-echo $ECHO_N "checking for libgpod-1.0 > 0.4.0... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for libgpod-1.0 > 0.4.0" >&5
++echo $ECHO_N "checking for libgpod-1.0 > 0.4.0... $ECHO_C" >&6; }
+ 
+         if $PKG_CONFIG --exists "libgpod-1.0 > 0.4.0" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             succeeded=yes
+ 
+-            echo "$as_me:$LINENO: checking LIBGPOD_CFLAGS" >&5
+-echo $ECHO_N "checking LIBGPOD_CFLAGS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking LIBGPOD_CFLAGS" >&5
++echo $ECHO_N "checking LIBGPOD_CFLAGS... $ECHO_C" >&6; }
+             LIBGPOD_CFLAGS=`$PKG_CONFIG --cflags "libgpod-1.0 > 0.4.0"`
+-            echo "$as_me:$LINENO: result: $LIBGPOD_CFLAGS" >&5
+-echo "${ECHO_T}$LIBGPOD_CFLAGS" >&6
++            { echo "$as_me:$LINENO: result: $LIBGPOD_CFLAGS" >&5
++echo "${ECHO_T}$LIBGPOD_CFLAGS" >&6; }
+ 
+-            echo "$as_me:$LINENO: checking LIBGPOD_LIBS" >&5
+-echo $ECHO_N "checking LIBGPOD_LIBS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking LIBGPOD_LIBS" >&5
++echo $ECHO_N "checking LIBGPOD_LIBS... $ECHO_C" >&6; }
+             LIBGPOD_LIBS=`$PKG_CONFIG --libs "libgpod-1.0 > 0.4.0"`
+-            echo "$as_me:$LINENO: result: $LIBGPOD_LIBS" >&5
+-echo "${ECHO_T}$LIBGPOD_LIBS" >&6
++            { echo "$as_me:$LINENO: result: $LIBGPOD_LIBS" >&5
++echo "${ECHO_T}$LIBGPOD_LIBS" >&6; }
+         else
+             LIBGPOD_CFLAGS=""
+             LIBGPOD_LIBS=""
+@@ -34278,8 +37187,8 @@
+   fi
+ 
+ 
+-        echo "$as_me:$LINENO: result: $have_libgpod" >&5
+-echo "${ECHO_T}$have_libgpod" >&6
++        { echo "$as_me:$LINENO: result: $have_libgpod" >&5
++echo "${ECHO_T}$have_libgpod" >&6; }
+         if test "x$have_libgpod" != "xno"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -34300,9 +37209,9 @@
+ for ac_func in itdb_photodb_photoalbum_create
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -34328,53 +37237,59 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34383,13 +37298,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -34402,9 +37319,9 @@
+ for ac_func in itdb_photodb_parse
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -34430,53 +37347,59 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34485,13 +37408,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -34504,9 +37429,9 @@
+ for ac_func in itdb_device_get_ipod_info
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -34532,53 +37457,59 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34587,13 +37518,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -34643,25 +37576,24 @@
+ ###############################################################################
+ 
+ 
+-# Check whether --with-opengl or --without-opengl was given.
++# Check whether --with-opengl was given.
+ if test "${with_opengl+set}" = set; then
+-  withval="$with_opengl"
+-  build_opengl=$withval
++  withval=$with_opengl; build_opengl=$withval
+ else
+   build_opengl=yes
+ 
+-fi;
++fi
++
+ 
+ if test "$build_opengl" != "no"; then
+-    echo "$as_me:$LINENO: checking for Qt with OpenGL support" >&5
+-echo $ECHO_N "checking for Qt with OpenGL support... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for Qt with OpenGL support" >&5
++echo $ECHO_N "checking for Qt with OpenGL support... $ECHO_C" >&6; }
+     if test "${ac_cv_kde_qt_has_opengl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -34699,24 +37631,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (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_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34725,9 +37669,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_kde_qt_has_opengl=no
++	ac_cv_kde_qt_has_opengl=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+     CXXFLAGS="$save_CXXFLAGS"
+@@ -34742,8 +37687,8 @@
+ 
+ fi
+ 
+-    echo "$as_me:$LINENO: result: $ac_cv_kde_qt_has_opengl" >&5
+-echo "${ECHO_T}$ac_cv_kde_qt_has_opengl" >&6
++    { echo "$as_me:$LINENO: result: $ac_cv_kde_qt_has_opengl" >&5
++echo "${ECHO_T}$ac_cv_kde_qt_has_opengl" >&6; }
+ 
+     if test x$ac_cv_kde_qt_has_opengl = xyes; then
+        have_GL="yes"
+@@ -34767,58 +37712,58 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for imlib2-config" >&5
+-echo $ECHO_N "checking for imlib2-config... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for imlib2-config" >&5
++echo $ECHO_N "checking for imlib2-config... $ECHO_C" >&6; }
+ 
+ imlib2_config_given=NO
+ ac_imlib2_config=""
+ 
+ 
+-# Check whether --with-imlib2-config or --without-imlib2-config was given.
++# Check whether --with-imlib2-config was given.
+ if test "${with_imlib2_config+set}" = set; then
+-  withval="$with_imlib2_config"
+-    ac_imlib2_config="$withval/imlib2-config"
++  withval=$with_imlib2_config;   ac_imlib2_config="$withval/imlib2-config"
+            imlib2_config_given=yes
+ 
+-fi;
++fi
++
+ 
+ if test "$imlib2_config_given" = "yes"; then
+   if test ! -r $ac_imlib2_config; then
+-    echo "$as_me:$LINENO: result: wrong file specified" >&5
+-echo "${ECHO_T}wrong file specified" >&6
++    { echo "$as_me:$LINENO: result: wrong file specified" >&5
++echo "${ECHO_T}wrong file specified" >&6; }
+     ac_imlib2_config=""
+   else
+     IMLIB2_CFLAGS=`$ac_imlib2_config --cflags`
+     LIB_IMLIB2=`$ac_imlib2_config --libs`
+ 
+ 
+-    echo "$as_me:$LINENO: result: $ac_imlib2_config" >&5
+-echo "${ECHO_T}$ac_imlib2_config" >&6
++    { echo "$as_me:$LINENO: result: $ac_imlib2_config" >&5
++echo "${ECHO_T}$ac_imlib2_config" >&6; }
+   fi
+ else
+   ac_imlib2_config=`which imlib2-config 2>/dev/null`
+   if test -z "$ac_imlib2_config"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   else
+     dummy=`echo "$ac_imlib2_config" | grep '/imlib2-config'`
+     if test -z "$dummy"; then
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       ac_imlib2_config=""
+     else
+       LIB_IMLIB2=`$ac_imlib2_config --libs`
+       IMLIB2_CFLAGS=`$ac_imlib2_config --cflags`
+       imlib2_config=`echo "$LIB_IMLIB2" | grep lImlib2`
+       if test -z "$imlib2_config"; then
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         ac_imlib2_config=""
+       else
+ 
+ 
+-        echo "$as_me:$LINENO: result: $ac_imlib2_config" >&5
+-echo "${ECHO_T}$ac_imlib2_config" >&6
++        { echo "$as_me:$LINENO: result: $ac_imlib2_config" >&5
++echo "${ECHO_T}$ac_imlib2_config" >&6; }
+       fi
+     fi
+   fi
+@@ -34864,8 +37809,8 @@
+ fi
+ 
+ for i in $ac_topsubdirs; do
+-  echo "$as_me:$LINENO: checking if $i should be compiled" >&5
+-echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
++echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
+   if test -d $srcdir/$i; then
+     install_it="yes"
+     for j in $DO_NOT_COMPILE; do
+@@ -34876,8 +37821,8 @@
+   else
+     install_it="no"
+   fi
+-  echo "$as_me:$LINENO: result: $install_it" >&5
+-echo "${ECHO_T}$install_it" >&6
++  { echo "$as_me:$LINENO: result: $install_it" >&5
++echo "${ECHO_T}$install_it" >&6; }
+   vari=`echo $i | sed -e 's,[-+.@],_,g'`
+   if test $install_it = "yes"; then
+     TOPSUBDIRS="$TOPSUBDIRS $i"
+@@ -34929,179 +37874,179 @@
+   po_SUBDIR_included_FALSE=
+ fi
+ 
+-          ac_config_files="$ac_config_files Makefile"
++ac_config_files="$ac_config_files Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/Makefile"
++ac_config_files="$ac_config_files doc/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/da_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/da_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/de_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/de_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/es_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/es_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/et_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/et_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/it_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/it_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/nl_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/nl_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/pt_BR_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/pt_BR_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/pt_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/pt_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/ru_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/ru_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/sv_kipi-plugins/Makefile"
++ac_config_files="$ac_config_files doc/sv_kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/acquireimages/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/acquireimages/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/batchprocessimages/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/batchprocessimages/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/batchprocessimages/data/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/batchprocessimages/data/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/calendar/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/calendar/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/cdarchiving/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/cdarchiving/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/cdarchiving/autorun/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/cdarchiving/autorun/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/common/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/common/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/common/exiv2iface/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/common/exiv2iface/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/common/libkipiplugins/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/common/libkipiplugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/findimages/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/findimages/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/flickrexport/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/flickrexport/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/galleryexport/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/galleryexport/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/gpssync/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/gpssync/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/helloworld/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/helloworld/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/htmlexport/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/htmlexport/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/matrix/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/matrix/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/s0/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/s0/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/simple/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/simple/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/snow/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/htmlexport/themes/snow/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/imagesgallery/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/imagesgallery/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/ipodexport/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/ipodexport/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/jpeglossless/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/jpeglossless/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/kameraklient/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/kameraklient/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/metadataedit/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/metadataedit/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/mpegencoder/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/mpegencoder/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/printwizard/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/printwizard/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/rawconverter/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/rawconverter/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/rawconverter/profiles/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/rawconverter/profiles/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/sendimages/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/sendimages/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/simpleviewerexport/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/simpleviewerexport/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/slideshow/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/slideshow/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/timeadjust/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/timeadjust/Makefile"
+ 
+-          ac_config_files="$ac_config_files kipi-plugins/wallpaper/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/wallpaper/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/Makefile"
++ac_config_files="$ac_config_files po/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/ar/Makefile"
++ac_config_files="$ac_config_files po/ar/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/br/Makefile"
++ac_config_files="$ac_config_files po/br/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/ca/Makefile"
++ac_config_files="$ac_config_files po/ca/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/cs/Makefile"
++ac_config_files="$ac_config_files po/cs/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/cy/Makefile"
++ac_config_files="$ac_config_files po/cy/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/da/Makefile"
++ac_config_files="$ac_config_files po/da/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/de/Makefile"
++ac_config_files="$ac_config_files po/de/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/el/Makefile"
++ac_config_files="$ac_config_files po/el/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/en_GB/Makefile"
++ac_config_files="$ac_config_files po/en_GB/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/es/Makefile"
++ac_config_files="$ac_config_files po/es/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/et/Makefile"
++ac_config_files="$ac_config_files po/et/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/fi/Makefile"
++ac_config_files="$ac_config_files po/fi/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/fr/Makefile"
++ac_config_files="$ac_config_files po/fr/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/ga/Makefile"
++ac_config_files="$ac_config_files po/ga/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/gl/Makefile"
++ac_config_files="$ac_config_files po/gl/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/hu/Makefile"
++ac_config_files="$ac_config_files po/hu/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/is/Makefile"
++ac_config_files="$ac_config_files po/is/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/it/Makefile"
++ac_config_files="$ac_config_files po/it/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/ja/Makefile"
++ac_config_files="$ac_config_files po/ja/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/lt/Makefile"
++ac_config_files="$ac_config_files po/lt/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/mt/Makefile"
++ac_config_files="$ac_config_files po/mt/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/nb/Makefile"
++ac_config_files="$ac_config_files po/nb/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/nl/Makefile"
++ac_config_files="$ac_config_files po/nl/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/nn/Makefile"
++ac_config_files="$ac_config_files po/nn/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/pa/Makefile"
++ac_config_files="$ac_config_files po/pa/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/pl/Makefile"
++ac_config_files="$ac_config_files po/pl/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/pt/Makefile"
++ac_config_files="$ac_config_files po/pt/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/pt_BR/Makefile"
++ac_config_files="$ac_config_files po/pt_BR/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/ru/Makefile"
++ac_config_files="$ac_config_files po/ru/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/rw/Makefile"
++ac_config_files="$ac_config_files po/rw/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/sk/Makefile"
++ac_config_files="$ac_config_files po/sk/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/sr/Makefile"
++ac_config_files="$ac_config_files po/sr/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/sr at Latn/Makefile"
++ac_config_files="$ac_config_files po/sr at Latn/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/sv/Makefile"
++ac_config_files="$ac_config_files po/sv/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/ta/Makefile"
++ac_config_files="$ac_config_files po/ta/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/tr/Makefile"
++ac_config_files="$ac_config_files po/tr/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/uk/Makefile"
++ac_config_files="$ac_config_files po/uk/Makefile"
+ 
+-          ac_config_files="$ac_config_files po/zh_CN/Makefile"
++ac_config_files="$ac_config_files po/zh_CN/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -35121,39 +38066,58 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      *) $as_unset $ac_var ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
+       # `set' does not quote correctly, so add quotes (double-quote
+       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    test "x$cache_file" != "x/dev/null" &&
++      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
++echo "$as_me: updating cache $cache_file" >&6;}
+     cat confcache >$cache_file
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -35162,38 +38126,31 @@
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[	 ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[	 ]*$//;
+-}'
+-fi
+-
+ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+-  ac_i=`echo "$ac_i" |
+-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+-  # 2. Add them.
+-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++  ac_i=`echo "$ac_i" | sed "$ac_script"`
++  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
++  #    will be set to the directory where LIBOBJS objects are built.
++  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+ 
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -13970,5243 +49870,44744 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -35492,6 +35375,9 @@
- s, at AMTAR@,$AMTAR,;t t
- s, at am__tar@,$am__tar,;t t
- s, at am__untar@,$am__untar,;t t
-+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+s, at MAINT@,$MAINT,;t t
- s, at KDECONFIG@,$KDECONFIG,;t t
- s, at kde_libs_prefix@,$kde_libs_prefix,;t t
- s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
+@@ -35337,11 +38294,35 @@
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+ 
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+@@ -35350,8 +38331,43 @@
+ fi
+ 
+ 
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -35365,18 +38381,19 @@
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+-    $as_unset $as_var
++    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+@@ -35384,159 +38401,120 @@
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
+-fi
++# CDPATH.
++$as_unset CDPATH
+ 
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
++  # line-number line after each line using $LINENO; the second 'sed'
++  # does the real work.  The second script uses 'N' to pair each
++  # line-number line with the line containing $LINENO, and appends
++  # trailing '-' during substitution so that $LINENO is not a special
++  # case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  # scripts with optimization help from Paolo Bonzini.  Blame Lee
++  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++  chmod +x "$as_me.lineno" ||
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++  case `echo 'x\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  *)   ECHO_C='\c';;
++  esac;;
++*)
++  ECHO_N='-n';;
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
++  as_ln_s='ln -s'
++  # ... but there are two gotchas:
++  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++  # In both cases, we have to default to `cp -p'.
++  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+     as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -35545,7 +38523,19 @@
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++  as_executable_p="test -x"
++else
++  as_executable_p=:
++fi
++rm -f conf$$.file
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -35554,31 +38544,14 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ exec 6>&1
+ 
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# Save the log message, to keep $[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling.  Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+-  echo
+-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
+-
++# values after options handling.
++ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++generated by GNU Autoconf 2.60.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -35586,30 +38559,20 @@
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
++
+ _ACEOF
+ 
++cat >>$CONFIG_STATUS <<_ACEOF
+ # Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_headers"; then
+-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+ 
+-if test -n "$ac_config_links"; then
+-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_commands"; then
+-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++_ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+@@ -35636,19 +38599,21 @@
+ $config_commands
+ 
+ Report bugs to <bug-autoconf at gnu.org>."
+-_ACEOF
+ 
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.59,
+-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.60,
++  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
++
++ac_pwd='$ac_pwd'
++srcdir='$srcdir'
++INSTALL='$INSTALL'
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -35659,39 +38624,24 @@
+ do
+   case $1 in
+   --*=*)
+-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
+-  -*)
++  *)
+     ac_option=$1
+     ac_optarg=$2
+     ac_shift=shift
+     ;;
+-  *) # This is not an option, so the user has probably given explicit
+-     # arguments.
+-     ac_option=$1
+-     ac_need_defaults=false;;
+   esac
+ 
+   case $ac_option in
+   # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+     ac_cs_recheck=: ;;
+-  --version | --vers* | -V )
+-    echo "$ac_cs_version"; exit 0 ;;
+-  --he | --h)
+-    # Conflict between --help and --header
+-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; };;
+-  --help | --hel | -h )
+-    echo "$ac_cs_usage"; exit 0 ;;
+-  --debug | --d* | -d )
++  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
++    echo "$ac_cs_version"; exit ;;
++  --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+@@ -35701,18 +38651,24 @@
+     $ac_shift
+     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
++  --he | --h)
++    # Conflict between --help and --header
++    { echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    echo "$ac_cs_usage"; exit ;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil | --si | --s)
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
++  -*) { echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; } ;;
+ 
+-  *) ac_config_targets="$ac_config_targets $1" ;;
++  *) ac_config_targets="$ac_config_targets $1"
++     ac_need_defaults=false ;;
+ 
+   esac
+   shift
+@@ -35728,123 +38684,135 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  CONFIG_SHELL=$SHELL
++  export CONFIG_SHELL
++  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+ 
+ _ACEOF
+-
++cat >>$CONFIG_STATUS <<\_ACEOF
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
++## Running $as_me. ##
++_ASBOX
++  echo "$ac_log"
++} >&5
++
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+-# INIT-COMMANDS section.
++# INIT-COMMANDS
+ #
+-
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ 
+ _ACEOF
+ 
+-
+-
+ cat >>$CONFIG_STATUS <<\_ACEOF
++
++# Handling of arguments.
+ for ac_config_target in $ac_config_targets
+ do
+-  case "$ac_config_target" in
+-  # Handling of arguments.
+-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+-  "doc/da_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/da_kipi-plugins/Makefile" ;;
+-  "doc/de_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/de_kipi-plugins/Makefile" ;;
+-  "doc/es_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/es_kipi-plugins/Makefile" ;;
+-  "doc/et_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/et_kipi-plugins/Makefile" ;;
+-  "doc/it_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/it_kipi-plugins/Makefile" ;;
+-  "doc/kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kipi-plugins/Makefile" ;;
+-  "doc/nl_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/nl_kipi-plugins/Makefile" ;;
+-  "doc/pt_BR_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/pt_BR_kipi-plugins/Makefile" ;;
+-  "doc/pt_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/pt_kipi-plugins/Makefile" ;;
+-  "doc/ru_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ru_kipi-plugins/Makefile" ;;
+-  "doc/sv_kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/sv_kipi-plugins/Makefile" ;;
+-  "kipi-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/Makefile" ;;
+-  "kipi-plugins/acquireimages/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/acquireimages/Makefile" ;;
+-  "kipi-plugins/batchprocessimages/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/batchprocessimages/Makefile" ;;
+-  "kipi-plugins/batchprocessimages/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/batchprocessimages/data/Makefile" ;;
+-  "kipi-plugins/calendar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/calendar/Makefile" ;;
+-  "kipi-plugins/cdarchiving/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/cdarchiving/Makefile" ;;
+-  "kipi-plugins/cdarchiving/autorun/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/cdarchiving/autorun/Makefile" ;;
+-  "kipi-plugins/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/common/Makefile" ;;
+-  "kipi-plugins/common/exiv2iface/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/common/exiv2iface/Makefile" ;;
+-  "kipi-plugins/common/libkipiplugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/common/libkipiplugins/Makefile" ;;
+-  "kipi-plugins/findimages/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/findimages/Makefile" ;;
+-  "kipi-plugins/flickrexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/flickrexport/Makefile" ;;
+-  "kipi-plugins/galleryexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/galleryexport/Makefile" ;;
+-  "kipi-plugins/gpssync/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/gpssync/Makefile" ;;
+-  "kipi-plugins/helloworld/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/helloworld/Makefile" ;;
+-  "kipi-plugins/htmlexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/Makefile" ;;
+-  "kipi-plugins/htmlexport/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/Makefile" ;;
+-  "kipi-plugins/htmlexport/themes/matrix/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/matrix/Makefile" ;;
+-  "kipi-plugins/htmlexport/themes/s0/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/s0/Makefile" ;;
+-  "kipi-plugins/htmlexport/themes/simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/simple/Makefile" ;;
+-  "kipi-plugins/htmlexport/themes/snow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/snow/Makefile" ;;
+-  "kipi-plugins/imagesgallery/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/imagesgallery/Makefile" ;;
+-  "kipi-plugins/ipodexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/ipodexport/Makefile" ;;
+-  "kipi-plugins/jpeglossless/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/jpeglossless/Makefile" ;;
+-  "kipi-plugins/kameraklient/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/kameraklient/Makefile" ;;
+-  "kipi-plugins/metadataedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/metadataedit/Makefile" ;;
+-  "kipi-plugins/mpegencoder/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/mpegencoder/Makefile" ;;
+-  "kipi-plugins/printwizard/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/printwizard/Makefile" ;;
+-  "kipi-plugins/rawconverter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/rawconverter/Makefile" ;;
+-  "kipi-plugins/rawconverter/profiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/rawconverter/profiles/Makefile" ;;
+-  "kipi-plugins/sendimages/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/sendimages/Makefile" ;;
+-  "kipi-plugins/simpleviewerexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/simpleviewerexport/Makefile" ;;
+-  "kipi-plugins/slideshow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/slideshow/Makefile" ;;
+-  "kipi-plugins/timeadjust/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/timeadjust/Makefile" ;;
+-  "kipi-plugins/wallpaper/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/wallpaper/Makefile" ;;
+-  "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
+-  "po/ar/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ar/Makefile" ;;
+-  "po/br/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/br/Makefile" ;;
+-  "po/ca/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ca/Makefile" ;;
+-  "po/cs/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/cs/Makefile" ;;
+-  "po/cy/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/cy/Makefile" ;;
+-  "po/da/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/da/Makefile" ;;
+-  "po/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/de/Makefile" ;;
+-  "po/el/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/el/Makefile" ;;
+-  "po/en_GB/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/en_GB/Makefile" ;;
+-  "po/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/es/Makefile" ;;
+-  "po/et/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/et/Makefile" ;;
+-  "po/fi/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/fi/Makefile" ;;
+-  "po/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/fr/Makefile" ;;
+-  "po/ga/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ga/Makefile" ;;
+-  "po/gl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/gl/Makefile" ;;
+-  "po/hu/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/hu/Makefile" ;;
+-  "po/is/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/is/Makefile" ;;
+-  "po/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/it/Makefile" ;;
+-  "po/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ja/Makefile" ;;
+-  "po/lt/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/lt/Makefile" ;;
+-  "po/mt/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/mt/Makefile" ;;
+-  "po/nb/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/nb/Makefile" ;;
+-  "po/nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/nl/Makefile" ;;
+-  "po/nn/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/nn/Makefile" ;;
+-  "po/pa/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pa/Makefile" ;;
+-  "po/pl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pl/Makefile" ;;
+-  "po/pt/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pt/Makefile" ;;
+-  "po/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pt_BR/Makefile" ;;
+-  "po/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;;
+-  "po/rw/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/rw/Makefile" ;;
+-  "po/sk/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sk/Makefile" ;;
+-  "po/sr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sr/Makefile" ;;
+-  "po/sr at Latn/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sr at Latn/Makefile" ;;
+-  "po/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sv/Makefile" ;;
+-  "po/ta/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ta/Makefile" ;;
+-  "po/tr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;;
+-  "po/uk/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/uk/Makefile" ;;
+-  "po/zh_CN/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/zh_CN/Makefile" ;;
+-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++  case $ac_config_target in
++    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++    "doc/da_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/da_kipi-plugins/Makefile" ;;
++    "doc/de_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/de_kipi-plugins/Makefile" ;;
++    "doc/es_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/es_kipi-plugins/Makefile" ;;
++    "doc/et_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/et_kipi-plugins/Makefile" ;;
++    "doc/it_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/it_kipi-plugins/Makefile" ;;
++    "doc/kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kipi-plugins/Makefile" ;;
++    "doc/nl_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/nl_kipi-plugins/Makefile" ;;
++    "doc/pt_BR_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt_BR_kipi-plugins/Makefile" ;;
++    "doc/pt_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt_kipi-plugins/Makefile" ;;
++    "doc/ru_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ru_kipi-plugins/Makefile" ;;
++    "doc/sv_kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES doc/sv_kipi-plugins/Makefile" ;;
++    "kipi-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/Makefile" ;;
++    "kipi-plugins/acquireimages/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/acquireimages/Makefile" ;;
++    "kipi-plugins/batchprocessimages/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/batchprocessimages/Makefile" ;;
++    "kipi-plugins/batchprocessimages/data/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/batchprocessimages/data/Makefile" ;;
++    "kipi-plugins/calendar/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/calendar/Makefile" ;;
++    "kipi-plugins/cdarchiving/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/cdarchiving/Makefile" ;;
++    "kipi-plugins/cdarchiving/autorun/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/cdarchiving/autorun/Makefile" ;;
++    "kipi-plugins/common/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/common/Makefile" ;;
++    "kipi-plugins/common/exiv2iface/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/common/exiv2iface/Makefile" ;;
++    "kipi-plugins/common/libkipiplugins/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/common/libkipiplugins/Makefile" ;;
++    "kipi-plugins/findimages/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/findimages/Makefile" ;;
++    "kipi-plugins/flickrexport/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/flickrexport/Makefile" ;;
++    "kipi-plugins/galleryexport/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/galleryexport/Makefile" ;;
++    "kipi-plugins/gpssync/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/gpssync/Makefile" ;;
++    "kipi-plugins/helloworld/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/helloworld/Makefile" ;;
++    "kipi-plugins/htmlexport/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/Makefile" ;;
++    "kipi-plugins/htmlexport/themes/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/Makefile" ;;
++    "kipi-plugins/htmlexport/themes/matrix/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/matrix/Makefile" ;;
++    "kipi-plugins/htmlexport/themes/s0/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/s0/Makefile" ;;
++    "kipi-plugins/htmlexport/themes/simple/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/simple/Makefile" ;;
++    "kipi-plugins/htmlexport/themes/snow/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/htmlexport/themes/snow/Makefile" ;;
++    "kipi-plugins/imagesgallery/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/imagesgallery/Makefile" ;;
++    "kipi-plugins/ipodexport/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/ipodexport/Makefile" ;;
++    "kipi-plugins/jpeglossless/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/jpeglossless/Makefile" ;;
++    "kipi-plugins/kameraklient/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/kameraklient/Makefile" ;;
++    "kipi-plugins/metadataedit/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/metadataedit/Makefile" ;;
++    "kipi-plugins/mpegencoder/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/mpegencoder/Makefile" ;;
++    "kipi-plugins/printwizard/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/printwizard/Makefile" ;;
++    "kipi-plugins/rawconverter/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/rawconverter/Makefile" ;;
++    "kipi-plugins/rawconverter/profiles/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/rawconverter/profiles/Makefile" ;;
++    "kipi-plugins/sendimages/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/sendimages/Makefile" ;;
++    "kipi-plugins/simpleviewerexport/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/simpleviewerexport/Makefile" ;;
++    "kipi-plugins/slideshow/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/slideshow/Makefile" ;;
++    "kipi-plugins/timeadjust/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/timeadjust/Makefile" ;;
++    "kipi-plugins/wallpaper/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/wallpaper/Makefile" ;;
++    "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
++    "po/ar/Makefile") CONFIG_FILES="$CONFIG_FILES po/ar/Makefile" ;;
++    "po/br/Makefile") CONFIG_FILES="$CONFIG_FILES po/br/Makefile" ;;
++    "po/ca/Makefile") CONFIG_FILES="$CONFIG_FILES po/ca/Makefile" ;;
++    "po/cs/Makefile") CONFIG_FILES="$CONFIG_FILES po/cs/Makefile" ;;
++    "po/cy/Makefile") CONFIG_FILES="$CONFIG_FILES po/cy/Makefile" ;;
++    "po/da/Makefile") CONFIG_FILES="$CONFIG_FILES po/da/Makefile" ;;
++    "po/de/Makefile") CONFIG_FILES="$CONFIG_FILES po/de/Makefile" ;;
++    "po/el/Makefile") CONFIG_FILES="$CONFIG_FILES po/el/Makefile" ;;
++    "po/en_GB/Makefile") CONFIG_FILES="$CONFIG_FILES po/en_GB/Makefile" ;;
++    "po/es/Makefile") CONFIG_FILES="$CONFIG_FILES po/es/Makefile" ;;
++    "po/et/Makefile") CONFIG_FILES="$CONFIG_FILES po/et/Makefile" ;;
++    "po/fi/Makefile") CONFIG_FILES="$CONFIG_FILES po/fi/Makefile" ;;
++    "po/fr/Makefile") CONFIG_FILES="$CONFIG_FILES po/fr/Makefile" ;;
++    "po/ga/Makefile") CONFIG_FILES="$CONFIG_FILES po/ga/Makefile" ;;
++    "po/gl/Makefile") CONFIG_FILES="$CONFIG_FILES po/gl/Makefile" ;;
++    "po/hu/Makefile") CONFIG_FILES="$CONFIG_FILES po/hu/Makefile" ;;
++    "po/is/Makefile") CONFIG_FILES="$CONFIG_FILES po/is/Makefile" ;;
++    "po/it/Makefile") CONFIG_FILES="$CONFIG_FILES po/it/Makefile" ;;
++    "po/ja/Makefile") CONFIG_FILES="$CONFIG_FILES po/ja/Makefile" ;;
++    "po/lt/Makefile") CONFIG_FILES="$CONFIG_FILES po/lt/Makefile" ;;
++    "po/mt/Makefile") CONFIG_FILES="$CONFIG_FILES po/mt/Makefile" ;;
++    "po/nb/Makefile") CONFIG_FILES="$CONFIG_FILES po/nb/Makefile" ;;
++    "po/nl/Makefile") CONFIG_FILES="$CONFIG_FILES po/nl/Makefile" ;;
++    "po/nn/Makefile") CONFIG_FILES="$CONFIG_FILES po/nn/Makefile" ;;
++    "po/pa/Makefile") CONFIG_FILES="$CONFIG_FILES po/pa/Makefile" ;;
++    "po/pl/Makefile") CONFIG_FILES="$CONFIG_FILES po/pl/Makefile" ;;
++    "po/pt/Makefile") CONFIG_FILES="$CONFIG_FILES po/pt/Makefile" ;;
++    "po/pt_BR/Makefile") CONFIG_FILES="$CONFIG_FILES po/pt_BR/Makefile" ;;
++    "po/ru/Makefile") CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;;
++    "po/rw/Makefile") CONFIG_FILES="$CONFIG_FILES po/rw/Makefile" ;;
++    "po/sk/Makefile") CONFIG_FILES="$CONFIG_FILES po/sk/Makefile" ;;
++    "po/sr/Makefile") CONFIG_FILES="$CONFIG_FILES po/sr/Makefile" ;;
++    "po/sr at Latn/Makefile") CONFIG_FILES="$CONFIG_FILES po/sr at Latn/Makefile" ;;
++    "po/sv/Makefile") CONFIG_FILES="$CONFIG_FILES po/sv/Makefile" ;;
++    "po/ta/Makefile") CONFIG_FILES="$CONFIG_FILES po/ta/Makefile" ;;
++    "po/tr/Makefile") CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;;
++    "po/uk/Makefile") CONFIG_FILES="$CONFIG_FILES po/uk/Makefile" ;;
++    "po/zh_CN/Makefile") CONFIG_FILES="$CONFIG_FILES po/zh_CN/Makefile" ;;
++
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
++
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used.  Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+@@ -35856,538 +38824,733 @@
+ fi
+ 
+ # Have a temporary directory for convenience.  Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
++# simply because there is no reason against having it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
++# Hook for its removal unless debugging.
++# Note that there is a small window in which the directory will not be cleaned:
++# after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  tmp=
++  trap 'exit_status=$?
++  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++' 0
+   trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+-
+ # Create a (secure) tmp directory for tmp files.
+ 
+ {
+-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=./confstat$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
++  tmp=./conf$$-$RANDOM
++  (umask 077 && mkdir "$tmp")
+ } ||
+ {
+    echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<_ACEOF
+-
+ #
+-# CONFIG_FILES section.
++# Set up the sed scripts for CONFIG_FILES section.
+ #
+ 
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+-  # Protect against being on the right side of a sed subst in config.status.
+-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s, at SHELL@,$SHELL,;t t
+-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s, at exec_prefix@,$exec_prefix,;t t
+-s, at prefix@,$prefix,;t t
+-s, at program_transform_name@,$program_transform_name,;t t
+-s, at bindir@,$bindir,;t t
+-s, at sbindir@,$sbindir,;t t
+-s, at libexecdir@,$libexecdir,;t t
+-s, at datadir@,$datadir,;t t
+-s, at sysconfdir@,$sysconfdir,;t t
+-s, at sharedstatedir@,$sharedstatedir,;t t
+-s, at localstatedir@,$localstatedir,;t t
+-s, at libdir@,$libdir,;t t
+-s, at includedir@,$includedir,;t t
+-s, at oldincludedir@,$oldincludedir,;t t
+-s, at infodir@,$infodir,;t t
+-s, at mandir@,$mandir,;t t
+-s, at build_alias@,$build_alias,;t t
+-s, at host_alias@,$host_alias,;t t
+-s, at target_alias@,$target_alias,;t t
+-s, at DEFS@,$DEFS,;t t
+-s, at ECHO_C@,$ECHO_C,;t t
+-s, at ECHO_N@,$ECHO_N,;t t
+-s, at ECHO_T@,$ECHO_T,;t t
+-s, at LIBS@,$LIBS,;t t
+-s, at build@,$build,;t t
+-s, at build_cpu@,$build_cpu,;t t
+-s, at build_vendor@,$build_vendor,;t t
+-s, at build_os@,$build_os,;t t
+-s, at host@,$host,;t t
+-s, at host_cpu@,$host_cpu,;t t
+-s, at host_vendor@,$host_vendor,;t t
+-s, at host_os@,$host_os,;t t
+-s, at target@,$target,;t t
+-s, at target_cpu@,$target_cpu,;t t
+-s, at target_vendor@,$target_vendor,;t t
+-s, at target_os@,$target_os,;t t
+-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+-s, at CYGPATH_W@,$CYGPATH_W,;t t
+-s, at PACKAGE@,$PACKAGE,;t t
+-s, at VERSION@,$VERSION,;t t
+-s, at ACLOCAL@,$ACLOCAL,;t t
+-s, at AUTOCONF@,$AUTOCONF,;t t
+-s, at AUTOMAKE@,$AUTOMAKE,;t t
+-s, at AUTOHEADER@,$AUTOHEADER,;t t
+-s, at MAKEINFO@,$MAKEINFO,;t t
+-s, at AMTAR@,$AMTAR,;t t
+-s, at install_sh@,$install_sh,;t t
+-s, at STRIP@,$STRIP,;t t
+-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
+-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s, at AWK@,$AWK,;t t
+-s, at SET_MAKE@,$SET_MAKE,;t t
+-s, at am__leading_dot@,$am__leading_dot,;t t
+-s, at KDECONFIG@,$KDECONFIG,;t t
+-s, at kde_libs_prefix@,$kde_libs_prefix,;t t
+-s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
+-s, at CONF_FILES@,$CONF_FILES,;t t
+-s, at CC@,$CC,;t t
+-s, at CFLAGS@,$CFLAGS,;t t
+-s, at LDFLAGS@,$LDFLAGS,;t t
+-s, at CPPFLAGS@,$CPPFLAGS,;t t
+-s, at ac_ct_CC@,$ac_ct_CC,;t t
+-s, at EXEEXT@,$EXEEXT,;t t
+-s, at OBJEXT@,$OBJEXT,;t t
+-s, at DEPDIR@,$DEPDIR,;t t
+-s, at am__include@,$am__include,;t t
+-s, at am__quote@,$am__quote,;t t
+-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
+-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
+-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+-s, at CCDEPMODE@,$CCDEPMODE,;t t
+-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s, at CPP@,$CPP,;t t
+-s, at CXX@,$CXX,;t t
+-s, at CXXFLAGS@,$CXXFLAGS,;t t
+-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
+-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
+-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+-s, at WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t
+-s, at HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t
+-s, at unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t
+-s, at unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t
+-s, at USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t
+-s, at USE_RTTI@,$USE_RTTI,;t t
+-s, at CXXCPP@,$CXXCPP,;t t
+-s, at NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t
+-s, at NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t
+-s, at ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t
+-s, at LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t
+-s, at LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t
+-s, at KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t
+-s, at KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t
+-s, at KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t
+-s, at KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t
+-s, at KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t
+-s, at KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t
+-s, at KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t
+-s, at EGREP@,$EGREP,;t t
+-s, at LN_S@,$LN_S,;t t
+-s, at ECHO@,$ECHO,;t t
+-s, at AR@,$AR,;t t
+-s, at ac_ct_AR@,$ac_ct_AR,;t t
+-s, at RANLIB@,$RANLIB,;t t
+-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s, at F77@,$F77,;t t
+-s, at FFLAGS@,$FFLAGS,;t t
+-s, at ac_ct_F77@,$ac_ct_F77,;t t
+-s, at LIBTOOL@,$LIBTOOL,;t t
+-s, at KDE_PLUGIN@,$KDE_PLUGIN,;t t
+-s, at KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t
+-s, at MSGFMT@,$MSGFMT,;t t
+-s, at GMSGFMT@,$GMSGFMT,;t t
+-s, at XGETTEXT@,$XGETTEXT,;t t
+-s, at LIBUTIL@,$LIBUTIL,;t t
+-s, at LIBCOMPAT@,$LIBCOMPAT,;t t
+-s, at LIBCRYPT@,$LIBCRYPT,;t t
+-s, at LIBRESOLV@,$LIBRESOLV,;t t
+-s, at LIB_POLL@,$LIB_POLL,;t t
+-s, at FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t
+-s, at LIBSOCKET@,$LIBSOCKET,;t t
+-s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+-s, at LIBUCB@,$LIBUCB,;t t
+-s, at LIBDL@,$LIBDL,;t t
+-s, at KDE_USE_FPIE@,$KDE_USE_FPIE,;t t
+-s, at KDE_USE_PIE@,$KDE_USE_PIE,;t t
+-s, at include_x11_TRUE@,$include_x11_TRUE,;t t
+-s, at include_x11_FALSE@,$include_x11_FALSE,;t t
+-s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
+-s, at LIB_X11@,$LIB_X11,;t t
+-s, at LIB_XRENDER@,$LIB_XRENDER,;t t
+-s, at LIBSM@,$LIBSM,;t t
+-s, at X_INCLUDES@,$X_INCLUDES,;t t
+-s, at X_LDFLAGS@,$X_LDFLAGS,;t t
+-s, at x_includes@,$x_includes,;t t
+-s, at x_libraries@,$x_libraries,;t t
+-s, at QTE_NORTTI@,$QTE_NORTTI,;t t
+-s, at LIB_XEXT@,$LIB_XEXT,;t t
+-s, at LIBPTHREAD@,$LIBPTHREAD,;t t
+-s, at USE_THREADS@,$USE_THREADS,;t t
+-s, at KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t
+-s, at KDE_MT_LIBS@,$KDE_MT_LIBS,;t t
+-s, at USER_INCLUDES@,$USER_INCLUDES,;t t
+-s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
+-s, at LIBZ@,$LIBZ,;t t
+-s, at LIBPNG@,$LIBPNG,;t t
+-s, at LIBJPEG@,$LIBJPEG,;t t
+-s, at qt_libraries@,$qt_libraries,;t t
+-s, at qt_includes@,$qt_includes,;t t
+-s, at QT_INCLUDES@,$QT_INCLUDES,;t t
+-s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
+-s, at PERL@,$PERL,;t t
+-s, at MOC@,$MOC,;t t
+-s, at UIC@,$UIC,;t t
+-s, at UIC_TR@,$UIC_TR,;t t
+-s, at LIB_QT@,$LIB_QT,;t t
+-s, at LIB_QPE@,$LIB_QPE,;t t
+-s, at kde_qtver@,$kde_qtver,;t t
+-s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
+-s, at KDE_RPATH@,$KDE_RPATH,;t t
+-s, at X_RPATH@,$X_RPATH,;t t
+-s, at kde_libraries@,$kde_libraries,;t t
+-s, at kde_includes@,$kde_includes,;t t
+-s, at KDE_LDFLAGS@,$KDE_LDFLAGS,;t t
+-s, at KDE_INCLUDES@,$KDE_INCLUDES,;t t
+-s, at all_includes@,$all_includes,;t t
+-s, at all_libraries@,$all_libraries,;t t
+-s, at AUTODIRS@,$AUTODIRS,;t t
+-s, at include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
+-s, at include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
+-s, at MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t
+-s, at KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
+-s, at KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
+-s, at DCOPIDLNG@,$DCOPIDLNG,;t t
+-s, at DCOPIDL@,$DCOPIDL,;t t
+-s, at DCOPIDL2CPP@,$DCOPIDL2CPP,;t t
+-s, at DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t
+-s, at MCOPIDL@,$MCOPIDL,;t t
+-s, at ARTSCCONFIG@,$ARTSCCONFIG,;t t
+-s, at MEINPROC@,$MEINPROC,;t t
+-s, at KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t
+-s, at XMLLINT@,$XMLLINT,;t t
+-s, at kde_htmldir@,$kde_htmldir,;t t
+-s, at kde_appsdir@,$kde_appsdir,;t t
+-s, at kde_icondir@,$kde_icondir,;t t
+-s, at kde_sounddir@,$kde_sounddir,;t t
+-s, at kde_datadir@,$kde_datadir,;t t
+-s, at kde_locale@,$kde_locale,;t t
+-s, at kde_confdir@,$kde_confdir,;t t
+-s, at kde_kcfgdir@,$kde_kcfgdir,;t t
+-s, at kde_mimedir@,$kde_mimedir,;t t
+-s, at kde_wallpaperdir@,$kde_wallpaperdir,;t t
+-s, at kde_bindir@,$kde_bindir,;t t
+-s, at xdg_appsdir@,$xdg_appsdir,;t t
+-s, at xdg_menudir@,$xdg_menudir,;t t
+-s, at xdg_directorydir@,$xdg_directorydir,;t t
+-s, at kde_templatesdir@,$kde_templatesdir,;t t
+-s, at kde_servicesdir@,$kde_servicesdir,;t t
+-s, at kde_servicetypesdir@,$kde_servicetypesdir,;t t
+-s, at kde_moduledir@,$kde_moduledir,;t t
+-s, at kdeinitdir@,$kdeinitdir,;t t
+-s, at kde_styledir@,$kde_styledir,;t t
+-s, at kde_widgetdir@,$kde_widgetdir,;t t
+-s, at LIB_KDED@,$LIB_KDED,;t t
+-s, at LIB_KDECORE@,$LIB_KDECORE,;t t
+-s, at LIB_KDEUI@,$LIB_KDEUI,;t t
+-s, at LIB_KIO@,$LIB_KIO,;t t
+-s, at LIB_KJS@,$LIB_KJS,;t t
+-s, at LIB_SMB@,$LIB_SMB,;t t
+-s, at LIB_KAB@,$LIB_KAB,;t t
+-s, at LIB_KABC@,$LIB_KABC,;t t
+-s, at LIB_KHTML@,$LIB_KHTML,;t t
+-s, at LIB_KSPELL@,$LIB_KSPELL,;t t
+-s, at LIB_KPARTS@,$LIB_KPARTS,;t t
+-s, at LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
+-s, at LIB_KUTILS@,$LIB_KUTILS,;t t
+-s, at LIB_KDEPIM@,$LIB_KDEPIM,;t t
+-s, at LIB_KIMPROXY@,$LIB_KIMPROXY,;t t
+-s, at LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
+-s, at LIB_KDNSSD@,$LIB_KDNSSD,;t t
+-s, at LIB_KUNITTEST@,$LIB_KUNITTEST,;t t
+-s, at LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
+-s, at LIB_KFILE@,$LIB_KFILE,;t t
+-s, at LIB_KFM@,$LIB_KFM,;t t
+-s, at QTDOCDIR@,$QTDOCDIR,;t t
+-s, at KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t
+-s, at DOXYGEN@,$DOXYGEN,;t t
+-s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
+-s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
+-s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
+-s, at PKGCONFIGFOUND@,$PKGCONFIGFOUND,;t t
+-s, at KIPI_PLUGINS_COMMON_INCLUDE@,$KIPI_PLUGINS_COMMON_INCLUDE,;t t
+-s, at KIPI_PLUGINS_COMMON_LDFLAGS@,$KIPI_PLUGINS_COMMON_LDFLAGS,;t t
+-s, at LIBKIPI_CFLAGS@,$LIBKIPI_CFLAGS,;t t
+-s, at LIBKIPI_LIBS@,$LIBKIPI_LIBS,;t t
+-s, at LIBKIPI_LIBS_DEP@,$LIBKIPI_LIBS_DEP,;t t
+-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+-s, at LIB_TIFF@,$LIB_TIFF,;t t
+-s, at compile_ACQUIREIMAGES_TRUE@,$compile_ACQUIREIMAGES_TRUE,;t t
+-s, at compile_ACQUIREIMAGES_FALSE@,$compile_ACQUIREIMAGES_FALSE,;t t
+-s, at compile_RAWCONVERTER_TRUE@,$compile_RAWCONVERTER_TRUE,;t t
+-s, at compile_RAWCONVERTER_FALSE@,$compile_RAWCONVERTER_FALSE,;t t
+-s, at GPHOTO_CONFIG@,$GPHOTO_CONFIG,;t t
+-s, at GPHOTO_PORT_CONFIG@,$GPHOTO_PORT_CONFIG,;t t
+-s, at GPHOTO_CFLAGS@,$GPHOTO_CFLAGS,;t t
+-s, at LIB_GPHOTO@,$LIB_GPHOTO,;t t
+-s, at compile_KAMERAKLIENT_TRUE@,$compile_KAMERAKLIENT_TRUE,;t t
+-s, at compile_KAMERAKLIENT_FALSE@,$compile_KAMERAKLIENT_FALSE,;t t
+-s, at XSLT_CONFIG@,$XSLT_CONFIG,;t t
+-s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
+-s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
+-s, at compile_HTMLEXPORT_TRUE@,$compile_HTMLEXPORT_TRUE,;t t
+-s, at compile_HTMLEXPORT_FALSE@,$compile_HTMLEXPORT_FALSE,;t t
+-s, at EXIV2_CFLAGS@,$EXIV2_CFLAGS,;t t
+-s, at EXIV2_LIBS@,$EXIV2_LIBS,;t t
+-s, at LIBGPOD_CFLAGS@,$LIBGPOD_CFLAGS,;t t
+-s, at LIBGPOD_LIBS@,$LIBGPOD_LIBS,;t t
+-s, at compile_IPODEXPORT_TRUE@,$compile_IPODEXPORT_TRUE,;t t
+-s, at compile_IPODEXPORT_FALSE@,$compile_IPODEXPORT_FALSE,;t t
+-s, at GL_LIBS@,$GL_LIBS,;t t
+-s, at LIB_IMLIB2@,$LIB_IMLIB2,;t t
+-s, at IMLIB2_CFLAGS@,$IMLIB2_CFLAGS,;t t
+-s, at compile_SLIDESHOW_TRUE@,$compile_SLIDESHOW_TRUE,;t t
+-s, at compile_SLIDESHOW_FALSE@,$compile_SLIDESHOW_FALSE,;t t
+-s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
+-s, at libkipi_SUBDIR_included_TRUE@,$libkipi_SUBDIR_included_TRUE,;t t
+-s, at libkipi_SUBDIR_included_FALSE@,$libkipi_SUBDIR_included_FALSE,;t t
+-s, at doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t
+-s, at doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t
+-s, at kipi_plugins_SUBDIR_included_TRUE@,$kipi_plugins_SUBDIR_included_TRUE,;t t
+-s, at kipi_plugins_SUBDIR_included_FALSE@,$kipi_plugins_SUBDIR_included_FALSE,;t t
+-s, at po_SUBDIR_included_TRUE@,$po_SUBDIR_included_TRUE,;t t
+-s, at po_SUBDIR_included_FALSE@,$po_SUBDIR_included_FALSE,;t t
+-s, at LIBOBJS@,$LIBOBJS,;t t
+-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+-  cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Split the substitutions into bite-sized pieces for seds with
+-  # small command number limits, like on Digital OSF/1 and HP-UX.
+-  ac_max_sed_lines=48
+-  ac_sed_frag=1 # Number of current file.
+-  ac_beg=1 # First line for current file.
+-  ac_end=$ac_max_sed_lines # Line after last line for current file.
+-  ac_more_lines=:
+-  ac_sed_cmds=
+-  while $ac_more_lines; do
+-    if test $ac_beg -gt 1; then
+-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    else
+-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    fi
+-    if test ! -s $tmp/subs.frag; then
+-      ac_more_lines=false
+-    else
+-      # The purpose of the label and of the branching condition is to
+-      # speed up the sed processing (if there are no `@' at all, there
+-      # is no need to browse any of the substitutions).
+-      # These are the two extra sed commands mentioned above.
+-      (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+-      if test -z "$ac_sed_cmds"; then
+-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+-      else
+-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+-      fi
+-      ac_sed_frag=`expr $ac_sed_frag + 1`
+-      ac_beg=$ac_end
+-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+-    fi
+-  done
+-  if test -z "$ac_sed_cmds"; then
+-    ac_sed_cmds=cat
++if test -n "$CONFIG_FILES"; then
++
++_ACEOF
++
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++SHELL!$SHELL$ac_delim
++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
++PACKAGE_NAME!$PACKAGE_NAME$ac_delim
++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
++PACKAGE_STRING!$PACKAGE_STRING$ac_delim
++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
++exec_prefix!$exec_prefix$ac_delim
++prefix!$prefix$ac_delim
++program_transform_name!$program_transform_name$ac_delim
++bindir!$bindir$ac_delim
++sbindir!$sbindir$ac_delim
++libexecdir!$libexecdir$ac_delim
++datarootdir!$datarootdir$ac_delim
++datadir!$datadir$ac_delim
++sysconfdir!$sysconfdir$ac_delim
++sharedstatedir!$sharedstatedir$ac_delim
++localstatedir!$localstatedir$ac_delim
++includedir!$includedir$ac_delim
++oldincludedir!$oldincludedir$ac_delim
++docdir!$docdir$ac_delim
++infodir!$infodir$ac_delim
++htmldir!$htmldir$ac_delim
++dvidir!$dvidir$ac_delim
++pdfdir!$pdfdir$ac_delim
++psdir!$psdir$ac_delim
++libdir!$libdir$ac_delim
++localedir!$localedir$ac_delim
++mandir!$mandir$ac_delim
++DEFS!$DEFS$ac_delim
++ECHO_C!$ECHO_C$ac_delim
++ECHO_N!$ECHO_N$ac_delim
++ECHO_T!$ECHO_T$ac_delim
++LIBS!$LIBS$ac_delim
++build_alias!$build_alias$ac_delim
++host_alias!$host_alias$ac_delim
++target_alias!$target_alias$ac_delim
++build!$build$ac_delim
++build_cpu!$build_cpu$ac_delim
++build_vendor!$build_vendor$ac_delim
++build_os!$build_os$ac_delim
++host!$host$ac_delim
++host_cpu!$host_cpu$ac_delim
++host_vendor!$host_vendor$ac_delim
++host_os!$host_os$ac_delim
++target!$target$ac_delim
++target_cpu!$target_cpu$ac_delim
++target_vendor!$target_vendor$ac_delim
++target_os!$target_os$ac_delim
++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
++INSTALL_DATA!$INSTALL_DATA$ac_delim
++CYGPATH_W!$CYGPATH_W$ac_delim
++PACKAGE!$PACKAGE$ac_delim
++VERSION!$VERSION$ac_delim
++ACLOCAL!$ACLOCAL$ac_delim
++AUTOCONF!$AUTOCONF$ac_delim
++AUTOMAKE!$AUTOMAKE$ac_delim
++AUTOHEADER!$AUTOHEADER$ac_delim
++MAKEINFO!$MAKEINFO$ac_delim
++install_sh!$install_sh$ac_delim
++STRIP!$STRIP$ac_delim
++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
++mkdir_p!$mkdir_p$ac_delim
++AWK!$AWK$ac_delim
++SET_MAKE!$SET_MAKE$ac_delim
++am__leading_dot!$am__leading_dot$ac_delim
++AMTAR!$AMTAR$ac_delim
++am__tar!$am__tar$ac_delim
++am__untar!$am__untar$ac_delim
++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
++MAINT!$MAINT$ac_delim
++KDECONFIG!$KDECONFIG$ac_delim
++kde_libs_prefix!$kde_libs_prefix$ac_delim
++kde_libs_htmldir!$kde_libs_htmldir$ac_delim
++CONF_FILES!$CONF_FILES$ac_delim
++CC!$CC$ac_delim
++CFLAGS!$CFLAGS$ac_delim
++LDFLAGS!$LDFLAGS$ac_delim
++CPPFLAGS!$CPPFLAGS$ac_delim
++ac_ct_CC!$ac_ct_CC$ac_delim
++EXEEXT!$EXEEXT$ac_delim
++OBJEXT!$OBJEXT$ac_delim
++DEPDIR!$DEPDIR$ac_delim
++am__include!$am__include$ac_delim
++am__quote!$am__quote$ac_delim
++AMDEP_TRUE!$AMDEP_TRUE$ac_delim
++AMDEP_FALSE!$AMDEP_FALSE$ac_delim
++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
++CCDEPMODE!$CCDEPMODE$ac_delim
++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++CPP!$CPP$ac_delim
++CXX!$CXX$ac_delim
++CXXFLAGS!$CXXFLAGS$ac_delim
++ac_ct_CXX!$ac_ct_CXX$ac_delim
++_ACEOF
++
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+-fi # test -n "$CONFIG_FILES"
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++CXXDEPMODE!$CXXDEPMODE$ac_delim
++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
++WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
++HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
++unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
++unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
++USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
++USE_RTTI!$USE_RTTI$ac_delim
++CXXCPP!$CXXCPP$ac_delim
++NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
++NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
++ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
++LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
++LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
++KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
++KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
++KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
++KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
++KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
++KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
++KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
++GREP!$GREP$ac_delim
++EGREP!$EGREP$ac_delim
++LN_S!$LN_S$ac_delim
++ECHO!$ECHO$ac_delim
++AR!$AR$ac_delim
++RANLIB!$RANLIB$ac_delim
++F77!$F77$ac_delim
++FFLAGS!$FFLAGS$ac_delim
++ac_ct_F77!$ac_ct_F77$ac_delim
++LIBTOOL!$LIBTOOL$ac_delim
++KDE_PLUGIN!$KDE_PLUGIN$ac_delim
++KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
++MSGFMT!$MSGFMT$ac_delim
++GMSGFMT!$GMSGFMT$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++LIBUTIL!$LIBUTIL$ac_delim
++LIBCOMPAT!$LIBCOMPAT$ac_delim
++LIBCRYPT!$LIBCRYPT$ac_delim
++LIBRESOLV!$LIBRESOLV$ac_delim
++LIB_POLL!$LIB_POLL$ac_delim
++FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
++LIBSOCKET!$LIBSOCKET$ac_delim
++X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
++LIBUCB!$LIBUCB$ac_delim
++LIBDL!$LIBDL$ac_delim
++KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
++KDE_USE_PIE!$KDE_USE_PIE$ac_delim
++include_x11_TRUE!$include_x11_TRUE$ac_delim
++include_x11_FALSE!$include_x11_FALSE$ac_delim
++XMKMF!$XMKMF$ac_delim
++X_PRE_LIBS!$X_PRE_LIBS$ac_delim
++LIB_X11!$LIB_X11$ac_delim
++LIB_XRENDER!$LIB_XRENDER$ac_delim
++LIBSM!$LIBSM$ac_delim
++X_INCLUDES!$X_INCLUDES$ac_delim
++X_LDFLAGS!$X_LDFLAGS$ac_delim
++x_includes!$x_includes$ac_delim
++x_libraries!$x_libraries$ac_delim
++QTE_NORTTI!$QTE_NORTTI$ac_delim
++LIB_XEXT!$LIB_XEXT$ac_delim
++LIBPTHREAD!$LIBPTHREAD$ac_delim
++USE_THREADS!$USE_THREADS$ac_delim
++KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
++KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
++USER_INCLUDES!$USER_INCLUDES$ac_delim
++USER_LDFLAGS!$USER_LDFLAGS$ac_delim
++LIBZ!$LIBZ$ac_delim
++LIBPNG!$LIBPNG$ac_delim
++LIBJPEG!$LIBJPEG$ac_delim
++qt_libraries!$qt_libraries$ac_delim
++qt_includes!$qt_includes$ac_delim
++QT_INCLUDES!$QT_INCLUDES$ac_delim
++QT_LDFLAGS!$QT_LDFLAGS$ac_delim
++PERL!$PERL$ac_delim
++MOC!$MOC$ac_delim
++UIC!$UIC$ac_delim
++UIC_TR!$UIC_TR$ac_delim
++LIB_QT!$LIB_QT$ac_delim
++LIB_QPE!$LIB_QPE$ac_delim
++kde_qtver!$kde_qtver$ac_delim
++KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
++KDE_RPATH!$KDE_RPATH$ac_delim
++X_RPATH!$X_RPATH$ac_delim
++kde_libraries!$kde_libraries$ac_delim
++kde_includes!$kde_includes$ac_delim
++KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
++KDE_INCLUDES!$KDE_INCLUDES$ac_delim
++all_includes!$all_includes$ac_delim
++all_libraries!$all_libraries$ac_delim
++AUTODIRS!$AUTODIRS$ac_delim
++include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
++include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
++MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
++KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
++KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
++_ACEOF
++
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++DCOPIDLNG!$DCOPIDLNG$ac_delim
++DCOPIDL!$DCOPIDL$ac_delim
++DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
++DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
++MCOPIDL!$MCOPIDL$ac_delim
++ARTSCCONFIG!$ARTSCCONFIG$ac_delim
++MEINPROC!$MEINPROC$ac_delim
++KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
++XMLLINT!$XMLLINT$ac_delim
++kde_htmldir!$kde_htmldir$ac_delim
++kde_appsdir!$kde_appsdir$ac_delim
++kde_icondir!$kde_icondir$ac_delim
++kde_sounddir!$kde_sounddir$ac_delim
++kde_datadir!$kde_datadir$ac_delim
++kde_locale!$kde_locale$ac_delim
++kde_confdir!$kde_confdir$ac_delim
++kde_kcfgdir!$kde_kcfgdir$ac_delim
++kde_mimedir!$kde_mimedir$ac_delim
++kde_wallpaperdir!$kde_wallpaperdir$ac_delim
++kde_bindir!$kde_bindir$ac_delim
++xdg_appsdir!$xdg_appsdir$ac_delim
++xdg_menudir!$xdg_menudir$ac_delim
++xdg_directorydir!$xdg_directorydir$ac_delim
++kde_templatesdir!$kde_templatesdir$ac_delim
++kde_servicesdir!$kde_servicesdir$ac_delim
++kde_servicetypesdir!$kde_servicetypesdir$ac_delim
++kde_moduledir!$kde_moduledir$ac_delim
++kdeinitdir!$kdeinitdir$ac_delim
++kde_styledir!$kde_styledir$ac_delim
++kde_widgetdir!$kde_widgetdir$ac_delim
++LIB_KDED!$LIB_KDED$ac_delim
++LIB_KDECORE!$LIB_KDECORE$ac_delim
++LIB_KDEUI!$LIB_KDEUI$ac_delim
++LIB_KIO!$LIB_KIO$ac_delim
++LIB_KJS!$LIB_KJS$ac_delim
++LIB_SMB!$LIB_SMB$ac_delim
++LIB_KAB!$LIB_KAB$ac_delim
++LIB_KABC!$LIB_KABC$ac_delim
++LIB_KHTML!$LIB_KHTML$ac_delim
++LIB_KSPELL!$LIB_KSPELL$ac_delim
++LIB_KPARTS!$LIB_KPARTS$ac_delim
++LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
++LIB_KUTILS!$LIB_KUTILS$ac_delim
++LIB_KDEPIM!$LIB_KDEPIM$ac_delim
++LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
++LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
++LIB_KDNSSD!$LIB_KDNSSD$ac_delim
++LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
++LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
++LIB_KFILE!$LIB_KFILE$ac_delim
++LIB_KFM!$LIB_KFM$ac_delim
++QTDOCDIR!$QTDOCDIR$ac_delim
++KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
++DOXYGEN!$DOXYGEN$ac_delim
++DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
++DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
++KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
++PKGCONFIGFOUND!$PKGCONFIGFOUND$ac_delim
++KIPI_PLUGINS_COMMON_INCLUDE!$KIPI_PLUGINS_COMMON_INCLUDE$ac_delim
++KIPI_PLUGINS_COMMON_LDFLAGS!$KIPI_PLUGINS_COMMON_LDFLAGS$ac_delim
++LIBKIPI_CFLAGS!$LIBKIPI_CFLAGS$ac_delim
++LIBKIPI_LIBS!$LIBKIPI_LIBS$ac_delim
++LIBKIPI_LIBS_DEP!$LIBKIPI_LIBS_DEP$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++LIB_TIFF!$LIB_TIFF$ac_delim
++compile_ACQUIREIMAGES_TRUE!$compile_ACQUIREIMAGES_TRUE$ac_delim
++compile_ACQUIREIMAGES_FALSE!$compile_ACQUIREIMAGES_FALSE$ac_delim
++compile_RAWCONVERTER_TRUE!$compile_RAWCONVERTER_TRUE$ac_delim
++compile_RAWCONVERTER_FALSE!$compile_RAWCONVERTER_FALSE$ac_delim
++GPHOTO_CONFIG!$GPHOTO_CONFIG$ac_delim
++GPHOTO_PORT_CONFIG!$GPHOTO_PORT_CONFIG$ac_delim
++GPHOTO_CFLAGS!$GPHOTO_CFLAGS$ac_delim
++LIB_GPHOTO!$LIB_GPHOTO$ac_delim
++compile_KAMERAKLIENT_TRUE!$compile_KAMERAKLIENT_TRUE$ac_delim
++compile_KAMERAKLIENT_FALSE!$compile_KAMERAKLIENT_FALSE$ac_delim
++XSLT_CONFIG!$XSLT_CONFIG$ac_delim
++LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
++LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
++compile_HTMLEXPORT_TRUE!$compile_HTMLEXPORT_TRUE$ac_delim
++compile_HTMLEXPORT_FALSE!$compile_HTMLEXPORT_FALSE$ac_delim
++EXIV2_CFLAGS!$EXIV2_CFLAGS$ac_delim
++EXIV2_LIBS!$EXIV2_LIBS$ac_delim
++LIBGPOD_CFLAGS!$LIBGPOD_CFLAGS$ac_delim
++LIBGPOD_LIBS!$LIBGPOD_LIBS$ac_delim
++compile_IPODEXPORT_TRUE!$compile_IPODEXPORT_TRUE$ac_delim
++compile_IPODEXPORT_FALSE!$compile_IPODEXPORT_FALSE$ac_delim
++GL_LIBS!$GL_LIBS$ac_delim
++LIB_IMLIB2!$LIB_IMLIB2$ac_delim
++IMLIB2_CFLAGS!$IMLIB2_CFLAGS$ac_delim
++compile_SLIDESHOW_TRUE!$compile_SLIDESHOW_TRUE$ac_delim
++compile_SLIDESHOW_FALSE!$compile_SLIDESHOW_FALSE$ac_delim
++TOPSUBDIRS!$TOPSUBDIRS$ac_delim
++libkipi_SUBDIR_included_TRUE!$libkipi_SUBDIR_included_TRUE$ac_delim
++libkipi_SUBDIR_included_FALSE!$libkipi_SUBDIR_included_FALSE$ac_delim
++doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim
++doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim
++kipi_plugins_SUBDIR_included_TRUE!$kipi_plugins_SUBDIR_included_TRUE$ac_delim
++_ACEOF
+ 
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++kipi_plugins_SUBDIR_included_FALSE!$kipi_plugins_SUBDIR_included_FALSE$ac_delim
++po_SUBDIR_included_TRUE!$po_SUBDIR_included_TRUE$ac_delim
++po_SUBDIR_included_FALSE!$po_SUBDIR_included_FALSE$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
++_ACEOF
++
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
+ _ACEOF
++
++
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/
++s/:*\${srcdir}:*/:/
++s/:*@srcdir@:*/:/
++s/^\([^=]*=[	 ]*\):*/\1/
++s/:*$//
++s/^[^=]*=[	 ]*$//
++}'
++fi
++
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
++fi # test -n "$CONFIG_FILES"
++
++
++for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
++do
++  case $ac_tag in
++  :[FHLC]) ac_mode=$ac_tag; continue;;
++  esac
++  case $ac_mode$ac_tag in
++  :[FHL]*:*);;
++  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++echo "$as_me: error: Invalid tag $ac_tag." >&2;}
++   { (exit 1); exit 1; }; };;
++  :[FH]-) ac_tag=-:-;;
++  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
++  esac
++  ac_save_IFS=$IFS
++  IFS=:
++  set x $ac_tag
++  IFS=$ac_save_IFS
++  shift
++  ac_file=$1
++  shift
++
++  case $ac_mode in
++  :L) ac_source=$1;;
++  :[FH])
++    ac_file_inputs=
++    for ac_f
++    do
++      case $ac_f in
++      -) ac_f="$tmp/stdin";;
++      *) # Look for the file first in the build tree, then in the source tree
++	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
++	 # because $ac_f cannot contain `:'.
++	 test -f "$ac_f" ||
++	   case $ac_f in
++	   [\\/$]*) false;;
++	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
++	   esac ||
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++   { (exit 1); exit 1; }; };;
++      esac
++      ac_file_inputs="$ac_file_inputs $ac_f"
++    done
++
++    # Let's still pretend it is `configure' which instantiates (i.e., don't
++    # use $as_me), people would be surprised to read:
++    #    /* config.h.  Generated by config.status.  */
++    configure_input="Generated from "`IFS=:
++	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
++    if test x"$ac_file" != x-; then
++      configure_input="$ac_file.  $configure_input"
++      { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    fi
++
++    case $ac_tag in
++    *:-:* | *:-) cat >"$tmp/stdin";;
++    esac
++    ;;
+   esac
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++  ac_dir=`$as_dirname -- "$ac_file" ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_file" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++  { as_dir="$ac_dir"
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+-
+   ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+ 
++  case $ac_mode in
++  :F)
++  #
++  # CONFIG_FILE
++  #
+ 
+   case $INSTALL in
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+   esac
++_ACEOF
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    configure_input=
+-  else
+-    configure_input="$ac_file.  "
+-  fi
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
+-				     sed 's,.*/,,'` by configure."
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=; ac_datarootdir_seen=
++
++case `sed -n '/datarootdir/ {
++  p
++  q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p
++' $ac_file_inputs` in
++*datarootdir*) ac_datarootdir_seen=yes;;
++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
++  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++  ac_datarootdir_hack='
++  s&@datadir@&$datadir&g
++  s&@docdir@&$docdir&g
++  s&@infodir@&$infodir&g
++  s&@localedir@&$localedir&g
++  s&@mandir@&$mandir&g
++    s&\\\${datarootdir}&$datarootdir&g' ;;
++esac
+ _ACEOF
++
++# Neutralize VPATH when `$srcdir' = `.'.
++# Shell code in configure.ac might set extrasub.
++# FIXME: do we really want to maintain this feature?
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
+ $extrasub
+@@ -36395,248 +39558,130 @@
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s, at configure_input@,$configure_input,;t t
+-s, at srcdir@,$ac_srcdir,;t t
+-s, at abs_srcdir@,$ac_abs_srcdir,;t t
+-s, at top_srcdir@,$ac_top_srcdir,;t t
+-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s, at builddir@,$ac_builddir,;t t
+-s, at abs_builddir@,$ac_abs_builddir,;t t
+-s, at top_builddir@,$ac_top_builddir,;t t
+-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s, at INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+-  rm -f $tmp/stdin
+-  if test x"$ac_file" != x-; then
+-    mv $tmp/out $ac_file
+-  else
+-    cat $tmp/out
+-    rm -f $tmp/out
+-  fi
+-
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_HEADER section.
+-#
+-
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+-ac_dB='[	 ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
++s&@configure_input@&$configure_input&;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@srcdir@&$ac_srcdir&;t t
++s&@abs_srcdir@&$ac_abs_srcdir&;t t
++s&@top_srcdir@&$ac_top_srcdir&;t t
++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
++s&@builddir@&$ac_builddir&;t t
++s&@abs_builddir@&$ac_abs_builddir&;t t
++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
++s&@INSTALL@&$ac_INSTALL&;t t
++$ac_datarootdir_hack
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
++
++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined.  Please make sure it is defined." >&5
++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined.  Please make sure it is defined." >&2;}
+ 
+-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  rm -f "$tmp/stdin"
+   case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
++  -) cat "$tmp/out"; rm -f "$tmp/out";;
++  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+   esac
+-
+-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 # Do quote $f, to prevent DOS paths from being IFS'd.
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
+-  # Remove the trailing spaces.
+-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+-
++ ;;
++  :H)
++  #
++  # CONFIG_HEADER
++  #
+ _ACEOF
+ 
+-# Transform confdefs.h into two sed scripts, `conftest.defines' and
+-# `conftest.undefs', that substitutes the proper values into
+-# config.h.in to produce config.h.  The first handles `#define'
+-# templates, and the second `#undef' templates.
+-# And first: Protect against being on the right side of a sed subst in
+-# config.status.  Protect against being in an unquoted here document
+-# in config.status.
+-rm -f conftest.defines conftest.undefs
+-# Using a here document instead of a string reduces the quoting nightmare.
+-# Putting comments in sed scripts is not portable.
+-#
+-# `end' is used to avoid that the second main sed command (meant for
+-# 0-ary CPP macros) applies to n-ary macro definitions.
+-# See the Autoconf documentation for `clear'.
+-cat >confdef2sed.sed <<\_ACEOF
+-s/[\\&,]/\\&/g
+-s,[\\$`],\\&,g
+-t clear
+-: clear
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+-t end
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+-: end
+-_ACEOF
+-# If some macros were called several times there might be several times
+-# the same #defines, which is useless.  Nevertheless, we may not want to
+-# sort them, since we want the *last* AC-DEFINE to be honored.
+-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+-rm -f confdef2sed.sed
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status.  If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless.  But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
++ac_dB='\\)[	 (].*,\\1define\\2'
++ac_dC=' '
++ac_dD=' ,'
+ 
+-# This sed command replaces #undef with comments.  This is necessary, for
++uniq confdefs.h |
++  sed -n '
++	t rset
++	:rset
++	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
++	t ok
++	d
++	:ok
++	s/[\\&,]/\\&/g
++	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
++	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
++  ' >>conftest.defines
++
++# Remove the space that was appended to ease matching.
++# Then replace #undef with comments.  This is necessary, for
+ # example, in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+-cat >>conftest.undefs <<\_ACEOF
+-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+-_ACEOF
++# (The regexp can be short, since the line contains either #define or #undef.)
++echo 's/ $//
++s,^[	 #]*u.*,/* & */,' >>conftest.defines
++
++# Break up conftest.defines:
++ac_max_sed_lines=50
++
++# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
++# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
++# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
++# et cetera.
++ac_in='$ac_file_inputs'
++ac_out='"$tmp/out1"'
++ac_nxt='"$tmp/out2"'
+ 
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo '  :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
++while :
+ do
+-  # Write a limited-size here document to $tmp/defines.sed.
+-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#define' lines.
+-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++  # Write a here document:
++    cat >>$CONFIG_STATUS <<_ACEOF
++    # First, check the format of the line:
++    cat >"\$tmp/defines.sed" <<\\CEOF
++/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
++/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
++b
++:def
++_ACEOF
++  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+   echo 'CEOF
+-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
++  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
++  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
++  grep . conftest.tail >/dev/null || break
+   rm -f conftest.defines
+   mv conftest.tail conftest.defines
+ done
+-rm -f conftest.defines
+-echo '  fi # grep' >>$CONFIG_STATUS
+-echo >>$CONFIG_STATUS
+-
+-# Break up conftest.undefs because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.undefs >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/undefs.sed.
+-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#undef'
+-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+-  echo 'CEOF
+-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+-  rm -f conftest.undefs
+-  mv conftest.tail conftest.undefs
+-done
+-rm -f conftest.undefs
++rm -f conftest.defines conftest.tail
+ 
++echo "ac_result=$ac_in" >>$CONFIG_STATUS
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    echo "/* Generated by configure.  */" >$tmp/config.h
+-  else
+-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+-  fi
+-  cat $tmp/in >>$tmp/config.h
+-  rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
++    echo "/* $configure_input  */" >"$tmp/config.h"
++    cat "$ac_result" >>"$tmp/config.h"
++    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_file" : 'X\(//\)[^/]' \| \
+-	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-      { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+       rm -f $ac_file
+-      mv $tmp/config.h $ac_file
++      mv "$tmp/config.h" $ac_file
+     fi
+   else
+-    cat $tmp/config.h
+-    rm -f $tmp/config.h
++    echo "/* $configure_input  */"
++    cat "$ac_result"
+   fi
++  rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+@@ -36647,135 +39692,39 @@
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+ $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X$ac_file : 'X\(//\)[^/]' \| \
+ 	 X$ac_file : 'X\(//\)$' \| \
+-	 X$ac_file : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+ echo X$ac_file |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_COMMANDS section.
+-#
+-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+-	 X"$ac_dest" : 'X\(//\)$' \| \
+-	 X"$ac_dest" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_dest" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+-  ac_builddir=.
+-
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
+-
+-case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
+-    ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`/stamp-h$_am_stamp_count
++ ;;
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
++  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
++echo "$as_me: executing $ac_file commands" >&6;}
++ ;;
++  esac
+ 
+ 
+-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+-echo "$as_me: executing $ac_dest commands" >&6;}
+-  case $ac_dest in
+-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++  case $ac_file$ac_mode in
++    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+   # Strip MF so we end up with the name of the file.
+   mf=`echo "$mf" | sed -e 's/:.*$//'`
+   # Check whether this is an Automake generated Makefile or not.
+@@ -36785,92 +39734,123 @@
+   # each Makefile.in and add a new line on top of each file to say so.
+   # So let's grep whole file.
+   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+-    dirpart=`(dirname "$mf") 2>/dev/null ||
++    dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
+ 	 X"$mf" : 'X\(//\)$' \| \
+-	 X"$mf" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$mf" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+   else
+     continue
+   fi
+-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+-  # Extract the definition of DEP_FILES from the Makefile without
+-  # running `make'.
+-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+   test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+   # When using ansi2knr, U may be empty or an underscore; expand it
+-  U=`sed -n -e '/^U = / s///p' < "$mf"`
+-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+-  # We invoke sed twice because it is the simplest approach to
+-  # changing $(DEPDIR) to its actual value in the expansion.
+-  for file in `sed -n -e '
+-    /^DEP_FILES = .*\\\\$/ {
+-      s/^DEP_FILES = //
+-      :loop
+-	s/\\\\$//
+-	p
+-	n
+-	/\\\\$/ b loop
+-      p
+-    }
+-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+     # Make sure the directory exists.
+     test -f "$dirpart/$file" && continue
+-    fdir=`(dirname "$file") 2>/dev/null ||
++    fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$file" : 'X\(//\)[^/]' \| \
+ 	 X"$file" : 'X\(//\)$' \| \
+-	 X"$file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    { if $as_mkdir_p; then
+-    mkdir -p $dirpart/$fdir
+-  else
+-    as_dir=$dirpart/$fdir
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++    { as_dir=$dirpart/$fdir
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+-
+     # echo "creating $dirpart/$file"
+     echo '# dummy' > "$dirpart/$file"
+   done
+ done
+  ;;
++
+   esac
+-done
+-_ACEOF
++done # for ac_tag
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ { (exit 0); exit 0; }
+ _ACEOF
 --- configure.in
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kipi-plugins-0.1.2, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kipi-plugins-0.1.3-rc1, "3.5.5") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,37 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +116,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +205,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +246,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +254,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +266,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +287,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +335,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -322,46 +363,58 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+ SUBDIRS =. kipi-plugins da_kipi-plugins de_kipi-plugins es_kipi-plugins et_kipi-plugins it_kipi-plugins nl_kipi-plugins pt_kipi-plugins pt_BR_kipi-plugins ru_kipi-plugins sv_kipi-plugins
+-subdir = doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  doc/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  doc/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/Makefile
++	  $(AUTOMAKE) --foreign  doc/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -380,7 +433,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -392,7 +451,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -400,7 +459,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -421,7 +486,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -432,14 +497,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -448,19 +505,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -470,10 +530,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -496,12 +557,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -515,7 +570,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -530,15 +585,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -548,7 +605,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -568,7 +624,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -590,6 +646,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -624,37 +682,42 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in 
++KDE_DIST=Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  doc/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+ 
+ 
 --- doc/da_kipi-plugins/Makefile.in
 +++ doc/da_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/da_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = da
+ KDE_DOCS = kipi-plugins
+-subdir = doc/da_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/da_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/da_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/da_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/da_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/da_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/da_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/da_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/da_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/da_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/da_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=sendimages.docbook convertimages.docbook galleryexport.docbook recompressimages.docbook effectimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook timeadjust.docbook calendar.docbook borderimages.docbook index.docbook imagesgallery.docbook wallpaper.docbook kameraklient.docbook mpeg_encode_dialog.png jpeglossless.docbook renameimages.docbook printwizard.docbook slideshow.docbook resizeimages.docbook 
++KDE_DIST=sendimages.docbook convertimages.docbook galleryexport.docbook recompressimages.docbook effectimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook timeadjust.docbook calendar.docbook borderimages.docbook index.docbook imagesgallery.docbook wallpaper.docbook kameraklient.docbook mpeg_encode_dialog.png jpeglossless.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook resizeimages.docbook 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) findduplicateimages.docbook galleryexport.docbook convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook recompressimages.docbook kameraklient.docbook index.docbook timeadjust.docbook calendar.docbook acquireimages.docbook filterimages.docbook flickrexport.docbook jpeglossless.docbook printwizard.docbook imagesgallery.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook mpeg_encode_dialog.png resizeimages.docbook wallpaper.docbook mpegencoder.docbook renameimages.docbook 
+@@ -540,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/da_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/da_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/da_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/da_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/da_kipi-plugins/Makefile.in
  
  
 --- doc/de_kipi-plugins/Makefile.in
 +++ doc/de_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/de_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = de
+ KDE_DOCS = kipi-plugins
+-subdir = doc/de_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/de_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/de_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/de_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/de_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/de_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/de_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/de_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/de_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/de_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/de_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook raw_converter_single.png imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook imagegallery_progress.png slideshow.docbook 
++KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook raw_converter_single.png imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png Makefile.am printwizard.docbook imagegallery_progress.png slideshow.docbook 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) imagegallery_collectionselection.png acquire-savetargetpreview.png borderimages.docbook colorimages.docbook slideshow.png convertimages.docbook kameraklient.docbook index.docbook imagegallery_preview.png recompressimages.docbook calendar.docbook acquire-screenshotpreview.png imagegallery_looksettings.png filterimages.docbook flickrexport.docbook jpeglossless.docbook acquireimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook slideshow_dialog.png raw_converter_single.png sendimages_mail.png mpeg_encode_dialog.png resizeimages.docbook imagegallery_albumsettings.png imagegallery_progress.png galleryexport.docbook findduplicateimages.docbook slideshow.docbook flickrexportuploaddialog.png flickrexportsignup.png flickrexportuploading.png sendimages_progress.png timeadjust.docbook printwizard.docbook sendimages.docbook flickrexportauthenticated.png raw_converter_batch.png imagesgallery.docbook flickrexportcontinue.png imagegallery_thumbsettings.png wallpaper.docbook mpegencoder.docbook sendimages_imageselection.png renameimages.docbook 
+@@ -540,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/de_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/de_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/de_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/de_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/de_kipi-plugins/Makefile.in
  
  
 --- doc/es_kipi-plugins/Makefile.in
 +++ doc/es_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/es_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = es
+ KDE_DOCS = kipi-plugins
+-subdir = doc/es_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/es_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/es_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/es_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/es_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/es_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/es_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/es_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/es_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/es_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/es_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook slideshow.docbook imagegallery_progress.png 
++KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png Makefile.am printwizard.docbook slideshow.docbook imagegallery_progress.png 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) imagegallery_collectionselection.png acquire-savetargetpreview.png borderimages.docbook colorimages.docbook slideshow.png convertimages.docbook kameraklient.docbook index.docbook imagegallery_preview.png recompressimages.docbook calendar.docbook acquire-screenshotpreview.png imagegallery_looksettings.png filterimages.docbook flickrexport.docbook jpeglossless.docbook acquireimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook slideshow_dialog.png raw_converter_single.png sendimages_mail.png mpeg_encode_dialog.png resizeimages.docbook imagegallery_albumsettings.png imagegallery_progress.png galleryexport.docbook findduplicateimages.docbook slideshow.docbook flickrexportuploaddialog.png flickrexportsignup.png flickrexportuploading.png sendimages_progress.png timeadjust.docbook printwizard.docbook sendimages.docbook flickrexportauthenticated.png raw_converter_batch.png imagesgallery.docbook flickrexportcontinue.png imagegallery_thumbsettings.png wallpaper.docbook mpegencoder.docbook sendimages_imageselection.png renameimages.docbook 
+@@ -540,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/es_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/es_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/es_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/es_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/es_kipi-plugins/Makefile.in
  
  
 --- doc/et_kipi-plugins/Makefile.in
 +++ doc/et_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/et_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = et
+ KDE_DOCS = kipi-plugins
+-subdir = doc/et_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/et_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/et_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/et_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/et_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/et_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/et_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/et_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/et_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/et_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/et_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=galleryexport.docbook effectimages.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook printwizard.docbook slideshow.docbook 
++KDE_DIST=galleryexport.docbook effectimages.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) findduplicateimages.docbook galleryexport.docbook convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook recompressimages.docbook kameraklient.docbook index.docbook timeadjust.docbook calendar.docbook acquireimages.docbook filterimages.docbook flickrexport.docbook jpeglossless.docbook printwizard.docbook imagesgallery.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook resizeimages.docbook wallpaper.docbook mpegencoder.docbook renameimages.docbook 
+@@ -540,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/et_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/et_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/et_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/et_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/et_kipi-plugins/Makefile.in
  
  
 --- doc/it_kipi-plugins/Makefile.in
 +++ doc/it_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/it_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = it
+ KDE_DOCS = kipi-plugins
+-subdir = doc/it_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/it_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/it_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/it_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/it_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/it_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/it_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/it_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/it_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/it_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/it_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=galleryexport.docbook effectimages.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook printwizard.docbook slideshow.docbook 
++KDE_DIST=galleryexport.docbook effectimages.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) findduplicateimages.docbook galleryexport.docbook convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook recompressimages.docbook kameraklient.docbook index.docbook timeadjust.docbook calendar.docbook acquireimages.docbook filterimages.docbook flickrexport.docbook jpeglossless.docbook printwizard.docbook imagesgallery.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook resizeimages.docbook wallpaper.docbook mpegencoder.docbook renameimages.docbook 
+@@ -540,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/it_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/it_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/it_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/it_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/it_kipi-plugins/Makefile.in
  
  
 --- doc/kipi-plugins/Makefile.in
 +++ doc/kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/kipi-plugins
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -322,30 +347,55 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+-subdir = doc/kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kipi-plugins/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/kipi-plugins/Makefile
-+	  $(AUTOMAKE) --foreign  doc/kipi-plugins/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit doc/kipi-plugins/Makefile.in
+ 	-rm -f *.lo
+@@ -362,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
  
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
  
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -204,6 +204,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -370,7 +373,7 @@
- all: docs-am  all-recursive
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -383,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -401,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +467,7 @@
+ clean-generic:
  
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -379,9 +382,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  doc/Makefile
-+#>- 	  $(AUTOMAKE) --foreign  doc/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -391,9 +394,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/Makefile
-+	  $(AUTOMAKE) --foreign  doc/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -408,9 +411,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -445,6 +488,8 @@
  
- mostlyclean-libtool:
-@@ -712,9 +715,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/Makefile
-+	  $(AUTOMAKE) --foreign  doc/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+ dvi-am:
  
++html: html-am
++
+ info: info-am
  
+ info-am:
+@@ -481,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -494,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook slideshow.docbook imagegallery_progress.png 
++KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook Makefile.am slideshow.docbook imagegallery_progress.png 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) imagegallery_collectionselection.png acquire-savetargetpreview.png borderimages.docbook colorimages.docbook slideshow.png convertimages.docbook kameraklient.docbook index.docbook imagegallery_preview.png recompressimages.docbook calendar.docbook acquire-screenshotpreview.png imagegallery_looksettings.png filterimages.docbook flickrexport.docbook jpeglossless.docbook acquireimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook slideshow_dialog.png raw_converter_single.png sendimages_mail.png mpeg_encode_dialog.png resizeimages.docbook imagegallery_albumsettings.png imagegallery_progress.png galleryexport.docbook findduplicateimages.docbook slideshow.docbook flickrexportuploaddialog.png flickrexportsignup.png README sendimages_progress.png timeadjust.docbook printwizard.docbook imagesgallery.docbook sendimages.docbook flickrexportauthenticated.png flickrexportuploading.png flickrexportcontinue.png raw_converter_batch.png wallpaper.docbook imagegallery_thumbsettings.png mpegencoder.docbook renameimages.docbook sendimages_imageselection.png 
+@@ -541,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kipi-plugins/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  doc/kipi-plugins/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kipi-plugins/Makefile.in
+ 
+ 
 --- doc/nl_kipi-plugins/Makefile.in
 +++ doc/nl_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/nl_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = nl
+ KDE_DOCS = kipi-plugins
+-subdir = doc/nl_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/nl_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/nl_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/nl_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/nl_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/nl_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/nl_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/nl_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/nl_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/nl_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/nl_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=galleryexport.docbook effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook raw_converter_batch.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook gammacalibration.docbook timeadjust.docbook slideshow_dialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook renameimages.docbook sendimages_progress.png printwizard.docbook slideshow.docbook 
++KDE_DIST=galleryexport.docbook effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook raw_converter_batch.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook gammacalibration.docbook timeadjust.docbook slideshow_dialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook renameimages.docbook sendimages_progress.png Makefile.am printwizard.docbook slideshow.docbook 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) convertimages.docbook borderimages.docbook colorimages.docbook recompressimages.docbook kameraklient.docbook index.docbook filterimages.docbook calendar.docbook acquireimages.docbook flickrexport.docbook jpeglossless.docbook raw_converter_single.png rawconverter.docbook cdarchiving.docbook effectimages.docbook slideshow_dialog.png sendimages_mail.png gammacalibration.docbook resizeimages.docbook galleryexport.docbook slideshow.docbook sendimages_imageselection.png findduplicateimages.docbook sendimages_progress.png timeadjust.docbook printwizard.docbook sendimages.docbook diroperations.docbook raw_converter_batch.png imagesgallery.docbook wallpaper.docbook mpegencoder.docbook renameimages.docbook 
+@@ -540,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/nl_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/nl_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/nl_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/nl_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/nl_kipi-plugins/Makefile.in
  
  
 --- doc/pt_BR_kipi-plugins/Makefile.in
 +++ doc/pt_BR_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/pt_BR_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = pt_BR
+ KDE_DOCS = kipi-plugins
+-subdir = doc/pt_BR_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/pt_BR_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/pt_BR_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/pt_BR_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/pt_BR_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/pt_BR_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/pt_BR_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/pt_BR_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/pt_BR_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/pt_BR_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/pt_BR_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook commenteditor.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in gammacalibration.docbook timeadjust.docbook findimages.docbook borderimages.docbook kameraklient.docbook renameimages.docbook printwizard.docbook slideshow.docbook 
++KDE_DIST=effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook commenteditor.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in gammacalibration.docbook timeadjust.docbook findimages.docbook borderimages.docbook kameraklient.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook findimages.docbook recompressimages.docbook kameraklient.docbook index.docbook commenteditor.docbook calendar.docbook timeadjust.docbook filterimages.docbook jpeglossless.docbook printwizard.docbook acquireimages.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook diroperations.docbook imagesgallery.docbook resizeimages.docbook wallpaper.docbook mpegencoder.docbook gammacalibration.docbook renameimages.docbook 
+@@ -540,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/pt_BR_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/pt_BR_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/pt_BR_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/pt_BR_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/pt_BR_kipi-plugins/Makefile.in
  
  
 --- doc/pt_kipi-plugins/Makefile.in
 +++ doc/pt_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/pt_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = pt
+ KDE_DOCS = kipi-plugins
+-subdir = doc/pt_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/pt_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/pt_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/pt_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/pt_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/pt_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/pt_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/pt_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/pt_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/pt_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/pt_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=galleryexport.docbook effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook gammacalibration.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook printwizard.docbook slideshow.docbook 
++KDE_DIST=galleryexport.docbook effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook gammacalibration.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) findduplicateimages.docbook galleryexport.docbook convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook kameraklient.docbook index.docbook recompressimages.docbook calendar.docbook timeadjust.docbook filterimages.docbook flickrexport.docbook jpeglossless.docbook printwizard.docbook acquireimages.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook diroperations.docbook imagesgallery.docbook resizeimages.docbook wallpaper.docbook mpegencoder.docbook gammacalibration.docbook renameimages.docbook 
+@@ -540,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/pt_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/pt_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/pt_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/pt_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/pt_kipi-plugins/Makefile.in
  
  
 --- doc/ru_kipi-plugins/Makefile.in
 +++ doc/ru_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/ru_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = ru
+ KDE_DOCS = kipi-plugins
+-subdir = doc/ru_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/ru_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/ru_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/ru_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/ru_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/ru_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/ru_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/ru_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/ru_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/ru_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -571,9 +574,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/ru_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=calendar.docbook Makefile.in 
++KDE_DIST=calendar.docbook Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am: calendar.docbook 
+@@ -518,10 +564,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/ru_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/ru_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/ru_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/ru_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/ru_kipi-plugins/Makefile.in
  
  
 --- doc/sv_kipi-plugins/Makefile.in
 +++ doc/sv_kipi-plugins/Makefile.in
-@@ -188,6 +188,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,21 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = doc/sv_kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +100,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,7 +354,7 @@
+@@ -213,6 +230,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +238,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +250,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +271,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +319,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,27 +349,53 @@
+ xdg_menudir = @xdg_menudir@
+ KDE_LANG = sv
+ KDE_DOCS = kipi-plugins
+-subdir = doc/sv_kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -360,9 +363,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/sv_kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/sv_kipi-plugins/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  doc/sv_kipi-plugins/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  doc/sv_kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -372,9 +375,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/sv_kipi-plugins/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/sv_kipi-plugins/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/sv_kipi-plugins/Makefile
 +	  $(AUTOMAKE) --foreign  doc/sv_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/sv_kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -389,9 +392,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,9 +596,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/sv_kipi-plugins/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,12 +412,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -382,7 +427,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -400,7 +445,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -423,7 +467,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -444,6 +488,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -480,10 +526,10 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-info-am
+@@ -493,7 +539,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook slideshow.docbook imagegallery_progress.png 
++KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png Makefile.am printwizard.docbook slideshow.docbook imagegallery_progress.png 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) imagegallery_collectionselection.png acquire-savetargetpreview.png borderimages.docbook colorimages.docbook convertimages.docbook kameraklient.docbook index.docbook imagegallery_preview.png recompressimages.docbook calendar.docbook acquire-screenshotpreview.png imagegallery_looksettings.png filterimages.docbook flickrexport.docbook jpeglossless.docbook acquireimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook slideshow_dialog.png raw_converter_single.png sendimages_mail.png mpeg_encode_dialog.png resizeimages.docbook imagegallery_albumsettings.png imagegallery_progress.png galleryexport.docbook findduplicateimages.docbook slideshow.docbook flickrexportuploaddialog.png flickrexportsignup.png flickrexportuploading.png sendimages_progress.png timeadjust.docbook printwizard.docbook sendimages.docbook raw_converter_batch.png imagesgallery.docbook flickrexportcontinue.png wallpaper.docbook imagegallery_thumbsettings.png mpegencoder.docbook renameimages.docbook sendimages_imageselection.png 
+@@ -540,10 +586,19 @@
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/sv_kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/sv_kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/sv_kipi-plugins/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  doc/sv_kipi-plugins/Makefile
  	cd $(top_srcdir) && perl admin/am_edit doc/sv_kipi-plugins/Makefile.in
  
  
+--- kipi-plugins/Makefile.in
++++ kipi-plugins/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,50 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(rcdir)"
++rcDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(rc_DATA)
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = common printwizard calendar mpegencoder cdarchiving \
++	simpleviewerexport sendimages batchprocessimages wallpaper \
++	findimages galleryexport flickrexport jpeglossless timeadjust \
++	gpssync metadataedit slideshow kameraklient acquireimages \
++	rawconverter htmlexport ipodexport
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +130,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +219,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +260,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +268,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +280,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +301,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +349,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -326,66 +381,66 @@
+ # Do *NOT* indent the content of the ifs, this will break the generated
+ # Makefile
+ @compile_SLIDESHOW_TRUE at SLIDESHOWDIR = slideshow
+-
+ @compile_KAMERAKLIENT_TRUE at KAMERAKLIENTDIR = kameraklient
+-
+ @compile_HTMLEXPORT_TRUE at HTMLEXPORTDIR = htmlexport
+-
+ @compile_ACQUIREIMAGES_TRUE at ACQUIREIMAGESDIR = acquireimages
+-
+ @compile_RAWCONVERTER_TRUE at RAWCONVERTERDIR = rawconverter
+-
+ @compile_IPODEXPORT_TRUE at IPODEXPORTDIR = ipodexport
+-
+ SUBDIRS = common printwizard calendar mpegencoder cdarchiving simpleviewerexport \
+ 	      sendimages batchprocessimages wallpaper findimages galleryexport flickrexport \
+ 	      jpeglossless timeadjust gpssync metadataedit \
+ 	      $(SLIDESHOWDIR) $(KAMERAKLIENTDIR) $(ACQUIREIMAGESDIR) $(RAWCONVERTERDIR) \
+ 	      $(HTMLEXPORTDIR) $(IPODEXPORTDIR) 
+ 
+-
+ rcdir = $(kde_datadir)/kipi
+ rc_DATA = tips
+-subdir = kipi-plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(rc_DATA)
+-
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = common printwizard calendar mpegencoder cdarchiving \
+-	simpleviewerexport sendimages batchprocessimages wallpaper \
+-	findimages galleryexport flickrexport jpeglossless timeadjust \
+-	gpssync metadataedit slideshow kameraklient acquireimages \
+-	rawconverter htmlexport ipodexport
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -396,23 +451,22 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-rcDATA_INSTALL = $(INSTALL_DATA)
+ install-rcDATA: $(rc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
++	test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+ 	@list='$(rc_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f"; \
+-	  $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
++	  $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
+ 	done
+ 
+ uninstall-rcDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(rc_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(rcdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(rcdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(rcdir)/$$f"; \
+ 	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -422,7 +476,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,7 +494,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -442,7 +502,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -463,7 +529,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -474,14 +540,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -490,19 +548,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -512,10 +573,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -538,12 +600,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -557,7 +613,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -574,13 +630,15 @@
+ 	done
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -590,8 +648,9 @@
+ all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
+-
++	for dir in "$(DESTDIR)$(rcdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -611,7 +670,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -633,6 +692,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -667,22 +728,19 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-rcDATA install-recursive install-strip installcheck \
+-	installcheck-am installdirs installdirs-am \
+-	installdirs-recursive maintainer-clean maintainer-clean-generic \
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-rcDATA install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-rcDATA uninstall-recursive
++	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am uninstall-info-am \
++	uninstall-rcDATA
+ 
+ 
+ # i18n translation tips messages
+@@ -698,15 +756,24 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=configure.in.bot configure.in.in Makefile.in kipiplugins.kdevelop tips 
++KDE_DIST=configure.in.bot configure.in.in Makefile.in kipiplugins.kdevelop tips Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/Makefile.in
+ 
+ 
 --- kipi-plugins/acquireimages/Makefile.in
 +++ kipi-plugins/acquireimages/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,67 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/acquireimages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_acquireimages_la_OBJECTS = plugin_acquireimages.lo \
++	acquireimagedialog.lo screenshotdialog.lo
++#>- kipiplugin_acquireimages_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_acquireimages_la_OBJECTS)
++#>+ 5
++kipiplugin_acquireimages_la_final_OBJECTS = kipiplugin_acquireimages_la.all_cpp.lo 
++kipiplugin_acquireimages_la_nofinal_OBJECTS = plugin_acquireimages.lo \
++	acquireimagedialog.lo screenshotdialog.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_acquireimages_la_OBJECTS = $(kipiplugin_acquireimages_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_acquireimages_la_OBJECTS = $(kipiplugin_acquireimages_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_acquireimages_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_acquireimages_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +148,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -213,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +286,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +298,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +319,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +367,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -339,101 +412,78 @@
  
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_acquireimages.desktop
+-subdir = kipi-plugins/acquireimages
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_acquireimages_la_OBJECTS = plugin_acquireimages.lo \
+-	acquireimagedialog.lo screenshotdialog.lo
+-#>- kipiplugin_acquireimages_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_acquireimages_la_OBJECTS)
+-#>+ 5
+-kipiplugin_acquireimages_la_final_OBJECTS = kipiplugin_acquireimages_la.all_cpp.lo 
+-kipiplugin_acquireimages_la_nofinal_OBJECTS = plugin_acquireimages.lo \
+-	acquireimagedialog.lo screenshotdialog.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_acquireimages_la_OBJECTS = $(kipiplugin_acquireimages_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_acquireimages_la_OBJECTS = $(kipiplugin_acquireimages_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/acquireimagedialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_acquireimages.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/screenshotdialog.Plo
+-#>+ 6
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_acquireimages_la.all_cpp.P ./$(DEPDIR)/acquireimagedialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_acquireimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/screenshotdialog.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/acquireimagedialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_acquireimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/screenshotdialog.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_acquireimages_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_acquireimages_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -424,9 +427,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/acquireimages/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/acquireimages/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/acquireimages/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/acquireimages/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -436,9 +439,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/acquireimages/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/acquireimages/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/acquireimages/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/acquireimages/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/acquireimages/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -453,9 +456,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -793,9 +796,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/acquireimages/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -444,7 +494,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_acquireimages_la_LDFLAGS) $(kipiplugin_acquireimages_la_OBJECTS) $(kipiplugin_acquireimages_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -454,37 +504,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/screenshotdialog.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -495,33 +533,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -530,6 +559,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -541,10 +571,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -567,12 +598,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -586,7 +611,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -604,9 +629,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -626,7 +652,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -651,13 +677,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -693,8 +723,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -747,7 +777,7 @@
+ 	-rm -f  screenshotdialog.moc acquireimagedialog.moc plugin_acquireimages.moc
+ 
+ #>+ 2
+-KDE_DIST=acquireimagedialog.h screenshotdialog.h kipiplugin_acquireimages.desktop Makefile.in plugin_acquireimages.h 
++KDE_DIST=acquireimagedialog.h screenshotdialog.h kipiplugin_acquireimages.desktop Makefile.in Makefile.am plugin_acquireimages.h 
+ 
+ #>+ 3
+ clean-closures:
+@@ -756,10 +786,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/acquireimages/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/acquireimages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/acquireimages/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/acquireimages/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/acquireimages/Makefile.in
  
  
+--- kipi-plugins/batchprocessimages/Makefile.in
++++ kipi-plugins/batchprocessimages/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,100 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/batchprocessimages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_batchprocessimages_la_OBJECTS =  \
++	plugin_batchprocessimages.lo batchprocessimagesitem.lo \
++	outputdialog.lo imagepreview.lo renameimagesdialog.lo \
++	borderimagesdialog.lo borderoptionsdialog.lo \
++	convertimagesdialog.lo convertoptionsdialog.lo \
++	filterimagesdialog.lo filteroptionsdialog.lo \
++	colorimagesdialog.lo coloroptionsdialog.lo \
++	effectimagesdialog.lo effectoptionsdialog.lo \
++	recompressimagesdialog.lo recompressoptionsdialog.lo \
++	resizeimagesdialog.lo resizeoptionsdialog.lo \
++	batchprocessimagesdialog.lo batchprocessimageslist.lo \
++	renameimageswidget.lo
++#>- kipiplugin_batchprocessimages_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_batchprocessimages_la_OBJECTS)
++#>+ 14
++kipiplugin_batchprocessimages_la_final_OBJECTS = kipiplugin_batchprocessimages_la.all_cpp.lo 
++kipiplugin_batchprocessimages_la_nofinal_OBJECTS = plugin_batchprocessimages.lo batchprocessimagesitem.lo \
++	outputdialog.lo imagepreview.lo renameimagesdialog.lo \
++	borderimagesdialog.lo borderoptionsdialog.lo \
++	convertimagesdialog.lo convertoptionsdialog.lo \
++	filterimagesdialog.lo filteroptionsdialog.lo \
++	colorimagesdialog.lo coloroptionsdialog.lo \
++	effectimagesdialog.lo effectoptionsdialog.lo \
++	recompressimagesdialog.lo recompressoptionsdialog.lo \
++	resizeimagesdialog.lo resizeoptionsdialog.lo \
++	batchprocessimagesdialog.lo batchprocessimageslist.lo \
++	renameimageswidget.lo renameimagesbase.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_batchprocessimages_la_OBJECTS = $(kipiplugin_batchprocessimages_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_batchprocessimages_la_OBJECTS = $(kipiplugin_batchprocessimages_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_batchprocessimages_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_batchprocessimages_la_SOURCES)
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +181,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +270,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +311,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +319,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +331,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +352,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +400,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,7 +429,6 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
+ SUBDIRS = data
+ 
+@@ -366,193 +471,80 @@
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_batchprocessimages.desktop
+-
+ kipibatchprocessimagesicondir = $(kde_datadir)/kipiplugin_batchprocessimages/icons
+ kipibatchprocessimagesicon_ICON = AUTO
+-subdir = kipi-plugins/batchprocessimages
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_batchprocessimages_la_OBJECTS = \
+-	plugin_batchprocessimages.lo batchprocessimagesitem.lo \
+-	outputdialog.lo imagepreview.lo renameimagesdialog.lo \
+-	borderimagesdialog.lo borderoptionsdialog.lo \
+-	convertimagesdialog.lo convertoptionsdialog.lo \
+-	filterimagesdialog.lo filteroptionsdialog.lo \
+-	colorimagesdialog.lo coloroptionsdialog.lo \
+-	effectimagesdialog.lo effectoptionsdialog.lo \
+-	recompressimagesdialog.lo recompressoptionsdialog.lo \
+-	resizeimagesdialog.lo resizeoptionsdialog.lo \
+-	batchprocessimagesdialog.lo batchprocessimageslist.lo \
+-	renameimageswidget.lo
+-#>- kipiplugin_batchprocessimages_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_batchprocessimages_la_OBJECTS)
+-#>+ 14
+-kipiplugin_batchprocessimages_la_final_OBJECTS = kipiplugin_batchprocessimages_la.all_cpp.lo 
+-kipiplugin_batchprocessimages_la_nofinal_OBJECTS = plugin_batchprocessimages.lo batchprocessimagesitem.lo \
+-	outputdialog.lo imagepreview.lo renameimagesdialog.lo \
+-	borderimagesdialog.lo borderoptionsdialog.lo \
+-	convertimagesdialog.lo convertoptionsdialog.lo \
+-	filterimagesdialog.lo filteroptionsdialog.lo \
+-	colorimagesdialog.lo coloroptionsdialog.lo \
+-	effectimagesdialog.lo effectoptionsdialog.lo \
+-	recompressimagesdialog.lo recompressoptionsdialog.lo \
+-	resizeimagesdialog.lo resizeoptionsdialog.lo \
+-	batchprocessimagesdialog.lo batchprocessimageslist.lo \
+-	renameimageswidget.lo renameimagesbase.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_batchprocessimages_la_OBJECTS = $(kipiplugin_batchprocessimages_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_batchprocessimages_la_OBJECTS = $(kipiplugin_batchprocessimages_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/batchprocessimagesdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/batchprocessimagesitem.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/batchprocessimageslist.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/borderimagesdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/borderoptionsdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/colorimagesdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/coloroptionsdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/convertimagesdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/convertoptionsdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/effectimagesdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/effectoptionsdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/filterimagesdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/filteroptionsdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/imagepreview.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/outputdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_batchprocessimages.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/recompressimagesdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/recompressoptionsdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/renameimagesdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/renameimageswidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/resizeimagesdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/resizeoptionsdialog.Plo
+-#>+ 44
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/renameimagesbase.P  $(DEPDIR)/kipiplugin_batchprocessimages_la.all_cpp.P ./$(DEPDIR)/batchprocessimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/batchprocessimagesitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/batchprocessimageslist.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/borderimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/borderoptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/colorimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/coloroptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/convertimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/convertoptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/effectimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/effectoptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/filterimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/filteroptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/imagepreview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/outputdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_batchprocessimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/recompressimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/recompressoptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/renameimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/renameimageswidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/resizeimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/resizeoptionsdialog.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/renameimagesbase.P ./$(DEPDIR)/batchprocessimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/batchprocessimagesitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/batchprocessimageslist.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/borderimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/borderoptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/colorimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/coloroptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/convertimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/convertoptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/effectimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/effectoptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/filterimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/filteroptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/imagepreview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/outputdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_batchprocessimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/recompressimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/recompressoptionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/renameimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/renameimageswidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/resizeimagesdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/resizeoptionsdialog.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_batchprocessimages_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+-SOURCES = $(kipiplugin_batchprocessimages_la_SOURCES)
+-
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -563,7 +555,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_batchprocessimages_la_LDFLAGS) $(kipiplugin_batchprocessimages_la_OBJECTS) $(kipiplugin_batchprocessimages_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -592,37 +584,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/resizeoptionsdialog.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -633,23 +613,22 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -659,7 +638,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -671,7 +656,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -679,7 +664,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -700,7 +691,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -711,14 +702,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -727,19 +710,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -749,10 +735,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -775,12 +762,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -794,7 +775,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -809,15 +790,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -827,8 +810,9 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
+-
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -848,7 +832,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -873,13 +857,17 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am: install-kde-icons   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am: install-kde-icons   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -917,25 +905,22 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	clean-recursive ctags ctags-recursive distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive \
+-	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+-	install-man install-recursive install-strip installcheck \
+-	installcheck-am installdirs installdirs-am \
+-	installdirs-recursive maintainer-clean maintainer-clean-generic \
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-kde_moduleLTLIBRARIES \
++	install-kde_servicesDATA install-man install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
+-	tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kde_servicesDATA uninstall-recursive
++	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++	uninstall-kde_servicesDATA
+ 
+ 
+ # i18n translation messages
+@@ -1106,7 +1091,7 @@
+ 	-rm -f  plugin_batchprocessimages.moc borderoptionsdialog.moc borderimagesdialog.moc colorimagesdialog.moc renameimagesdialog.moc outputdialog.moc coloroptionsdialog.moc convertimagesdialog.moc convertoptionsdialog.moc effectimagesdialog.moc filterimagesdialog.moc imagepreview.moc filteroptionsdialog.moc effectoptionsdialog.moc renameimageswidget.moc resizeimagesdialog.moc batchprocessimageslist.moc recompressoptionsdialog.moc recompressimagesdialog.moc resizeoptionsdialog.moc batchprocessimagesdialog.moc
+ 
+ #>+ 2
+-KDE_DIST=hi32-action-recompressimages.png effectoptionsdialog.h resizeoptionsdialog.h filteroptionsdialog.h recompressoptionsdialog.h batchprocessimagesitem.h hi32-action-renameimages.png renameimageswidget.h recompressimagesdialog.h colorimagesdialog.h hi32-action-effectimages.png filterimagesdialog.h convertimagesdialog.h outputdialog.h batchprocessimagesdialog.h hi32-action-colorimages.png batchprocessimageslist.h hi32-action-borderimages.png Makefile.in plugin_batchprocessimages.h hi32-action-convertimages.png borderimagesdialog.h kipiplugin_batchprocessimages.desktop convertoptionsdialog.h hi32-action-resizeimages.png effectimagesdialog.h renameimagesdialog.h imagepreview.h coloroptionsdialog.h hi32-action-filterimages.png renameimagesbase.ui borderoptionsdialog.h resizeimagesdialog.h 
++KDE_DIST=hi32-action-recompressimages.png effectoptionsdialog.h resizeoptionsdialog.h filteroptionsdialog.h recompressoptionsdialog.h batchprocessimagesitem.h hi32-action-renameimages.png renameimageswidget.h recompressimagesdialog.h colorimagesdialog.h hi32-action-effectimages.png filterimagesdialog.h convertimagesdialog.h outputdialog.h batchprocessimagesdialog.h hi32-action-colorimages.png batchprocessimageslist.h hi32-action-borderimages.png Makefile.in plugin_batchprocessimages.h hi32-action-convertimages.png borderimagesdialog.h kipiplugin_batchprocessimages.desktop convertoptionsdialog.h hi32-action-resizeimages.png effectimagesdialog.h renameimagesdialog.h imagepreview.h coloroptionsdialog.h hi32-action-filterimages.png renameimagesbase.ui Makefile.am borderoptionsdialog.h resizeimagesdialog.h 
+ 
+ #>+ 4
+ clean-ui:
+@@ -1142,10 +1127,19 @@
+ 	-rm -f $(DESTDIR)$(kipibatchprocessimagesicondir)/hicolor/32x32/actions/recompressimages.png
+ 	-rm -f $(DESTDIR)$(kipibatchprocessimagesicondir)/hicolor/32x32/actions/filterimages.png
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/Makefile.in
+ 
+ 
 --- kipi-plugins/batchprocessimages/data/Makefile.in
 +++ kipi-plugins/batchprocessimages/data/Makefile.in
-@@ -198,6 +198,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,30 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/batchprocessimages/data
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kipibatchprocessimagespicdir)"
++kipibatchprocessimagespicDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kipibatchprocessimagespic_DATA)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +110,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +199,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -361,7 +364,7 @@
+@@ -213,6 +240,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +248,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +260,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +281,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +329,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,29 +359,53 @@
+ xdg_menudir = @xdg_menudir@
+ kipibatchprocessimagespicdir = $(kde_datadir)/kipiplugin_batchprocessimages/data
+ kipibatchprocessimagespic_DATA = handcursor.png
+-subdir = kipi-plugins/batchprocessimages/data
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(kipibatchprocessimagespic_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -370,9 +373,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/data/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/data/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/data/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/data/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -382,9 +385,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/data/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/data/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/data/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/data/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/data/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -399,9 +402,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -578,9 +581,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/data/Makefile'; \
+ 	-rm -f *.lo
+@@ -357,23 +416,22 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kipibatchprocessimagespicDATA_INSTALL = $(INSTALL_DATA)
+ install-kipibatchprocessimagespicDATA: $(kipibatchprocessimagespic_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kipibatchprocessimagespicdir)
++	test -z "$(kipibatchprocessimagespicdir)" || $(mkdir_p) "$(DESTDIR)$(kipibatchprocessimagespicdir)"
+ 	@list='$(kipibatchprocessimagespic_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kipibatchprocessimagespicDATA_INSTALL) $$d$$p $(DESTDIR)$(kipibatchprocessimagespicdir)/$$f"; \
+-	  $(kipibatchprocessimagespicDATA_INSTALL) $$d$$p $(DESTDIR)$(kipibatchprocessimagespicdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kipibatchprocessimagespicDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipibatchprocessimagespicdir)/$$f'"; \
++	  $(kipibatchprocessimagespicDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipibatchprocessimagespicdir)/$$f"; \
+ 	done
+ 
+ uninstall-kipibatchprocessimagespicDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kipibatchprocessimagespic_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kipibatchprocessimagespicdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kipibatchprocessimagespicdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kipibatchprocessimagespicdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kipibatchprocessimagespicdir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -381,12 +439,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -400,7 +452,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -418,9 +470,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kipibatchprocessimagespicdir)
++	for dir in "$(DESTDIR)$(kipibatchprocessimagespicdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -440,7 +493,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -461,6 +514,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -491,17 +546,19 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kipibatchprocessimagespicDATA
++uninstall-am: uninstall-info-am \
++	uninstall-kipibatchprocessimagespicDATA
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-kipibatchprocessimagespicDATA \
+-	install-man install-strip installcheck installcheck-am \
+-	installdirs maintainer-clean maintainer-clean-generic \
+-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+-	ps ps-am uninstall uninstall-am uninstall-info-am \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am \
++	install-kipibatchprocessimagespicDATA install-man \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-info-am \
+ 	uninstall-kipibatchprocessimagespicDATA
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+@@ -509,15 +566,24 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=handcursor.png Makefile.in 
++KDE_DIST=handcursor.png Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/data/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/data/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/data/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/data/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/data/Makefile.in
  
  
---- kipi-plugins/batchprocessimages/Makefile.in
-+++ kipi-plugins/batchprocessimages/Makefile.in
-@@ -269,6 +269,9 @@
+--- kipi-plugins/calendar/Makefile.in
++++ kipi-plugins/calendar/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,68 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/calendar
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_calendar_la_OBJECTS = plugin_calendar.lo calwizard.lo \
++	caltemplate.lo calsettings.lo calwidget.lo calpainter.lo \
++	calselect.lo monthwidget.lo
++#>- kipiplugin_calendar_la_OBJECTS = $(am_kipiplugin_calendar_la_OBJECTS)
++#>+ 6
++kipiplugin_calendar_la_final_OBJECTS = kipiplugin_calendar_la.all_cpp.lo 
++kipiplugin_calendar_la_nofinal_OBJECTS = plugin_calendar.lo calwizard.lo \
++	caltemplate.lo calsettings.lo calwidget.lo calpainter.lo \
++	calselect.lo monthwidget.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_calendar_la_OBJECTS = $(kipiplugin_calendar_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_calendar_la_OBJECTS = $(kipiplugin_calendar_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_calendar_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_calendar_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +149,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +238,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -476,7 +479,7 @@
+@@ -213,6 +279,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +287,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +299,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +320,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +368,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,7 +397,6 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+@@ -334,120 +407,81 @@
+ 		calwidget.cpp calpainter.cpp calselect.cpp \
+ 		monthwidget.cpp
+ 
+-
+ kipiplugin_calendar_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+-
+ kipiplugin_calendar_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+-
+ kde_services_DATA = kipiplugin_calendar.desktop
+-subdir = kipi-plugins/calendar
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_calendar_la_OBJECTS = plugin_calendar.lo calwizard.lo \
+-	caltemplate.lo calsettings.lo calwidget.lo calpainter.lo \
+-	calselect.lo monthwidget.lo
+-#>- kipiplugin_calendar_la_OBJECTS = $(am_kipiplugin_calendar_la_OBJECTS)
+-#>+ 6
+-kipiplugin_calendar_la_final_OBJECTS = kipiplugin_calendar_la.all_cpp.lo 
+-kipiplugin_calendar_la_nofinal_OBJECTS = plugin_calendar.lo calwizard.lo \
+-	caltemplate.lo calsettings.lo calwidget.lo calpainter.lo \
+-	calselect.lo monthwidget.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_calendar_la_OBJECTS = $(kipiplugin_calendar_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_calendar_la_OBJECTS = $(kipiplugin_calendar_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/calpainter.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/calselect.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/calsettings.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/caltemplate.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/calwidget.Plo ./$(DEPDIR)/calwizard.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/monthwidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_calendar.Plo
+-#>+ 14
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_calendar_la.all_cpp.P ./$(DEPDIR)/calpainter.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/calselect.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/calsettings.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/caltemplate.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/calwidget.Plo ./$(DEPDIR)/calwizard.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/monthwidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_calendar.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/calpainter.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/calselect.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/calsettings.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/caltemplate.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/calwidget.Plo ./$(DEPDIR)/calwizard.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/monthwidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_calendar.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_calendar_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_calendar_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -485,9 +488,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/Makefile'; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile'; \
  #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/Makefile
-+#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -497,9 +500,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile'; \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/calendar/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile'; \
  	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/Makefile
-+	  $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -514,9 +517,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-	  $(AUTOMAKE) --gnu  kipi-plugins/calendar/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/calendar/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1141,9 +1144,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/batchprocessimages/Makefile
-+	  $(AUTOMAKE) --foreign  kipi-plugins/batchprocessimages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/Makefile.in
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
  
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
  
---- kipi-plugins/calendar/Makefile.in
-+++ kipi-plugins/calendar/Makefile.in
-@@ -237,6 +237,9 @@
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -458,7 +492,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_calendar_la_LDFLAGS) $(kipiplugin_calendar_la_OBJECTS) $(kipiplugin_calendar_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -473,37 +507,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_calendar.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -514,33 +536,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -549,6 +562,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -560,10 +574,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -586,12 +601,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -605,7 +614,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -623,9 +632,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -645,7 +655,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -670,13 +680,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -712,8 +726,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -786,7 +800,7 @@
+ 	-rm -f  calwizard.moc calselect.moc plugin_calendar.moc calpainter.moc monthwidget.moc caltemplate.moc
+ 
+ #>+ 2
+-KDE_DIST=monthwidget.h calwidget.h kipiplugin_calendar.desktop calpainter.h calprint.h calwizard.h Makefile.in plugin_calendar.h calsettings.h calselect.h caltemplate.h 
++KDE_DIST=monthwidget.h calwidget.h kipiplugin_calendar.desktop calpainter.h calprint.h calwizard.h Makefile.in plugin_calendar.h calsettings.h calselect.h Makefile.am caltemplate.h 
+ 
+ #>+ 3
+ clean-closures:
+@@ -795,10 +809,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/calendar/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/calendar/Makefile.in
+ 
+ 
+--- kipi-plugins/cdarchiving/Makefile.in
++++ kipi-plugins/cdarchiving/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,86 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/cdarchiving
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)" \
++	"$(DESTDIR)$(kipiHTML401picdir)" \
++	"$(DESTDIR)$(kipiimagebrokenpicdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_cdarchiving_la_OBJECTS = plugin_cdarchiving.lo \
++	cdarchivingdialog.lo cdarchiving.lo
++#>- kipiplugin_cdarchiving_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_cdarchiving_la_OBJECTS)
++#>+ 5
++kipiplugin_cdarchiving_la_final_OBJECTS = kipiplugin_cdarchiving_la.all_cpp.lo 
++kipiplugin_cdarchiving_la_nofinal_OBJECTS = plugin_cdarchiving.lo \
++	cdarchivingdialog.lo cdarchiving.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_cdarchiving_la_OBJECTS = $(kipiplugin_cdarchiving_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_cdarchiving_la_OBJECTS = $(kipiplugin_cdarchiving_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_cdarchiving_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_cdarchiving_la_SOURCES)
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++kipiHTML401picDATA_INSTALL = $(INSTALL_DATA)
++kipiimagebrokenpicDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA) $(kipiHTML401pic_DATA) \
++	$(kipiimagebrokenpic_DATA)
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +167,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +256,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -213,6 +297,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +305,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +317,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +338,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +386,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,7 +415,6 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
+ SUBDIRS = autorun
  
+@@ -342,121 +433,82 @@
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_cdarchiving.desktop
+-
+ kipiimagebrokenpicdir = $(kde_datadir)/kipi/data
+ kipiimagebrokenpic_DATA = image_broken.png
+-
+ kipiHTML401picdir = $(kde_datadir)/kipi
+ kipiHTML401pic_DATA = valid-html401.png gohome.png up.png
+-subdir = kipi-plugins/cdarchiving
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_cdarchiving_la_OBJECTS = plugin_cdarchiving.lo \
+-	cdarchivingdialog.lo cdarchiving.lo
+-#>- kipiplugin_cdarchiving_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_cdarchiving_la_OBJECTS)
+-#>+ 5
+-kipiplugin_cdarchiving_la_final_OBJECTS = kipiplugin_cdarchiving_la.all_cpp.lo 
+-kipiplugin_cdarchiving_la_nofinal_OBJECTS = plugin_cdarchiving.lo \
+-	cdarchivingdialog.lo cdarchiving.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_cdarchiving_la_OBJECTS = $(kipiplugin_cdarchiving_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_cdarchiving_la_OBJECTS = $(kipiplugin_cdarchiving_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/cdarchiving.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/cdarchivingdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_cdarchiving.Plo
+-#>+ 6
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_cdarchiving_la.all_cpp.P ./$(DEPDIR)/cdarchiving.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cdarchivingdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_cdarchiving.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/cdarchiving.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cdarchivingdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_cdarchiving.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_cdarchiving_la_SOURCES)
+-DATA = $(kde_services_DATA) $(kipiHTML401pic_DATA) \
+-	$(kipiimagebrokenpic_DATA)
+-
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+-SOURCES = $(kipiplugin_cdarchiving_la_SOURCES)
+-
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -422,9 +425,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/calendar/Makefile'; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile'; \
  #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/calendar/Makefile
-+#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -434,9 +437,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/calendar/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile'; \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile'; \
  	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/calendar/Makefile
-+	  $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/calendar/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -451,9 +454,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -816,9 +819,9 @@
- 	      exit 1;; \
- 	  esac; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -467,7 +519,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_cdarchiving_la_LDFLAGS) $(kipiplugin_cdarchiving_la_OBJECTS) $(kipiplugin_cdarchiving_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -477,37 +529,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_cdarchiving.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -518,59 +558,56 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+-kipiHTML401picDATA_INSTALL = $(INSTALL_DATA)
+ install-kipiHTML401picDATA: $(kipiHTML401pic_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kipiHTML401picdir)
++	test -z "$(kipiHTML401picdir)" || $(mkdir_p) "$(DESTDIR)$(kipiHTML401picdir)"
+ 	@list='$(kipiHTML401pic_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kipiHTML401picDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiHTML401picdir)/$$f"; \
+-	  $(kipiHTML401picDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiHTML401picdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kipiHTML401picDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiHTML401picdir)/$$f'"; \
++	  $(kipiHTML401picDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiHTML401picdir)/$$f"; \
+ 	done
+ 
+ uninstall-kipiHTML401picDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kipiHTML401pic_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kipiHTML401picdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kipiHTML401picdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kipiHTML401picdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kipiHTML401picdir)/$$f"; \
+ 	done
+-kipiimagebrokenpicDATA_INSTALL = $(INSTALL_DATA)
+ install-kipiimagebrokenpicDATA: $(kipiimagebrokenpic_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kipiimagebrokenpicdir)
++	test -z "$(kipiimagebrokenpicdir)" || $(mkdir_p) "$(DESTDIR)$(kipiimagebrokenpicdir)"
+ 	@list='$(kipiimagebrokenpic_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kipiimagebrokenpicDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiimagebrokenpicdir)/$$f"; \
+-	  $(kipiimagebrokenpicDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiimagebrokenpicdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kipiimagebrokenpicDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiimagebrokenpicdir)/$$f'"; \
++	  $(kipiimagebrokenpicDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiimagebrokenpicdir)/$$f"; \
+ 	done
+ 
+ uninstall-kipiimagebrokenpicDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kipiimagebrokenpic_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kipiimagebrokenpicdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kipiimagebrokenpicdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kipiimagebrokenpicdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kipiimagebrokenpicdir)/$$f"; \
+ 	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -580,7 +617,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -592,7 +635,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/calendar/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/calendar/Makefile
-+	  $(AUTOMAKE) --foreign  kipi-plugins/calendar/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/calendar/Makefile.in
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -600,7 +643,13 @@
  
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -621,7 +670,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -632,14 +681,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
  
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -648,19 +689,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -670,10 +714,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -696,12 +741,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -715,7 +754,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -730,15 +769,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -748,8 +789,9 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir) $(DESTDIR)$(kipiHTML401picdir) $(DESTDIR)$(kipiimagebrokenpicdir)
+-
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kipiHTML401picdir)" "$(DESTDIR)$(kipiimagebrokenpicdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -769,7 +811,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -794,15 +836,19 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+-#>- 	install-kipiHTML401picDATA install-kipiimagebrokenpicDATA
+-#>+ 2
+-install-data-am:   install-kde_servicesDATA \
+-	install-kipiHTML401picDATA install-kipiimagebrokenpicDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA install-kipiHTML401picDATA \
++#>- 	install-kipiimagebrokenpicDATA
++#>+ 3
++install-data-am:   \
++	install-kde_servicesDATA install-kipiHTML401picDATA \
++	install-kipiimagebrokenpicDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -838,27 +884,24 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	clean-recursive ctags ctags-recursive distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive \
+-	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+-	install-kipiHTML401picDATA install-kipiimagebrokenpicDATA \
+-	install-man install-recursive install-strip installcheck \
+-	installcheck-am installdirs installdirs-am \
+-	installdirs-recursive maintainer-clean maintainer-clean-generic \
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-kde_moduleLTLIBRARIES \
++	install-kde_servicesDATA install-kipiHTML401picDATA \
++	install-kipiimagebrokenpicDATA install-man install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
+-	tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \
++	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+ 	uninstall-kde_servicesDATA uninstall-kipiHTML401picDATA \
+-	uninstall-kipiimagebrokenpicDATA uninstall-recursive
++	uninstall-kipiimagebrokenpicDATA
+ 
+ 
+ # i18n translation messages
+@@ -903,7 +946,7 @@
+ 	-rm -f  cdarchivingdialog.moc plugin_cdarchiving.moc cdarchiving.moc
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_cdarchiving.desktop cdarchiving.h up.png Makefile.in cdarchivingdialog.h image_broken.png gohome.png valid-html401.png plugin_cdarchiving.h actions.h 
++KDE_DIST=kipiplugin_cdarchiving.desktop cdarchiving.h up.png Makefile.in cdarchivingdialog.h image_broken.png gohome.png valid-html401.png plugin_cdarchiving.h actions.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -912,10 +955,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/Makefile.in
+ 
+ 
 --- kipi-plugins/cdarchiving/autorun/Makefile.in
 +++ kipi-plugins/cdarchiving/autorun/Makefile.in
-@@ -200,6 +200,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,32 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/cdarchiving/autorun
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kipiautorundir)" \
++	"$(DESTDIR)$(kipidatadir)"
++kipiautorunDATA_INSTALL = $(INSTALL_DATA)
++kipidataDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kipiautorun_DATA) $(kipidata_DATA)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +112,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +201,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -365,7 +368,7 @@
+@@ -213,6 +242,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +250,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +262,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +283,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +331,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,32 +361,55 @@
+ xdg_menudir = @xdg_menudir@
+ kipidatadir = $(kde_datadir)/kipi/data
+ kipidata_DATA = index.htm
+-
+ kipiautorundir = $(kde_datadir)/kipi/data/autorun
+ kipiautorun_DATA = cdalbums.ico ShellExecute.bat
+-subdir = kipi-plugins/cdarchiving/autorun
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(kipiautorun_DATA) $(kipidata_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -374,9 +377,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/autorun/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/autorun/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/autorun/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/autorun/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -386,9 +389,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/autorun/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/autorun/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/autorun/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/autorun/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/autorun/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -403,9 +406,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -599,9 +602,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/autorun/Makefile'; \
+ 	-rm -f *.lo
+@@ -360,41 +420,39 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kipiautorunDATA_INSTALL = $(INSTALL_DATA)
+ install-kipiautorunDATA: $(kipiautorun_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kipiautorundir)
++	test -z "$(kipiautorundir)" || $(mkdir_p) "$(DESTDIR)$(kipiautorundir)"
+ 	@list='$(kipiautorun_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kipiautorunDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiautorundir)/$$f"; \
+-	  $(kipiautorunDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiautorundir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kipiautorunDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiautorundir)/$$f'"; \
++	  $(kipiautorunDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiautorundir)/$$f"; \
+ 	done
+ 
+ uninstall-kipiautorunDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kipiautorun_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kipiautorundir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kipiautorundir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kipiautorundir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kipiautorundir)/$$f"; \
+ 	done
+-kipidataDATA_INSTALL = $(INSTALL_DATA)
+ install-kipidataDATA: $(kipidata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kipidatadir)
++	test -z "$(kipidatadir)" || $(mkdir_p) "$(DESTDIR)$(kipidatadir)"
+ 	@list='$(kipidata_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kipidataDATA_INSTALL) $$d$$p $(DESTDIR)$(kipidatadir)/$$f"; \
+-	  $(kipidataDATA_INSTALL) $$d$$p $(DESTDIR)$(kipidatadir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kipidataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipidatadir)/$$f'"; \
++	  $(kipidataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipidatadir)/$$f"; \
+ 	done
+ 
+ uninstall-kipidataDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kipidata_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kipidatadir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kipidatadir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kipidatadir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kipidatadir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -402,12 +460,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -421,7 +473,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -439,9 +491,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kipiautorundir) $(DESTDIR)$(kipidatadir)
++	for dir in "$(DESTDIR)$(kipiautorundir)" "$(DESTDIR)$(kipidatadir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -461,7 +514,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -482,6 +535,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -517,29 +572,39 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-kipiautorunDATA install-kipidataDATA \
+-	install-man install-strip installcheck installcheck-am \
+-	installdirs maintainer-clean maintainer-clean-generic \
+-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+-	ps ps-am uninstall uninstall-am uninstall-info-am \
+-	uninstall-kipiautorunDATA uninstall-kipidataDATA
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-kipiautorunDATA \
++	install-kipidataDATA install-man install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++	uninstall-info-am uninstall-kipiautorunDATA \
++	uninstall-kipidataDATA
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=index.htm cdalbums.ico Makefile.in ShellExecute.bat 
++KDE_DIST=index.htm cdalbums.ico Makefile.in ShellExecute.bat Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/autorun/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/autorun/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/autorun/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/autorun/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/autorun/Makefile.in
  
  
---- kipi-plugins/cdarchiving/Makefile.in
-+++ kipi-plugins/cdarchiving/Makefile.in
-@@ -255,6 +255,9 @@
+--- kipi-plugins/common/Makefile.in
++++ kipi-plugins/common/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,37 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/common
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +116,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +205,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -213,6 +246,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +254,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +266,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +287,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +335,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,40 +364,53 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ SUBDIRS = exiv2iface libkipiplugins
+-subdir = kipi-plugins/common
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
  
  .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/common/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/common/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/common/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/common/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/common/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/common/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/common/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -375,7 +429,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -387,7 +447,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -395,7 +455,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -416,7 +482,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -427,14 +493,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -443,19 +501,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -465,10 +526,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -491,12 +553,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -510,7 +566,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -525,15 +581,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -543,7 +601,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -563,7 +620,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -585,6 +642,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -619,37 +678,42 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in 
++KDE_DIST=Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/common/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/common/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/common/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/common/Makefile.in
+ 
+ 
+--- kipi-plugins/common/exiv2iface/Makefile.in
++++ kipi-plugins/common/exiv2iface/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,52 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/common/exiv2iface
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libexiv2iface_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++am_libexiv2iface_la_OBJECTS = exiv2iface.lo
++#>- libexiv2iface_la_OBJECTS = $(am_libexiv2iface_la_OBJECTS)
++#>+ 1
++libexiv2iface_la_OBJECTS = exiv2iface.lo
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(libexiv2iface_la_SOURCES)
++DIST_SOURCES = $(libexiv2iface_la_SOURCES)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +132,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +221,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +262,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +270,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +282,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +303,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +351,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,80 +380,66 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ #>- METASOURCES = AUTO
+-
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS) 
+-
+ noinst_LTLIBRARIES = libexiv2iface.la
+-
+ libexiv2iface_la_SOURCES = exiv2iface.cpp 
+-
+ libexiv2iface_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-
+ libexiv2iface_la_LIBADD = $(EXIV2_LIBS) $(LIB_KDECORE) $(LIB_QT)
+-
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-subdir = kipi-plugins/common/exiv2iface
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-
+-libexiv2iface_la_DEPENDENCIES =
+-am_libexiv2iface_la_OBJECTS = exiv2iface.lo
+-#>- libexiv2iface_la_OBJECTS = $(am_libexiv2iface_la_OBJECTS)
+-#>+ 1
+-libexiv2iface_la_OBJECTS = exiv2iface.lo
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/exiv2iface.Plo
+-#>+ 1
+- at AMDEP_TRUE@DEP_FILES =  ./$(DEPDIR)/exiv2iface.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(libexiv2iface_la_SOURCES)
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(libexiv2iface_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -449,9 +452,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/Makefile'; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/common/exiv2iface/Makefile'; \
  #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/Makefile
-+#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -461,9 +464,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile'; \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/common/exiv2iface/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/common/exiv2iface/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/common/exiv2iface/Makefile'; \
  	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/Makefile
-+	  $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -478,9 +481,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-	  $(AUTOMAKE) --gnu  kipi-plugins/common/exiv2iface/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/common/exiv2iface/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/common/exiv2iface/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--$(top_srcdir)/configure:  $(am__configure_deps)
+ clean-noinstLTLIBRARIES:
+ 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -404,7 +447,7 @@
+ 	$(CXXLINK)  $(libexiv2iface_la_LDFLAGS) $(libexiv2iface_la_OBJECTS) $(libexiv2iface_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -412,37 +455,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/exiv2iface.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -454,14 +485,6 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -470,6 +493,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -481,10 +505,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -507,12 +532,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -526,7 +545,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -544,7 +563,6 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -565,7 +583,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -590,6 +608,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -627,28 +647,38 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am install-man \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
+-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=exiv2iface.h Makefile.in 
++KDE_DIST=exiv2iface.h Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/common/exiv2iface/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/common/exiv2iface/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/common/exiv2iface/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/common/exiv2iface/Makefile.in
+ 
+ 
+--- kipi-plugins/common/libkipiplugins/Makefile.in
++++ kipi-plugins/common/libkipiplugins/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,60 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/common/libkipiplugins
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(libdir)"
++libLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(lib_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libkipiplugins_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
++am_libkipiplugins_la_OBJECTS = kpaboutdata.lo
++#>- libkipiplugins_la_OBJECTS = $(am_libkipiplugins_la_OBJECTS)
++#>+ 1
++libkipiplugins_la_OBJECTS = kpaboutdata.lo
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(libkipiplugins_la_SOURCES)
++DIST_SOURCES = $(libkipiplugins_la_SOURCES)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +140,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +229,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +270,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +278,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +290,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +311,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +359,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,101 +388,86 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ #>- METASOURCES = AUTO
+-
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS) 
+-
+ lib_LTLIBRARIES = libkipiplugins.la
+-
+ libkipiplugins_la_SOURCES = kpaboutdata.cpp 
+-
+ #>- libkipiplugins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 0:1:0 -no-undefined
+ #>+ 1
+ libkipiplugins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 0:1:0 -no-undefined $(KDE_NO_UNDEFINED)
+-
+ libkipiplugins_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+-
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes) 
+-subdir = kipi-plugins/common/libkipiplugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-
+-libkipiplugins_la_DEPENDENCIES =
+-am_libkipiplugins_la_OBJECTS = kpaboutdata.lo
+-#>- libkipiplugins_la_OBJECTS = $(am_libkipiplugins_la_OBJECTS)
+-#>+ 1
+-libkipiplugins_la_OBJECTS = kpaboutdata.lo
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kpaboutdata.Plo
+-#>+ 1
+- at AMDEP_TRUE@DEP_FILES =  ./$(DEPDIR)/kpaboutdata.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(libkipiplugins_la_SOURCES)
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(libkipiplugins_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/common/libkipiplugins/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/common/libkipiplugins/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/common/libkipiplugins/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/common/libkipiplugins/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/common/libkipiplugins/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/common/libkipiplugins/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/common/libkipiplugins/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-libLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -962,9 +965,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/cdarchiving/Makefile
-+	  $(AUTOMAKE) --foreign  kipi-plugins/cdarchiving/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/Makefile.in
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
  
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ 	done
  
+ clean-libLTLIBRARIES:
+ 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -428,7 +478,7 @@
+ 	$(CXXLINK) -rpath $(libdir) $(libkipiplugins_la_LDFLAGS) $(libkipiplugins_la_OBJECTS) $(libkipiplugins_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -436,37 +486,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kpaboutdata.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -478,14 +516,6 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -494,6 +524,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -505,10 +536,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -531,12 +563,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -550,7 +576,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -568,9 +594,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	for dir in "$(DESTDIR)$(libdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -590,7 +617,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -615,6 +642,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -652,8 +681,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-libLTLIBRARIES install-man install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+@@ -676,7 +705,7 @@
+ 
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in 
++KDE_DIST=Makefile.in Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -685,10 +714,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/common/libkipiplugins/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/common/libkipiplugins/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/common/libkipiplugins/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/common/libkipiplugins/Makefile.in
+ 
+ 
 --- kipi-plugins/findimages/Makefile.in
 +++ kipi-plugins/findimages/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,71 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/findimages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_findimages_la_OBJECTS = plugin_findimages.lo \
++	displaycompare.lo finddupplicateimages.lo \
++	finddupplicatedialog.lo fuzzycompare.lo fastcompare.lo \
++	actions.lo
++#>- kipiplugin_findimages_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_findimages_la_OBJECTS)
++#>+ 7
++kipiplugin_findimages_la_final_OBJECTS = kipiplugin_findimages_la.all_cpp.lo 
++kipiplugin_findimages_la_nofinal_OBJECTS = plugin_findimages.lo \
++	displaycompare.lo finddupplicateimages.lo \
++	finddupplicatedialog.lo fuzzycompare.lo fastcompare.lo \
++	actions.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_findimages_la_OBJECTS = $(kipiplugin_findimages_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_findimages_la_OBJECTS = $(kipiplugin_findimages_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_findimages_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_findimages_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +152,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +241,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -213,6 +282,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +290,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +302,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +323,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +371,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,12 +400,10 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_findimages.la
+-
+ kipiplugin_findimages_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+ 
+ # Srcs for the plugin
+@@ -345,120 +420,80 @@
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_findimages.desktop
+-
+ kipifindimagesicondir = $(kde_datadir)/kipiplugin_findimages/icons
+ kipifindimagesicon_ICON = AUTO
+-subdir = kipi-plugins/findimages
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_findimages_la_OBJECTS = plugin_findimages.lo \
+-	displaycompare.lo finddupplicateimages.lo \
+-	finddupplicatedialog.lo fuzzycompare.lo fastcompare.lo \
+-	actions.lo
+-#>- kipiplugin_findimages_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_findimages_la_OBJECTS)
+-#>+ 7
+-kipiplugin_findimages_la_final_OBJECTS = kipiplugin_findimages_la.all_cpp.lo 
+-kipiplugin_findimages_la_nofinal_OBJECTS = plugin_findimages.lo \
+-	displaycompare.lo finddupplicateimages.lo \
+-	finddupplicatedialog.lo fuzzycompare.lo fastcompare.lo \
+-	actions.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_findimages_la_OBJECTS = $(kipiplugin_findimages_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_findimages_la_OBJECTS = $(kipiplugin_findimages_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/actions.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/displaycompare.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/fastcompare.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/finddupplicatedialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/finddupplicateimages.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/fuzzycompare.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_findimages.Plo
+-#>+ 14
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_findimages_la.all_cpp.P ./$(DEPDIR)/actions.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/displaycompare.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/fastcompare.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/finddupplicatedialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/finddupplicateimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/fuzzycompare.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_findimages.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/actions.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/displaycompare.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/fastcompare.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/finddupplicatedialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/finddupplicateimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/fuzzycompare.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_findimages.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_findimages_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_findimages_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/findimages/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/findimages/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/findimages/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/findimages/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -446,9 +449,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/findimages/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/findimages/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/findimages/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/findimages/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/findimages/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -463,9 +466,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -825,9 +828,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/findimages/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -469,7 +504,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_findimages_la_LDFLAGS) $(kipiplugin_findimages_la_OBJECTS) $(kipiplugin_findimages_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -483,37 +518,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_findimages.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -524,33 +547,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -559,6 +573,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -570,10 +585,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -596,12 +612,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -615,7 +625,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -633,9 +643,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -655,7 +666,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -680,13 +691,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am: install-kde-icons   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am: install-kde-icons   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -725,8 +740,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -786,7 +801,7 @@
+ 	-rm -f  displaycompare.moc finddupplicatedialog.moc plugin_findimages.moc finddupplicateimages.moc
+ 
+ #>+ 2
+-KDE_DIST=fuzzycompare.h imagesimilaritydata.h compareoperation.h Doxyfile kipiplugin_findimages.desktop Makefile.in fastcompare.h finddupplicateimages.h plugin_findimages.h hi32-action-finddupplicateimages.png displaycompare.h finddupplicatedialog.h actions.h 
++KDE_DIST=fuzzycompare.h imagesimilaritydata.h compareoperation.h Doxyfile kipiplugin_findimages.desktop Makefile.in fastcompare.h finddupplicateimages.h plugin_findimages.h hi32-action-finddupplicateimages.png displaycompare.h finddupplicatedialog.h actions.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -803,10 +818,19 @@
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kipifindimagesicondir)/hicolor/32x32/actions/finddupplicateimages.png
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/findimages/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/findimages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/findimages/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/findimages/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/findimages/Makefile.in
  
  
 --- kipi-plugins/flickrexport/Makefile.in
 +++ kipi-plugins/flickrexport/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,70 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/flickrexport
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \
++	TODO
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_flickrexport_la_OBJECTS = plugin_flickrexport.lo \
++	flickrwindow.lo login.lo flickrtalker.lo flickrwidget.lo \
++	mpform.lo flickrviewitem.lo exifrestorer.lo
++#>- kipiplugin_flickrexport_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_flickrexport_la_OBJECTS)
++#>+ 6
++kipiplugin_flickrexport_la_final_OBJECTS = kipiplugin_flickrexport_la.all_cpp.lo 
++kipiplugin_flickrexport_la_nofinal_OBJECTS = plugin_flickrexport.lo \
++	flickrwindow.lo login.lo flickrtalker.lo flickrwidget.lo \
++	mpform.lo flickrviewitem.lo exifrestorer.lo flickralbumdialog.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_flickrexport_la_OBJECTS = $(kipiplugin_flickrexport_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_flickrexport_la_OBJECTS = $(kipiplugin_flickrexport_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_flickrexport_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_flickrexport_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +151,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -213,6 +281,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +289,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +301,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +322,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +370,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,14 +399,11 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ #>- METASOURCES = AUTO
+-
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
  
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_flickrexport.la
+-
+ kipiplugin_flickrexport_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+-
+ #>- kipiplugin_flickrexport_la_SOURCES = plugin_flickrexport.cpp \
+ #>- 		                     flickrwindow.cpp login.cpp flickrtalker.cpp \
+ #>- 		                     flickrwidget.cpp mpform.cpp flickralbumdialog.ui \
+@@ -341,121 +414,81 @@
+ 		                     flickrwidget.cpp mpform.cpp  \
+ 		                     flickrviewitem.cpp exifrestorer.cpp  flickralbumdialog.cpp
+ 
+-
+ kipiplugin_flickrexport_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+-
+ kipiplugin_flickrexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+-
+ kde_services_DATA = kipiplugin_flickrexport.desktop
+-subdir = kipi-plugins/flickrexport
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_flickrexport_la_OBJECTS = plugin_flickrexport.lo \
+-	flickrwindow.lo login.lo flickrtalker.lo flickrwidget.lo \
+-	mpform.lo flickrviewitem.lo exifrestorer.lo
+-#>- kipiplugin_flickrexport_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_flickrexport_la_OBJECTS)
+-#>+ 6
+-kipiplugin_flickrexport_la_final_OBJECTS = kipiplugin_flickrexport_la.all_cpp.lo 
+-kipiplugin_flickrexport_la_nofinal_OBJECTS = plugin_flickrexport.lo \
+-	flickrwindow.lo login.lo flickrtalker.lo flickrwidget.lo \
+-	mpform.lo flickrviewitem.lo exifrestorer.lo flickralbumdialog.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_flickrexport_la_OBJECTS = $(kipiplugin_flickrexport_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_flickrexport_la_OBJECTS = $(kipiplugin_flickrexport_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/exifrestorer.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/flickrtalker.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/flickrviewitem.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/flickrwidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/flickrwindow.Plo ./$(DEPDIR)/login.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/mpform.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_flickrexport.Plo
+-#>+ 14
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/flickralbumdialog.P  $(DEPDIR)/kipiplugin_flickrexport_la.all_cpp.P ./$(DEPDIR)/exifrestorer.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/flickrtalker.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/flickrviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/flickrwidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/flickrwindow.Plo ./$(DEPDIR)/login.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/mpform.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_flickrexport.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/flickralbumdialog.P ./$(DEPDIR)/exifrestorer.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/flickrtalker.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/flickrviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/flickrwidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/flickrwindow.Plo ./$(DEPDIR)/login.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/mpform.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_flickrexport.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_flickrexport_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am TODO
+-SOURCES = $(kipiplugin_flickrexport_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -429,9 +432,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/flickrexport/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/flickrexport/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/flickrexport/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/flickrexport/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -441,9 +444,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/flickrexport/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/flickrexport/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/flickrexport/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/flickrexport/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/flickrexport/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -458,9 +461,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -817,9 +820,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/flickrexport/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -466,7 +499,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_flickrexport_la_LDFLAGS) $(kipiplugin_flickrexport_la_OBJECTS) $(kipiplugin_flickrexport_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -481,37 +514,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_flickrexport.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -522,33 +543,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -557,6 +569,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -568,10 +581,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -594,12 +608,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -613,7 +621,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -631,9 +639,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -653,7 +662,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -678,13 +687,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -720,8 +733,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -783,7 +796,7 @@
+ 	-rm -f  flickrwidget.moc plugin_flickrexport.moc flickrwindow.moc flickrtalker.moc
+ 
+ #>+ 2
+-KDE_DIST=login.h flickralbumdialog.ui kipiplugin_flickrexport.desktop mpform.h flickrviewitem.h jpegsection.h flickritem.h flickrwidget.h plugin_flickrexport.h Makefile.in exifrestorer.h flickrwindow.h flickrtalker.h 
++KDE_DIST=login.h flickralbumdialog.ui kipiplugin_flickrexport.desktop mpform.h flickrviewitem.h jpegsection.h flickritem.h flickrwidget.h plugin_flickrexport.h Makefile.in exifrestorer.h flickrwindow.h flickrtalker.h Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+@@ -797,10 +810,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/flickrexport/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/flickrexport/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/flickrexport/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/flickrexport/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/flickrexport/Makefile.in
  
  
 --- kipi-plugins/galleryexport/Makefile.in
 +++ kipi-plugins/galleryexport/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,73 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/galleryexport
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)" \
++	"$(DESTDIR)$(kipiplugin_galleryexportpicsdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_galleryexport_la_OBJECTS = plugin_galleryexport.lo \
++	galleries.lo gallerylist.lo galleryconfig.lo gallerywindow.lo \
++	gallerytalker.lo gallerywidget.lo gallerympform.lo \
++	galleryviewitem.lo
++#>- kipiplugin_galleryexport_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_galleryexport_la_OBJECTS)
++#>+ 7
++kipiplugin_galleryexport_la_final_OBJECTS = kipiplugin_galleryexport_la.all_cpp.lo 
++kipiplugin_galleryexport_la_nofinal_OBJECTS = plugin_galleryexport.lo \
++	galleries.lo gallerylist.lo galleryconfig.lo gallerywindow.lo \
++	gallerytalker.lo gallerywidget.lo gallerympform.lo \
++	galleryviewitem.lo galleryalbumdialog.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_galleryexport_la_OBJECTS = $(kipiplugin_galleryexport_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_galleryexport_la_OBJECTS = $(kipiplugin_galleryexport_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_galleryexport_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_galleryexport_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++kipiplugin_galleryexportpicsDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA) $(kipiplugin_galleryexportpics_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +154,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +243,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -213,6 +284,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +292,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +304,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +325,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +373,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,16 +402,13 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_galleryexport.la
+-
+ kipiplugin_galleryexport_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+ 	$(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la 
+ 
+-
+ #>- kipiplugin_galleryexport_la_SOURCES = plugin_galleryexport.cpp \
+ #>- 		galleries.cpp gallerylist.cpp galleryconfig.cpp \
+ #>- 		gallerywindow.cpp gallerytalker.cpp \
+@@ -345,134 +421,85 @@
+ 		gallerywidget.cpp gallerympform.cpp  \
+ 		galleryviewitem.cpp galleryalbumdialog.cpp
+ 
+-
+ kipiplugin_galleryexport_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
+ 	-lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ 
+-
+ kipiplugin_galleryexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+-
+ kde_services_DATA = kipiplugin_galleryexport.desktop
+-
+ kipiplugin_galleryexportpicsdir = $(kde_datadir)/kipiplugin_galleryexport/pics
+ kipiplugin_galleryexportpics_DATA = gallery.png
+-subdir = kipi-plugins/galleryexport
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_galleryexport_la_OBJECTS = plugin_galleryexport.lo \
+-	galleries.lo gallerylist.lo galleryconfig.lo gallerywindow.lo \
+-	gallerytalker.lo gallerywidget.lo gallerympform.lo \
+-	galleryviewitem.lo
+-#>- kipiplugin_galleryexport_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_galleryexport_la_OBJECTS)
+-#>+ 7
+-kipiplugin_galleryexport_la_final_OBJECTS = kipiplugin_galleryexport_la.all_cpp.lo 
+-kipiplugin_galleryexport_la_nofinal_OBJECTS = plugin_galleryexport.lo \
+-	galleries.lo gallerylist.lo galleryconfig.lo gallerywindow.lo \
+-	gallerytalker.lo gallerywidget.lo gallerympform.lo \
+-	galleryviewitem.lo galleryalbumdialog.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_galleryexport_la_OBJECTS = $(kipiplugin_galleryexport_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_galleryexport_la_OBJECTS = $(kipiplugin_galleryexport_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/galleries.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/galleryconfig.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gallerylist.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gallerympform.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gallerytalker.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/galleryviewitem.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gallerywidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gallerywindow.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_galleryexport.Plo
+-#>+ 18
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/galleryalbumdialog.P  $(DEPDIR)/kipiplugin_galleryexport_la.all_cpp.P ./$(DEPDIR)/galleries.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/galleryconfig.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerylist.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerympform.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerytalker.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/galleryviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerywidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerywindow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_galleryexport.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/galleryalbumdialog.P ./$(DEPDIR)/galleries.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/galleryconfig.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerylist.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerympform.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerytalker.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/galleryviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerywidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gallerywindow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_galleryexport.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_galleryexport_la_SOURCES)
+-DATA = $(kde_services_DATA) $(kipiplugin_galleryexportpics_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
+-SOURCES = $(kipiplugin_galleryexport_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -428,9 +431,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/galleryexport/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/galleryexport/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/galleryexport/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/galleryexport/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -440,9 +443,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/galleryexport/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/galleryexport/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/galleryexport/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/galleryexport/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/galleryexport/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -457,9 +460,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -815,9 +818,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/galleryexport/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -483,7 +510,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_galleryexport_la_LDFLAGS) $(kipiplugin_galleryexport_la_OBJECTS) $(kipiplugin_galleryexport_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -499,37 +526,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_galleryexport.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -540,51 +555,41 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+-kipiplugin_galleryexportpicsDATA_INSTALL = $(INSTALL_DATA)
+ install-kipiplugin_galleryexportpicsDATA: $(kipiplugin_galleryexportpics_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kipiplugin_galleryexportpicsdir)
++	test -z "$(kipiplugin_galleryexportpicsdir)" || $(mkdir_p) "$(DESTDIR)$(kipiplugin_galleryexportpicsdir)"
+ 	@list='$(kipiplugin_galleryexportpics_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kipiplugin_galleryexportpicsDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_galleryexportpicsdir)/$$f"; \
+-	  $(kipiplugin_galleryexportpicsDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_galleryexportpicsdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kipiplugin_galleryexportpicsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiplugin_galleryexportpicsdir)/$$f'"; \
++	  $(kipiplugin_galleryexportpicsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiplugin_galleryexportpicsdir)/$$f"; \
+ 	done
+ 
+ uninstall-kipiplugin_galleryexportpicsDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kipiplugin_galleryexportpics_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kipiplugin_galleryexportpicsdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kipiplugin_galleryexportpicsdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kipiplugin_galleryexportpicsdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kipiplugin_galleryexportpicsdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -593,6 +598,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -604,10 +610,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -630,12 +637,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -649,7 +650,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -667,9 +668,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir) $(DESTDIR)$(kipiplugin_galleryexportpicsdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kipiplugin_galleryexportpicsdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -689,7 +691,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -714,14 +716,18 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA \
+ #>- 	install-kipiplugin_galleryexportpicsDATA
+-#>+ 2
+-install-data-am:   install-kde_servicesDATA \
++#>+ 3
++install-data-am:   \
++	install-kde_servicesDATA \
+ 	install-kipiplugin_galleryexportpicsDATA
+ 
+ #>- install-exec-am:
+@@ -759,16 +765,17 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-kipiplugin_galleryexportpicsDATA install-man \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
+-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++	uninstall-kde_servicesDATA \
+ 	uninstall-kipiplugin_galleryexportpicsDATA
+ 
+ 
+@@ -837,7 +844,7 @@
+ 	-rm -f  gallerytalker.moc gallerywindow.moc gallerywidget.moc plugin_galleryexport.moc galleryconfig.moc gallerylist.moc
+ 
+ #>+ 2
+-KDE_DIST=gallerywidget.h plugin_galleryexport.h gallerytalker.h gallerympform.h Makefile.in galleryviewitem.h kipiplugin_galleryexport.desktop galleryitem.h gallery.png gallerywindow.h galleryalbumdialog.ui galleries.h galleryconfig.h gallerylist.h 
++KDE_DIST=gallerywidget.h plugin_galleryexport.h gallerytalker.h gallerympform.h Makefile.in galleryviewitem.h kipiplugin_galleryexport.desktop galleryitem.h gallery.png gallerywindow.h galleryalbumdialog.ui galleries.h galleryconfig.h gallerylist.h Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+@@ -851,10 +858,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/galleryexport/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/galleryexport/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/galleryexport/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/galleryexport/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/galleryexport/Makefile.in
  
  
+--- kipi-plugins/gpssync/Makefile.in
++++ kipi-plugins/gpssync/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,68 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/gpssync
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_gpssync_la_OBJECTS = plugin_gpssync.lo gpssyncdialog.lo \
++	gpslistviewitem.lo gpsbabelbinary.lo gpsdataparser.lo \
++	gpseditdialog.lo gpsmapwidget.lo
++#>- kipiplugin_gpssync_la_OBJECTS = $(am_kipiplugin_gpssync_la_OBJECTS)
++#>+ 6
++kipiplugin_gpssync_la_final_OBJECTS = kipiplugin_gpssync_la.all_cpp.lo 
++kipiplugin_gpssync_la_nofinal_OBJECTS = plugin_gpssync.lo gpssyncdialog.lo \
++	gpslistviewitem.lo gpsbabelbinary.lo gpsdataparser.lo \
++	gpseditdialog.lo gpsmapwidget.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_gpssync_la_OBJECTS = $(kipiplugin_gpssync_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_gpssync_la_OBJECTS = $(kipiplugin_gpssync_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_gpssync_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_gpssync_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +149,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +238,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +279,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +287,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +299,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +320,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +368,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,12 +397,10 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
+ 
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_gpssync.la
+-
+ kipiplugin_gpssync_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+ 	$(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la 
+ 
+@@ -341,11 +413,11 @@
+ 
+ # Libs needed by the plugin
+ kipiplugin_gpssync_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
+-	       $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KDECORE) $(LIB_QT)
++		-lkipiplugins $(LIBKIPI_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ 
+ 
+ # LD flags for the plugin
+-kipiplugin_gpssync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
++kipiplugin_gpssync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries)
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_gpssync.desktop
+@@ -353,114 +425,78 @@
+ # Icons set for the plugin.
+ kipiplugin_gpssyncicondir = $(kde_datadir)/kipiplugin_gpssync/icons
+ kipiplugin_gpssyncicon_ICON = AUTO
+-subdir = kipi-plugins/gpssync
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_gpssync_la_OBJECTS = plugin_gpssync.lo gpssyncdialog.lo \
+-	gpslistviewitem.lo gpsbabelbinary.lo gpsdataparser.lo \
+-	gpseditdialog.lo gpsmapwidget.lo
+-#>- kipiplugin_gpssync_la_OBJECTS = $(am_kipiplugin_gpssync_la_OBJECTS)
+-#>+ 6
+-kipiplugin_gpssync_la_final_OBJECTS = kipiplugin_gpssync_la.all_cpp.lo 
+-kipiplugin_gpssync_la_nofinal_OBJECTS = plugin_gpssync.lo gpssyncdialog.lo \
+-	gpslistviewitem.lo gpsbabelbinary.lo gpsdataparser.lo \
+-	gpseditdialog.lo gpsmapwidget.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_gpssync_la_OBJECTS = $(kipiplugin_gpssync_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_gpssync_la_OBJECTS = $(kipiplugin_gpssync_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/gpsbabelbinary.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpsdataparser.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpseditdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpslistviewitem.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpsmapwidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpssyncdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_gpssync.Plo
+-#>+ 14
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_gpssync_la.all_cpp.P ./$(DEPDIR)/gpsbabelbinary.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpsdataparser.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpseditdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpslistviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpsmapwidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpssyncdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_gpssync.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/gpsbabelbinary.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpsdataparser.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpseditdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpslistviewitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpsmapwidget.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpssyncdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_gpssync.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_gpssync_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_gpssync_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/gpssync/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/gpssync/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/gpssync/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/gpssync/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/gpssync/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/gpssync/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/gpssync/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -471,7 +507,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_gpssync_la_LDFLAGS) $(kipiplugin_gpssync_la_OBJECTS) $(kipiplugin_gpssync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -485,37 +521,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_gpssync.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -526,33 +550,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -561,6 +576,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -572,10 +588,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -598,12 +615,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -617,7 +628,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -635,9 +646,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -657,7 +669,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -682,13 +694,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am: install-kde-icons   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am: install-kde-icons   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -727,8 +743,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -802,7 +818,7 @@
+ 	-rm -f  gpssyncdialog.moc gpslistviewitem.moc gpseditdialog.moc plugin_gpssync.moc gpsbabelbinary.moc gpsmapwidget.moc
+ 
+ #>+ 2
+-KDE_DIST=plugin_gpssync.h gpsbabelbinary.h gpsdataparser.h kipiplugin_gpssync.desktop getlonlat.php gpseditdialog.h gpssyncdialog.h Makefile.in gpsdatacontainer.h gpslistviewitem.h hi16-action-gpsimagetag.png hi32-action-gpsimagetag.png gpsmapwidget.h 
++KDE_DIST=plugin_gpssync.h gpsbabelbinary.h gpsdataparser.h kipiplugin_gpssync.desktop getlonlat.php gpseditdialog.h gpssyncdialog.h Makefile.in gpsdatacontainer.h gpslistviewitem.h hi16-action-gpsimagetag.png hi32-action-gpsimagetag.png gpsmapwidget.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -822,10 +838,19 @@
+ 	-rm -f $(DESTDIR)$(kipiplugin_gpssyncicondir)/hicolor/32x32/actions/gpsimagetag.png
+ 	-rm -f $(DESTDIR)$(kipiplugin_gpssyncicondir)/hicolor/16x16/actions/gpsimagetag.png
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/gpssync/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/gpssync/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/gpssync/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/gpssync/Makefile.in
+ 
+ 
 --- kipi-plugins/helloworld/Makefile.in
 +++ kipi-plugins/helloworld/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,62 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/helloworld
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_helloworld_la_OBJECTS = plugin_helloworld.lo
++#>- kipiplugin_helloworld_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_helloworld_la_OBJECTS)
++#>+ 1
++kipiplugin_helloworld_la_OBJECTS = plugin_helloworld.lo
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_helloworld_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_helloworld_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +143,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +232,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -213,6 +273,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +281,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +293,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +314,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +362,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -339,89 +407,78 @@
  
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_helloworld.desktop
+-subdir = kipi-plugins/helloworld
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_helloworld_la_OBJECTS = plugin_helloworld.lo
+-#>- kipiplugin_helloworld_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_helloworld_la_OBJECTS)
+-#>+ 1
+-kipiplugin_helloworld_la_OBJECTS = plugin_helloworld.lo
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plugin_helloworld.Plo
+-#>+ 1
+- at AMDEP_TRUE@DEP_FILES =  ./$(DEPDIR)/plugin_helloworld.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_helloworld_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_helloworld_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -419,9 +422,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/helloworld/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/helloworld/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/helloworld/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/helloworld/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -431,9 +434,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/helloworld/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/helloworld/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/helloworld/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/helloworld/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/helloworld/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -448,9 +451,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -773,9 +776,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/helloworld/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -432,7 +489,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_helloworld_la_LDFLAGS) $(kipiplugin_helloworld_la_OBJECTS) $(kipiplugin_helloworld_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -440,37 +497,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_helloworld.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -481,33 +526,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -516,6 +552,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -527,10 +564,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -553,12 +591,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -572,7 +604,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -590,9 +622,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -612,7 +645,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -637,13 +670,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -679,8 +716,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -720,7 +757,7 @@
+ 	-rm -f  plugin_helloworld.moc
+ 
+ #>+ 2
+-KDE_DIST=plugin_helloworld.h kipiplugin_helloworld.desktop Makefile.in 
++KDE_DIST=plugin_helloworld.h kipiplugin_helloworld.desktop Makefile.in Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -729,10 +766,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/helloworld/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/helloworld/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/helloworld/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/helloworld/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/helloworld/Makefile.in
  
  
 --- kipi-plugins/htmlexport/Makefile.in
 +++ kipi-plugins/htmlexport/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,82 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/htmlexport
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_kcfgdir)" "$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_htmlexport_la_OBJECTS = generator.lo plugin.lo wizard.lo \
++	theme.lo
++#>- kipiplugin_htmlexport_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_htmlexport_la_OBJECTS)
++#>+ 5
++kipiplugin_htmlexport_la_final_OBJECTS = kipiplugin_htmlexport_la.all_cpp.lo 
++kipiplugin_htmlexport_la_nofinal_OBJECTS = generator.lo plugin.lo wizard.lo \
++	theme.lo themepage.lo imagesettingspage.lo outputpage.lo htmlexportconfig.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_htmlexport_la_OBJECTS = $(kipiplugin_htmlexport_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_htmlexport_la_OBJECTS = $(kipiplugin_htmlexport_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_htmlexport_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_htmlexport_la_SOURCES)
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++kde_kcfgDATA_INSTALL = $(INSTALL_DATA)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_kcfg_DATA) $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +163,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +252,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -213,6 +293,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +301,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +313,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +334,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +382,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,12 +412,10 @@
+ xdg_menudir = @xdg_menudir@
+ SUBDIRS = themes
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes) $(LIBXSLT_CFLAGS)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_htmlexport.la
+-
+ kipiplugin_htmlexport_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+ #>- kipiplugin_htmlexport_la_SOURCES = \
+ #>- 	generator.cpp \
+@@ -351,121 +437,86 @@
+ 	theme.cpp \
+ 	 themepage.cpp imagesettingspage.cpp outputpage.cpp htmlexportconfig.cpp
+ 
+-
+ kde_kcfg_DATA = \
+ 	htmlexportconfig.kcfg
+ 
+-
+ kipiplugin_htmlexport_la_LIBADD = -lexslt -lxml2 $(LIBXSLT_LIBS) $(LIBKIPI_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ kipiplugin_htmlexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_htmlexport.desktop
+-subdir = kipi-plugins/htmlexport
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_htmlexport_la_OBJECTS = generator.lo plugin.lo wizard.lo \
+-	theme.lo
+-#>- kipiplugin_htmlexport_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_htmlexport_la_OBJECTS)
+-#>+ 5
+-kipiplugin_htmlexport_la_final_OBJECTS = kipiplugin_htmlexport_la.all_cpp.lo 
+-kipiplugin_htmlexport_la_nofinal_OBJECTS = generator.lo plugin.lo wizard.lo \
+-	theme.lo themepage.lo imagesettingspage.lo outputpage.lo htmlexportconfig.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_htmlexport_la_OBJECTS = $(kipiplugin_htmlexport_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_htmlexport_la_OBJECTS = $(kipiplugin_htmlexport_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/generator.Plo ./$(DEPDIR)/plugin.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/theme.Plo ./$(DEPDIR)/wizard.Plo
+-#>+ 4
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/themepage.P $(DEPDIR)/imagesettingspage.P $(DEPDIR)/outputpage.P $(DEPDIR)/htmlexportconfig.P  $(DEPDIR)/kipiplugin_htmlexport_la.all_cpp.P ./$(DEPDIR)/generator.Plo ./$(DEPDIR)/plugin.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/theme.Plo ./$(DEPDIR)/wizard.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/themepage.P $(DEPDIR)/imagesettingspage.P $(DEPDIR)/outputpage.P $(DEPDIR)/htmlexportconfig.P ./$(DEPDIR)/generator.Plo ./$(DEPDIR)/plugin.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/theme.Plo ./$(DEPDIR)/wizard.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_htmlexport_la_SOURCES)
+-DATA = $(kde_kcfg_DATA) $(kde_services_DATA)
+-
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
+-DIST_SUBDIRS = $(SUBDIRS)
+-SOURCES = $(kipiplugin_htmlexport_la_SOURCES)
+-
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -457,9 +460,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -469,9 +472,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -486,9 +489,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -962,9 +965,9 @@
- 	      exit 1;; \
- 	  esac; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -476,7 +527,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_htmlexport_la_LDFLAGS) $(kipiplugin_htmlexport_la_OBJECTS) $(kipiplugin_htmlexport_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -487,37 +538,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wizard.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -528,41 +567,39 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_kcfgDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_kcfgDATA: $(kde_kcfg_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_kcfgdir)
++	test -z "$(kde_kcfgdir)" || $(mkdir_p) "$(DESTDIR)$(kde_kcfgdir)"
+ 	@list='$(kde_kcfg_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_kcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_kcfgdir)/$$f"; \
+-	  $(kde_kcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_kcfgdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_kcfgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
++	  $(kde_kcfgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_kcfgDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_kcfg_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_kcfgdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_kcfgdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
+ 	done
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -572,7 +609,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -584,7 +627,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -592,7 +635,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -613,7 +662,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -624,14 +673,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -640,19 +681,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -662,10 +706,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -688,12 +733,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -707,7 +746,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -722,15 +761,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -740,8 +781,9 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_kcfgdir) $(DESTDIR)$(kde_servicesdir)
+-
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_kcfgdir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -761,7 +803,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -786,6 +828,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -829,26 +873,23 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ 	clean-recursive ctags ctags-recursive distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive \
+-	install-kde_kcfgDATA install-kde_moduleLTLIBRARIES \
+-	install-kde_servicesDATA install-man install-recursive \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am installdirs-recursive maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
+-	ps-recursive tags tags-recursive uninstall uninstall-am \
+-	uninstall-info-am uninstall-info-recursive \
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-kde_kcfgDATA \
++	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
++	install-man install-strip installcheck installcheck-am \
++	installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+ 	uninstall-kde_kcfgDATA uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kde_servicesDATA uninstall-recursive
++	uninstall-kde_servicesDATA
+ 
+ 
+ # i18n translation messages
+@@ -893,7 +934,7 @@
+ 	-rm -f  wizard.moc plugin.moc generator.moc
+ 
+ #>+ 2
+-KDE_DIST=xmlutils.h outputpage.ui kipiplugin_htmlexport.desktop htmlexportconfig.kcfg wizard.h theme.h plugin.h generator.h galleryinfo.h imagesettingspage.ui Makefile.in themepage.ui htmlexportconfig.kcfgc 
++KDE_DIST=xmlutils.h outputpage.ui kipiplugin_htmlexport.desktop htmlexportconfig.kcfg wizard.h theme.h plugin.h generator.h galleryinfo.h imagesettingspage.ui Makefile.in themepage.ui Makefile.am htmlexportconfig.kcfgc 
+ 
+ #>+ 6
+ clean-ui:
+@@ -914,10 +955,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/Makefile.in
  
  
 --- kipi-plugins/htmlexport/themes/Makefile.in
 +++ kipi-plugins/htmlexport/themes/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,37 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/htmlexport/themes
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +116,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +205,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -366,7 +369,7 @@
+@@ -213,6 +246,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +254,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +266,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +287,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +335,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,40 +364,53 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ SUBDIRS = matrix snow simple
+-subdir = kipi-plugins/htmlexport/themes
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -375,9 +378,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -387,9 +390,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -404,9 +407,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -708,9 +711,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -375,7 +429,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -387,7 +447,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -395,7 +455,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -416,7 +482,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -427,14 +493,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -443,19 +501,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -465,10 +526,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -491,12 +553,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -510,7 +566,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -525,15 +581,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -543,7 +601,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -563,7 +620,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -585,6 +642,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -619,37 +678,42 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in 
++KDE_DIST=Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/Makefile.in
  
  
 --- kipi-plugins/htmlexport/themes/matrix/Makefile.in
 +++ kipi-plugins/htmlexport/themes/matrix/Makefile.in
-@@ -198,6 +198,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,30 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/htmlexport/themes/matrix
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(themedir)"
++themeDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(theme_DATA)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +110,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +199,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -366,7 +369,7 @@
+@@ -213,6 +240,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +248,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +260,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +281,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +329,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -329,29 +364,53 @@
+ 	template.xsl \
+ 	bg.png
+ 
+-subdir = kipi-plugins/htmlexport/themes/matrix
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(theme_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -375,9 +378,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/matrix/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/matrix/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/matrix/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/matrix/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -387,9 +390,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/matrix/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/matrix/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/matrix/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/matrix/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/matrix/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -404,9 +407,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -580,9 +583,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/matrix/Makefile'; \
+ 	-rm -f *.lo
+@@ -362,23 +421,22 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-themeDATA_INSTALL = $(INSTALL_DATA)
+ install-themeDATA: $(theme_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(themedir)
++	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+ 	@list='$(theme_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+-	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
++	  $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
+ 	done
+ 
+ uninstall-themeDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(theme_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
+-	  rm -f $(DESTDIR)$(themedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(themedir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -386,12 +444,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -405,7 +457,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -423,9 +475,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(themedir)
++	for dir in "$(DESTDIR)$(themedir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -445,7 +498,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -466,6 +519,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -500,28 +555,37 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip install-themeDATA \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am uninstall-themeDATA
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	install-themeDATA installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=matrix.desktop template.xsl Makefile.in style.css bg.png 
++KDE_DIST=matrix.desktop template.xsl Makefile.in style.css Makefile.am bg.png 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/matrix/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/matrix/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/matrix/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/matrix/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/matrix/Makefile.in
  
  
+--- kipi-plugins/htmlexport/themes/s0/Makefile.in
++++ kipi-plugins/htmlexport/themes/s0/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,30 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/htmlexport/themes/s0
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(themedir)"
++themeDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(theme_DATA)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +110,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +199,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +240,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +248,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +260,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +281,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +329,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -329,29 +364,53 @@
+ 	template.xsl \
+ 	previous.png next.png previous_disabled.png next_disabled.png
+ 
+-subdir = kipi-plugins/htmlexport/themes/s0
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(theme_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/s0/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/s0/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/s0/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/s0/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/s0/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/s0/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/s0/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -362,23 +421,22 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-themeDATA_INSTALL = $(INSTALL_DATA)
+ install-themeDATA: $(theme_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(themedir)
++	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+ 	@list='$(theme_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+-	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
++	  $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
+ 	done
+ 
+ uninstall-themeDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(theme_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
+-	  rm -f $(DESTDIR)$(themedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(themedir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -386,12 +444,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -405,7 +457,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -423,9 +475,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(themedir)
++	for dir in "$(DESTDIR)$(themedir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -445,7 +498,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -466,6 +519,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -500,28 +555,37 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip install-themeDATA \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am uninstall-themeDATA
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	install-themeDATA installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=s0.desktop template.xsl previous.png up.png next_disabled.png previous_disabled.png arrows_source.svg Makefile.in style.css next.png 
++KDE_DIST=s0.desktop template.xsl previous.png up.png next_disabled.png previous_disabled.png arrows_source.svg Makefile.in style.css Makefile.am next.png 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/s0/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/s0/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/s0/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/s0/Makefile.in
+ 
+ 
 --- kipi-plugins/htmlexport/themes/simple/Makefile.in
 +++ kipi-plugins/htmlexport/themes/simple/Makefile.in
-@@ -198,6 +198,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,30 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/htmlexport/themes/simple
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(themedir)"
++themeDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(theme_DATA)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +110,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +199,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -365,7 +368,7 @@
+@@ -213,6 +240,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +248,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +260,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +281,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +329,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -328,29 +363,53 @@
+ 	style.css \
+ 	template.xsl
+ 
+-subdir = kipi-plugins/htmlexport/themes/simple
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(theme_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -374,9 +377,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/simple/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/simple/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/simple/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/simple/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -386,9 +389,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/simple/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/simple/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/simple/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/simple/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/simple/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -403,9 +406,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -579,9 +582,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/simple/Makefile'; \
+ 	-rm -f *.lo
+@@ -361,23 +420,22 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-themeDATA_INSTALL = $(INSTALL_DATA)
+ install-themeDATA: $(theme_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(themedir)
++	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+ 	@list='$(theme_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+-	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
++	  $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
+ 	done
+ 
+ uninstall-themeDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(theme_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
+-	  rm -f $(DESTDIR)$(themedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(themedir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -385,12 +443,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -404,7 +456,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -422,9 +474,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(themedir)
++	for dir in "$(DESTDIR)$(themedir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -444,7 +497,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -465,6 +518,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -499,28 +554,37 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip install-themeDATA \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am uninstall-themeDATA
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	install-themeDATA installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=template.xsl simple.desktop Makefile.in style.css 
++KDE_DIST=template.xsl simple.desktop Makefile.in style.css Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/simple/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/simple/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/simple/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/simple/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/simple/Makefile.in
  
  
 --- kipi-plugins/htmlexport/themes/snow/Makefile.in
 +++ kipi-plugins/htmlexport/themes/snow/Makefile.in
-@@ -198,6 +198,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,30 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/htmlexport/themes/snow
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(themedir)"
++themeDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(theme_DATA)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +110,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +199,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -366,7 +369,7 @@
+@@ -213,6 +240,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +248,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +260,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +281,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +329,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -329,29 +364,53 @@
+ 	template.xsl \
+ 	previous.png next.png previous_disabled.png next_disabled.png
+ 
+-subdir = kipi-plugins/htmlexport/themes/snow
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(theme_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -375,9 +378,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/snow/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/snow/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/snow/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/snow/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -387,9 +390,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/snow/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/snow/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/snow/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/snow/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/snow/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -404,9 +407,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -580,9 +583,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/snow/Makefile'; \
+ 	-rm -f *.lo
+@@ -362,23 +421,22 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-themeDATA_INSTALL = $(INSTALL_DATA)
+ install-themeDATA: $(theme_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(themedir)
++	test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
+ 	@list='$(theme_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+-	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
++	  $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
+ 	done
+ 
+ uninstall-themeDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(theme_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
+-	  rm -f $(DESTDIR)$(themedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(themedir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -386,12 +444,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -405,7 +457,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -423,9 +475,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(themedir)
++	for dir in "$(DESTDIR)$(themedir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -445,7 +498,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -466,6 +519,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -500,28 +555,37 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip install-themeDATA \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-	uninstall-info-am uninstall-themeDATA
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	install-themeDATA installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=next.svg snow.desktop template.xsl previous.png next_disabled.png previous_disabled.png Makefile.in style.css next.png 
++KDE_DIST=next.svg snow.desktop template.xsl previous.png next_disabled.png previous_disabled.png Makefile.in style.css Makefile.am next.png 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/snow/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/snow/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/htmlexport/themes/snow/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/htmlexport/themes/snow/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/snow/Makefile.in
  
  
 --- kipi-plugins/imagesgallery/Makefile.in
 +++ kipi-plugins/imagesgallery/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,67 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/imagesgallery
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_imagesgallery_la_OBJECTS = plugin_imagesgallery.lo \
++	imgallerydialog.lo imagesgallery.lo exifrestorer.lo
++#>- kipiplugin_imagesgallery_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_imagesgallery_la_OBJECTS)
++#>+ 5
++kipiplugin_imagesgallery_la_final_OBJECTS = kipiplugin_imagesgallery_la.all_cpp.lo 
++kipiplugin_imagesgallery_la_nofinal_OBJECTS = plugin_imagesgallery.lo \
++	imgallerydialog.lo imagesgallery.lo exifrestorer.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_imagesgallery_la_OBJECTS = $(kipiplugin_imagesgallery_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_imagesgallery_la_OBJECTS = $(kipiplugin_imagesgallery_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_imagesgallery_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_imagesgallery_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +148,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -417,7 +420,7 @@
+@@ -213,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +286,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +298,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +319,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +367,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,7 +396,6 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+@@ -342,104 +414,78 @@
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_imagesgallery.desktop
+-subdir = kipi-plugins/imagesgallery
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_imagesgallery_la_OBJECTS = plugin_imagesgallery.lo \
+-	imgallerydialog.lo imagesgallery.lo exifrestorer.lo
+-#>- kipiplugin_imagesgallery_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_imagesgallery_la_OBJECTS)
+-#>+ 5
+-kipiplugin_imagesgallery_la_final_OBJECTS = kipiplugin_imagesgallery_la.all_cpp.lo 
+-kipiplugin_imagesgallery_la_nofinal_OBJECTS = plugin_imagesgallery.lo \
+-	imgallerydialog.lo imagesgallery.lo exifrestorer.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_imagesgallery_la_OBJECTS = $(kipiplugin_imagesgallery_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_imagesgallery_la_OBJECTS = $(kipiplugin_imagesgallery_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/exifrestorer.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/imagesgallery.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/imgallerydialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_imagesgallery.Plo
+-#>+ 8
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_imagesgallery_la.all_cpp.P ./$(DEPDIR)/exifrestorer.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/imagesgallery.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/imgallerydialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_imagesgallery.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/exifrestorer.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/imagesgallery.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/imgallerydialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_imagesgallery.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_imagesgallery_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
+-SOURCES = $(kipiplugin_imagesgallery_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -426,9 +429,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/imagesgallery/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/imagesgallery/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/imagesgallery/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/imagesgallery/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -438,9 +441,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/imagesgallery/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/imagesgallery/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/imagesgallery/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/imagesgallery/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/imagesgallery/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -455,9 +458,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -796,9 +799,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/imagesgallery/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -450,7 +496,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_imagesgallery_la_LDFLAGS) $(kipiplugin_imagesgallery_la_OBJECTS) $(kipiplugin_imagesgallery_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -461,37 +507,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_imagesgallery.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -502,33 +536,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -537,6 +562,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -548,10 +574,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -574,12 +601,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -593,7 +614,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -611,9 +632,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -633,7 +655,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -658,13 +680,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -700,8 +726,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -754,7 +780,7 @@
+ 	-rm -f  imagesgallery.moc imgallerydialog.moc plugin_imagesgallery.moc
+ 
+ #>+ 2
+-KDE_DIST=imgallerydialog.h kipiplugin_imagesgallery.desktop jpegsection.h Makefile.in exifrestorer.h plugin_imagesgallery.h actions.h imagesgallery.h 
++KDE_DIST=imgallerydialog.h kipiplugin_imagesgallery.desktop jpegsection.h Makefile.in exifrestorer.h plugin_imagesgallery.h actions.h Makefile.am imagesgallery.h 
+ 
+ #>+ 3
+ clean-closures:
+@@ -763,10 +789,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/imagesgallery/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/imagesgallery/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/imagesgallery/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/imagesgallery/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/imagesgallery/Makefile.in
  
  
+--- kipi-plugins/ipodexport/Makefile.in
++++ kipi-plugins/ipodexport/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,68 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/ipodexport
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_ipodexport_la_OBJECTS = plugin_ipodexport.lo \
++	ipodexportdialog.lo ipodheader.lo ipodlistitem.lo imagelist.lo
++#>- kipiplugin_ipodexport_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_ipodexport_la_OBJECTS)
++#>+ 6
++kipiplugin_ipodexport_la_final_OBJECTS = kipiplugin_ipodexport_la.all_cpp.lo 
++kipiplugin_ipodexport_la_nofinal_OBJECTS = plugin_ipodexport.lo \
++	ipodexportdialog.lo ipodheader.lo ipodlistitem.lo imagelist.lo\
++ipodexportdialog.moc.lo plugin_ipodexport.moc.lo imagelist.moc.lo ipodheader.moc.lo 
++ at KDE_USE_FINAL_FALSE@kipiplugin_ipodexport_la_OBJECTS = $(kipiplugin_ipodexport_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_ipodexport_la_OBJECTS = $(kipiplugin_ipodexport_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_ipodexport_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_ipodexport_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +149,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +238,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +279,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +287,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +299,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +320,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +368,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -322,132 +396,95 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) \
+               $(LIBKIPI_CFLAGS) \
+               $(LIBGPOD_CFLAGS) \
+               $(all_includes)
+ 
+-
+ #>- METASOURCES = AUTO
+-
+ kde_module_LTLIBRARIES = kipiplugin_ipodexport.la
+ kipiplugin_ipodexport_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+-
+ kipiplugin_ipodexport_la_SOURCES = plugin_ipodexport.cpp \
+                                    ipodexportdialog.cpp \
+                                    ipodheader.cpp \
+                                    ipodlistitem.cpp \
+                                    imagelist.cpp
+ 
+-
+ kipiplugin_ipodexport_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+-
+ kipiplugin_ipodexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIBGPOD_LIBS) $(all_libraries)
+-
+ kde_services_DATA = kipiplugin_ipodexport.desktop
+-subdir = kipi-plugins/ipodexport
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_ipodexport_la_OBJECTS = plugin_ipodexport.lo \
+-	ipodexportdialog.lo ipodheader.lo ipodlistitem.lo imagelist.lo
+-#>- kipiplugin_ipodexport_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_ipodexport_la_OBJECTS)
+-#>+ 6
+-kipiplugin_ipodexport_la_final_OBJECTS = kipiplugin_ipodexport_la.all_cpp.lo 
+-kipiplugin_ipodexport_la_nofinal_OBJECTS = plugin_ipodexport.lo \
+-	ipodexportdialog.lo ipodheader.lo ipodlistitem.lo imagelist.lo\
+-ipodexportdialog.moc.lo plugin_ipodexport.moc.lo imagelist.moc.lo ipodheader.moc.lo 
+- at KDE_USE_FINAL_FALSE@kipiplugin_ipodexport_la_OBJECTS = $(kipiplugin_ipodexport_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_ipodexport_la_OBJECTS = $(kipiplugin_ipodexport_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/imagelist.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/ipodexportdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/ipodheader.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/ipodlistitem.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_ipodexport.Plo
+-#>+ 10
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/ipodexportdialog.moc.P $(DEPDIR)/plugin_ipodexport.moc.P $(DEPDIR)/imagelist.moc.P $(DEPDIR)/ipodheader.moc.P  $(DEPDIR)/kipiplugin_ipodexport_la.all_cpp.P ./$(DEPDIR)/imagelist.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ipodexportdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ipodheader.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ipodlistitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_ipodexport.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/ipodexportdialog.moc.P $(DEPDIR)/plugin_ipodexport.moc.P $(DEPDIR)/imagelist.moc.P $(DEPDIR)/ipodheader.moc.P ./$(DEPDIR)/imagelist.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ipodexportdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ipodheader.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ipodlistitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_ipodexport.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_ipodexport_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_ipodexport_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/ipodexport/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/ipodexport/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/ipodexport/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/ipodexport/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/ipodexport/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/ipodexport/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/ipodexport/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -458,7 +495,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_ipodexport_la_LDFLAGS) $(kipiplugin_ipodexport_la_OBJECTS) $(kipiplugin_ipodexport_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -470,37 +507,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_ipodexport.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -511,33 +536,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -546,6 +562,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -557,10 +574,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -583,12 +601,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -602,7 +614,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -620,9 +632,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -642,7 +655,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -667,13 +680,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -709,8 +726,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -766,7 +783,7 @@
+ 	-rm -f  ipodexportdialog.moc.cpp plugin_ipodexport.moc.cpp imagelist.moc.cpp ipodheader.moc.cpp
+ 
+ #>+ 2
+-KDE_DIST=imagelist.h plugin_ipodexport.h ipodlistitem.h ipodexportdialog.h kipiplugin_ipodexport.desktop Makefile.in ipodheader.h imagelistitem.h 
++KDE_DIST=imagelist.h plugin_ipodexport.h ipodlistitem.h ipodexportdialog.h kipiplugin_ipodexport.desktop Makefile.in ipodheader.h imagelistitem.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -775,10 +792,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/ipodexport/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/ipodexport/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/ipodexport/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/ipodexport/Makefile.in
+ 
+ 
 --- kipi-plugins/jpeglossless/Makefile.in
 +++ kipi-plugins/jpeglossless/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,66 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/jpeglossless
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_jpeglossless_la_OBJECTS = plugin_jpeglossless.lo \
++	jpegtransform.lo actionthread.lo utils.lo transupp.lo \
++	imagerotate.lo convert2grayscale.lo imageflip.lo
++#>- kipiplugin_jpeglossless_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_jpeglossless_la_OBJECTS)
++#>+ 3
++kipiplugin_jpeglossless_la_OBJECTS = plugin_jpeglossless.lo \
++	jpegtransform.lo actionthread.lo utils.lo transupp.lo \
++	imagerotate.lo convert2grayscale.lo imageflip.lo
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_jpeglossless_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_jpeglossless_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +147,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +236,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -213,6 +277,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +285,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +297,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +318,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +366,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -332,125 +404,92 @@
  
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_jpeglossless.la
+-
+ kipiplugin_jpeglossless_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+ 	$(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la 
+ 
+-
+ kipiplugin_jpeglossless_la_SOURCES = plugin_jpeglossless.cpp jpegtransform.cpp \
+ 		                             actionthread.cpp utils.cpp transupp.cpp \
+ 		                             imagerotate.cpp convert2grayscale.cpp imageflip.cpp 
+ 
+-
+ kipiplugin_jpeglossless_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
+ 		                            -ljpeg $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ 
+-
+ kipiplugin_jpeglossless_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-
+ kde_services_DATA = kipiplugin_jpeglossless.desktop
+-
+ kipijpeglosslessicondir = $(kde_datadir)/kipiplugin_jpeglossless/icons
+ kipijpeglosslessicon_ICON = AUTO
+-subdir = kipi-plugins/jpeglossless
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_jpeglossless_la_OBJECTS = plugin_jpeglossless.lo \
+-	jpegtransform.lo actionthread.lo utils.lo transupp.lo \
+-	imagerotate.lo convert2grayscale.lo imageflip.lo
+-#>- kipiplugin_jpeglossless_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_jpeglossless_la_OBJECTS)
+-#>+ 3
+-kipiplugin_jpeglossless_la_OBJECTS = plugin_jpeglossless.lo \
+-	jpegtransform.lo actionthread.lo utils.lo transupp.lo \
+-	imagerotate.lo convert2grayscale.lo imageflip.lo
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/actionthread.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/convert2grayscale.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/imageflip.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/imagerotate.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/jpegtransform.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_jpeglossless.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/transupp.Plo ./$(DEPDIR)/utils.Plo
+-#>+ 7
+- at AMDEP_TRUE@DEP_FILES =  ./$(DEPDIR)/actionthread.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/convert2grayscale.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/imageflip.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/imagerotate.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/jpegtransform.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_jpeglossless.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/transupp.Plo ./$(DEPDIR)/utils.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_jpeglossless_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_jpeglossless_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
- .SUFFIXES: .c .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/jpeglossless/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/jpeglossless/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/jpeglossless/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/jpeglossless/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -447,9 +450,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/jpeglossless/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/jpeglossless/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/jpeglossless/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/jpeglossless/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/jpeglossless/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -464,9 +467,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -828,9 +831,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/jpeglossless/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -461,7 +500,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_jpeglossless_la_LDFLAGS) $(kipiplugin_jpeglossless_la_OBJECTS) $(kipiplugin_jpeglossless_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -476,37 +515,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utils.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -517,33 +544,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -552,6 +570,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -563,10 +582,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -589,12 +609,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -608,7 +622,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -626,9 +640,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -648,7 +663,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -673,13 +688,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am: install-kde-icons   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am: install-kde-icons   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -718,8 +737,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -778,7 +797,7 @@
+ 	-rm -f  convert2grayscale.moc imageflip.moc imagerotate.moc plugin_jpeglossless.moc
+ 
+ #>+ 2
+-KDE_DIST=jpegtransform.h kipiplugin_jpeglossless.desktop transupp.h convert2grayscale.h jinclude.h actionthread.h plugin_jpeglossless.h hi32-action-flip.png utils.h imagerotate.h Makefile.in imageflip.h hi32-action-grayscaleconvert.png actions.h jpegint.h mtqueue.h libjpeg62.README 
++KDE_DIST=jpegtransform.h kipiplugin_jpeglossless.desktop transupp.h convert2grayscale.h jinclude.h actionthread.h plugin_jpeglossless.h hi32-action-flip.png utils.h imagerotate.h Makefile.in imageflip.h hi32-action-grayscaleconvert.png actions.h jpegint.h mtqueue.h Makefile.am libjpeg62.README 
+ 
+ #>+ 3
+ clean-closures:
+@@ -797,10 +816,19 @@
+ 	-rm -f $(DESTDIR)$(kipijpeglosslessicondir)/hicolor/32x32/actions/flip.png
+ 	-rm -f $(DESTDIR)$(kipijpeglosslessicondir)/hicolor/32x32/actions/grayscaleconvert.png
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/jpeglossless/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/jpeglossless/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/jpeglossless/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/jpeglossless/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/jpeglossless/Makefile.in
  
  
 --- kipi-plugins/kameraklient/Makefile.in
 +++ kipi-plugins/kameraklient/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,79 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/kameraklient
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_kameraklient_la_OBJECTS = gpiface.lo gpcamera.lo \
++	gpcontroller.lo gpeventfilter.lo gpfileitemcontainer.lo \
++	gpfileiteminfo.lo gpfileiteminfodlg.lo gpmessages.lo \
++	gpstatus.lo kameraklient.lo camerafolderitem.lo \
++	camerafolderview.lo cameraiconitem.lo cameraiconview.lo \
++	cameralist.lo cameraselection.lo cameratype.lo cameraui.lo \
++	dmessagebox.lo savefiledialog.lo setupcamera.lo thumbitem.lo \
++	thumbview.lo
++#>- kipiplugin_kameraklient_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_kameraklient_la_OBJECTS)
++#>+ 11
++kipiplugin_kameraklient_la_final_OBJECTS = kipiplugin_kameraklient_la.all_cpp.lo 
++kipiplugin_kameraklient_la_nofinal_OBJECTS = gpiface.lo gpcamera.lo \
++	gpcontroller.lo gpeventfilter.lo gpfileitemcontainer.lo \
++	gpfileiteminfo.lo gpfileiteminfodlg.lo gpmessages.lo \
++	gpstatus.lo kameraklient.lo camerafolderitem.lo \
++	camerafolderview.lo cameraiconitem.lo cameraiconview.lo \
++	cameralist.lo cameraselection.lo cameratype.lo cameraui.lo \
++	dmessagebox.lo savefiledialog.lo setupcamera.lo thumbitem.lo \
++	thumbview.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_kameraklient_la_OBJECTS = $(kipiplugin_kameraklient_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_kameraklient_la_OBJECTS = $(kipiplugin_kameraklient_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_kameraklient_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_kameraklient_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +160,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +249,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -213,6 +290,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +298,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +310,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +331,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +379,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,16 +408,11 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(GPHOTO_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
+-
+ kde_module_LTLIBRARIES = kipiplugin_kameraklient.la
+ kipiplugin_kameraklient_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+-
+ kipiplugin_kameraklient_la_LIBADD = $(LIB_GPHOTO) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+-
+ kipiplugin_kameraklient_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+-
+ kde_services_DATA = kipiplugin_kameraklient.desktop
  
+ # Gilles Caulier 12/13/06): order of file to compile is important to support --enable-final compilation option.
+@@ -345,166 +425,79 @@
+ 				     dmessagebox.cpp savefiledialog.cpp setupcamera.cpp \
+ 				     thumbitem.cpp thumbview.cpp
+ 
+-
+ kipiplugin_kameraklientdir = $(kde_datadir)/kipiplugin_kameraklient
+-subdir = kipi-plugins/kameraklient
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_kameraklient_la_OBJECTS = gpiface.lo gpcamera.lo \
+-	gpcontroller.lo gpeventfilter.lo gpfileitemcontainer.lo \
+-	gpfileiteminfo.lo gpfileiteminfodlg.lo gpmessages.lo \
+-	gpstatus.lo kameraklient.lo camerafolderitem.lo \
+-	camerafolderview.lo cameraiconitem.lo cameraiconview.lo \
+-	cameralist.lo cameraselection.lo cameratype.lo cameraui.lo \
+-	dmessagebox.lo savefiledialog.lo setupcamera.lo thumbitem.lo \
+-	thumbview.lo
+-#>- kipiplugin_kameraklient_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_kameraklient_la_OBJECTS)
+-#>+ 11
+-kipiplugin_kameraklient_la_final_OBJECTS = kipiplugin_kameraklient_la.all_cpp.lo 
+-kipiplugin_kameraklient_la_nofinal_OBJECTS = gpiface.lo gpcamera.lo \
+-	gpcontroller.lo gpeventfilter.lo gpfileitemcontainer.lo \
+-	gpfileiteminfo.lo gpfileiteminfodlg.lo gpmessages.lo \
+-	gpstatus.lo kameraklient.lo camerafolderitem.lo \
+-	camerafolderview.lo cameraiconitem.lo cameraiconview.lo \
+-	cameralist.lo cameraselection.lo cameratype.lo cameraui.lo \
+-	dmessagebox.lo savefiledialog.lo setupcamera.lo thumbitem.lo \
+-	thumbview.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_kameraklient_la_OBJECTS = $(kipiplugin_kameraklient_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_kameraklient_la_OBJECTS = $(kipiplugin_kameraklient_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/camerafolderitem.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/camerafolderview.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/cameraiconitem.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/cameraiconview.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/cameralist.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/cameraselection.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/cameratype.Plo ./$(DEPDIR)/cameraui.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/dmessagebox.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpcamera.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpcontroller.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpeventfilter.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpfileitemcontainer.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpfileiteminfo.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpfileiteminfodlg.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpiface.Plo ./$(DEPDIR)/gpmessages.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/gpstatus.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/kameraklient.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/savefiledialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/setupcamera.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/thumbitem.Plo ./$(DEPDIR)/thumbview.Plo
+-#>+ 40
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_kameraklient_la.all_cpp.P ./$(DEPDIR)/camerafolderitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/camerafolderview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cameraiconitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cameraiconview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cameralist.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cameraselection.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cameratype.Plo ./$(DEPDIR)/cameraui.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dmessagebox.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpcamera.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpcontroller.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpeventfilter.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpfileitemcontainer.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpfileiteminfo.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpfileiteminfodlg.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpiface.Plo ./$(DEPDIR)/gpmessages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/gpstatus.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kameraklient.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/savefiledialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/setupcamera.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/thumbitem.Plo ./$(DEPDIR)/thumbview.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/camerafolderitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/camerafolderview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cameraiconitem.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cameraiconview.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cameralist.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cameraselection.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cameratype.Plo ./$(DEPDIR)/cameraui.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/dmessagebox.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpcamera.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpcontroller.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpeventfilter.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpfileitemcontainer.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpfileiteminfo.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpfileiteminfodlg.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpiface.Plo ./$(DEPDIR)/gpmessages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/gpstatus.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kameraklient.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/savefiledialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/setupcamera.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/thumbitem.Plo ./$(DEPDIR)/thumbview.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_kameraklient_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_kameraklient_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/kameraklient/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/kameraklient/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/kameraklient/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/kameraklient/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -448,9 +451,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/kameraklient/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/kameraklient/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/kameraklient/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/kameraklient/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/kameraklient/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -465,9 +468,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -909,9 +912,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/kameraklient/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -515,7 +508,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_kameraklient_la_LDFLAGS) $(kipiplugin_kameraklient_la_OBJECTS) $(kipiplugin_kameraklient_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -545,37 +538,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/thumbview.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -586,33 +567,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -621,6 +593,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -632,10 +605,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -658,12 +632,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -677,7 +645,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -695,9 +663,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -717,7 +686,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -742,13 +711,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -784,8 +757,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -922,7 +895,7 @@
+ 	-rm -f  cameralist.moc dmessagebox.moc setupcamera.moc cameraselection.moc gpfileitemcontainer.moc gpeventfilter.moc gpcontroller.moc kameraklient.moc cameraui.moc camerafolderview.moc gpstatus.moc thumbview.moc cameraiconview.moc savefiledialog.moc gpmessages.moc
+ 
+ #>+ 2
+-KDE_DIST=hi48-action-documents.png hi22-action-multimedia.png hi16-action-pictures.png camerafolderitem.h hi48-action-sound.png gpiface.h hi32-action-new.png gpstatus.h gpfileiteminfo.h gpcommand.h hi22-action-sound.png cameraiconitem.h hi16-action-documents.png hi48-action-pictures.png thumbview.h hi32-action-sound.png cameraiconview.h kipiplugin_kameraklient.desktop gpcontroller.h thumbitem.h gpfileiteminfodlg.h hi16-action-new.png hi22-action-documents.png cameraselection.h savefiledialog.h hi16-action-generic.png hi48-action-new.png hi48-action-generic.png hi16-action-multimedia.png setupcamera.h hi16-action-sound.png dmessagebox.h hi32-action-generic.png gpcamera.h camerafolderview.h hi32-action-pictures.png cameratype.h hi48-action-multimedia.png gpmessages.h hi32-action-multimedia.png mtlist.h kameraklient.h Makefile.in cameralist.h hi22-action-generic.png cameraui.h hi22-action-pictures.png hi22-action-new.png hi32-action-documents.png gpeventfilter.h gpevents.h gpfileitemcontainer.h mtqueue.h 
++KDE_DIST=hi48-action-documents.png hi22-action-multimedia.png hi16-action-pictures.png camerafolderitem.h hi48-action-sound.png gpiface.h hi32-action-new.png gpstatus.h gpfileiteminfo.h gpcommand.h hi22-action-sound.png cameraiconitem.h hi16-action-documents.png hi48-action-pictures.png thumbview.h hi32-action-sound.png cameraiconview.h kipiplugin_kameraklient.desktop gpcontroller.h thumbitem.h gpfileiteminfodlg.h hi16-action-new.png hi22-action-documents.png cameraselection.h savefiledialog.h hi16-action-generic.png hi48-action-new.png hi48-action-generic.png hi16-action-multimedia.png setupcamera.h hi16-action-sound.png dmessagebox.h hi32-action-generic.png gpcamera.h camerafolderview.h hi32-action-pictures.png cameratype.h hi48-action-multimedia.png gpmessages.h hi32-action-multimedia.png mtlist.h kameraklient.h Makefile.in cameralist.h hi22-action-generic.png cameraui.h hi22-action-pictures.png hi22-action-new.png hi32-action-documents.png gpeventfilter.h gpevents.h gpfileitemcontainer.h mtqueue.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -931,10 +904,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/kameraklient/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/kameraklient/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/kameraklient/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/kameraklient/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/kameraklient/Makefile.in
  
  
---- kipi-plugins/Makefile.in
-+++ kipi-plugins/Makefile.in
-@@ -217,6 +217,9 @@
+--- kipi-plugins/metadataedit/Makefile.in
++++ kipi-plugins/metadataedit/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,77 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/metadataedit
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_metadataedit_la_OBJECTS = plugin_metadataedit.lo \
++	metadatacheckbox.lo exifeditdialog.lo exifcaption.lo \
++	exifdatetime.lo exifadjust.lo exiflens.lo exifdevice.lo \
++	exiflight.lo iptceditdialog.lo iptccaption.lo iptcsubjects.lo \
++	iptccredits.lo iptcstatus.lo iptcorigin.lo iptcdatetime.lo \
++	iptckeywords.lo iptccategories.lo commenteditdialog.lo \
++	commentremovedialog.lo
++#>- kipiplugin_metadataedit_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_metadataedit_la_OBJECTS)
++#>+ 10
++kipiplugin_metadataedit_la_final_OBJECTS = kipiplugin_metadataedit_la.all_cpp.lo 
++kipiplugin_metadataedit_la_nofinal_OBJECTS = plugin_metadataedit.lo \
++	metadatacheckbox.lo exifeditdialog.lo exifcaption.lo \
++	exifdatetime.lo exifadjust.lo exiflens.lo exifdevice.lo \
++	exiflight.lo iptceditdialog.lo iptccaption.lo iptcsubjects.lo \
++	iptccredits.lo iptcstatus.lo iptcorigin.lo iptcdatetime.lo \
++	iptckeywords.lo iptccategories.lo commenteditdialog.lo \
++	commentremovedialog.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_metadataedit_la_OBJECTS = $(kipiplugin_metadataedit_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_metadataedit_la_OBJECTS = $(kipiplugin_metadataedit_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_metadataedit_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_metadataedit_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +158,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +247,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am  all-recursive
+@@ -213,6 +288,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +296,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +308,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +329,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +377,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,12 +406,10 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_metadataedit.la
+-
+ kipiplugin_metadataedit_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+ 	$(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la 
+ 
+@@ -346,11 +427,11 @@
+ 
+ # Libs needed by the plugin
+ kipiplugin_metadataedit_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
+-	       $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KDECORE) $(LIB_QT)
++	       -lkipiplugins $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ 
+ 
+ # LD flags for the plugin
+-kipiplugin_metadataedit_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
++kipiplugin_metadataedit_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries)
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_metadataedit.desktop
+@@ -358,159 +439,78 @@
+ # Icons set for the plugin.
+ kipiplugin_metadataediticondir = $(kde_datadir)/kipiplugin_metadataedit/icons
+ kipiplugin_metadataediticon_ICON = AUTO
+-subdir = kipi-plugins/metadataedit
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_metadataedit_la_OBJECTS = plugin_metadataedit.lo \
+-	metadatacheckbox.lo exifeditdialog.lo exifcaption.lo \
+-	exifdatetime.lo exifadjust.lo exiflens.lo exifdevice.lo \
+-	exiflight.lo iptceditdialog.lo iptccaption.lo iptcsubjects.lo \
+-	iptccredits.lo iptcstatus.lo iptcorigin.lo iptcdatetime.lo \
+-	iptckeywords.lo iptccategories.lo commenteditdialog.lo \
+-	commentremovedialog.lo
+-#>- kipiplugin_metadataedit_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_metadataedit_la_OBJECTS)
+-#>+ 10
+-kipiplugin_metadataedit_la_final_OBJECTS = kipiplugin_metadataedit_la.all_cpp.lo 
+-kipiplugin_metadataedit_la_nofinal_OBJECTS = plugin_metadataedit.lo \
+-	metadatacheckbox.lo exifeditdialog.lo exifcaption.lo \
+-	exifdatetime.lo exifadjust.lo exiflens.lo exifdevice.lo \
+-	exiflight.lo iptceditdialog.lo iptccaption.lo iptcsubjects.lo \
+-	iptccredits.lo iptcstatus.lo iptcorigin.lo iptcdatetime.lo \
+-	iptckeywords.lo iptccategories.lo commenteditdialog.lo \
+-	commentremovedialog.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_metadataedit_la_OBJECTS = $(kipiplugin_metadataedit_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_metadataedit_la_OBJECTS = $(kipiplugin_metadataedit_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/commenteditdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/commentremovedialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/exifadjust.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/exifcaption.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/exifdatetime.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/exifdevice.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/exifeditdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/exiflens.Plo ./$(DEPDIR)/exiflight.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iptccaption.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iptccategories.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iptccredits.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iptcdatetime.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iptceditdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iptckeywords.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iptcorigin.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iptcstatus.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iptcsubjects.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/metadatacheckbox.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_metadataedit.Plo
+-#>+ 38
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_metadataedit_la.all_cpp.P ./$(DEPDIR)/commenteditdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/commentremovedialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/exifadjust.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/exifcaption.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/exifdatetime.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/exifdevice.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/exifeditdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/exiflens.Plo ./$(DEPDIR)/exiflight.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iptccaption.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iptccategories.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iptccredits.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iptcdatetime.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iptceditdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iptckeywords.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iptcorigin.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iptcstatus.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iptcsubjects.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/metadatacheckbox.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_metadataedit.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/commenteditdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/commentremovedialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/exifadjust.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/exifcaption.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/exifdatetime.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/exifdevice.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/exifeditdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/exiflens.Plo ./$(DEPDIR)/exiflight.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iptccaption.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iptccategories.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iptccredits.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iptcdatetime.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iptceditdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iptckeywords.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iptcorigin.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iptcstatus.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iptcsubjects.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/metadatacheckbox.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_metadataedit.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_metadataedit_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_metadataedit_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -407,9 +410,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/Makefile'; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/metadataedit/Makefile'; \
  #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/Makefile
-+#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -419,9 +422,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/Makefile'; \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/metadataedit/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/metadataedit/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/metadataedit/Makefile'; \
  	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/Makefile
-+	  $(AUTOMAKE) --foreign  kipi-plugins/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -436,9 +439,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-	  $(AUTOMAKE) --gnu  kipi-plugins/metadataedit/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/metadataedit/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/metadataedit/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
  
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -521,7 +521,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_metadataedit_la_LDFLAGS) $(kipiplugin_metadataedit_la_OBJECTS) $(kipiplugin_metadataedit_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -548,37 +548,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_metadataedit.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
  mostlyclean-libtool:
-@@ -770,9 +773,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/Makefile
-+	  $(AUTOMAKE) --foreign  kipi-plugins/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/Makefile.in
+ 	-rm -f *.lo
+@@ -589,33 +577,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
  
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
  
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -624,6 +603,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -635,10 +615,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -661,12 +642,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -680,7 +655,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -698,9 +673,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -720,7 +696,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -745,13 +721,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -787,8 +767,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -960,7 +940,7 @@
+ 	-rm -f  exifdatetime.moc commenteditdialog.moc exifadjust.moc iptcdatetime.moc exifdevice.moc exiflight.moc iptccategories.moc iptccredits.moc exifcaption.moc exifeditdialog.moc iptcorigin.moc iptccaption.moc commentremovedialog.moc metadatacheckbox.moc iptceditdialog.moc exiflens.moc plugin_metadataedit.moc iptcsubjects.moc iptckeywords.moc iptcstatus.moc
+ 
+ #>+ 2
+-KDE_DIST=commentremovedialog.h commenteditdialog.h exifdevice.h kipiplugin_metadataedit.desktop plugin_metadataedit.h iptcsubjects.h iptcdatetime.h exifeditdialog.h iptcorigin.h iptceditdialog.h iptckeywords.h iptccaption.h exifadjust.h exifdatetime.h Makefile.in iptccredits.h exifcaption.h iptcstatus.h metadatacheckbox.h exiflight.h exiflens.h iptccategories.h 
++KDE_DIST=commentremovedialog.h commenteditdialog.h exifdevice.h kipiplugin_metadataedit.desktop plugin_metadataedit.h iptcsubjects.h iptcdatetime.h exifeditdialog.h iptcorigin.h iptceditdialog.h iptckeywords.h iptccaption.h exifadjust.h exifdatetime.h Makefile.in iptccredits.h exifcaption.h iptcstatus.h metadatacheckbox.h Makefile.am exiflight.h exiflens.h iptccategories.h 
+ 
+ #>+ 3
+ clean-closures:
+@@ -969,10 +949,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/metadataedit/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/metadataedit/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/metadataedit/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/metadataedit/Makefile.in
+ 
+ 
 --- kipi-plugins/mpegencoder/Makefile.in
 +++ kipi-plugins/mpegencoder/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+ 
+ @SET_MAKE@
+ 
++
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +24,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +40,74 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/mpegencoder
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
++	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_mpegencoder_la_OBJECTS = plugin_mpegencoder.lo \
++	kimg2mpg.lo kshowdebuggingoutput.lo optionsdialog.lo \
++	checkbinprog.lo
++#>- kipiplugin_mpegencoder_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_mpegencoder_la_OBJECTS)
++#>+ 6
++kipiplugin_mpegencoder_la_final_OBJECTS = kipiplugin_mpegencoder_la.all_cpp.lo 
++kipiplugin_mpegencoder_la_nofinal_OBJECTS = plugin_mpegencoder.lo \
++	kimg2mpg.lo kshowdebuggingoutput.lo optionsdialog.lo \
++	checkbinprog.lo kimg2mpgbase.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_mpegencoder_la_OBJECTS = $(kipiplugin_mpegencoder_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_mpegencoder_la_OBJECTS = $(kipiplugin_mpegencoder_la_final_OBJECTS)
++binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
++SCRIPTS = $(bin_SCRIPTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_mpegencoder_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_mpegencoder_la_SOURCES)
++man1dir = $(mandir)/man1
++NROFF = nroff
++MANS = $(man_MANS)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +156,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +245,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -213,6 +286,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +294,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +306,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +327,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +375,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,7 +404,6 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+@@ -351,112 +431,78 @@
+ ####### This script name should probably be more 'namespaced'. Think about distros putting everything in /usr/bin...
+ bin_SCRIPTS = images2mpg
+ man_MANS = images2mpg.1
+-subdir = kipi-plugins/mpegencoder
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_mpegencoder_la_OBJECTS = plugin_mpegencoder.lo kimg2mpg.lo \
+-	kshowdebuggingoutput.lo optionsdialog.lo checkbinprog.lo
+-#>- kipiplugin_mpegencoder_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_mpegencoder_la_OBJECTS)
+-#>+ 5
+-kipiplugin_mpegencoder_la_final_OBJECTS = kipiplugin_mpegencoder_la.all_cpp.lo 
+-kipiplugin_mpegencoder_la_nofinal_OBJECTS = plugin_mpegencoder.lo kimg2mpg.lo \
+-	kshowdebuggingoutput.lo optionsdialog.lo checkbinprog.lo kimg2mpgbase.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_mpegencoder_la_OBJECTS = $(kipiplugin_mpegencoder_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_mpegencoder_la_OBJECTS = $(kipiplugin_mpegencoder_la_final_OBJECTS)
+-SCRIPTS = $(bin_SCRIPTS)
+-
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/checkbinprog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/kimg2mpg.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/kshowdebuggingoutput.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/optionsdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_mpegencoder.Plo
+-#>+ 10
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/kimg2mpgbase.P  $(DEPDIR)/kipiplugin_mpegencoder_la.all_cpp.P ./$(DEPDIR)/checkbinprog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kimg2mpg.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kshowdebuggingoutput.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/optionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_mpegencoder.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/kimg2mpgbase.P ./$(DEPDIR)/checkbinprog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kimg2mpg.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kshowdebuggingoutput.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/optionsdialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_mpegencoder.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_mpegencoder_la_SOURCES)
+-
+-NROFF = nroff
+-MANS = $(man_MANS)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_mpegencoder_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -439,9 +442,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/mpegencoder/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/mpegencoder/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/mpegencoder/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/mpegencoder/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -451,9 +454,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/mpegencoder/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/mpegencoder/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/mpegencoder/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/mpegencoder/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/mpegencoder/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -468,9 +471,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -893,9 +896,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/mpegencoder/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -465,16 +511,15 @@
+ @KDE_USE_CLOSURE_TRUE at kipiplugin_mpegencoder.la: kipiplugin_mpegencoder.la.closure $(kipiplugin_mpegencoder_la_OBJECTS) $(kipiplugin_mpegencoder_la_DEPENDENCIES) 
+ @KDE_USE_CLOSURE_FALSE at kipiplugin_mpegencoder.la: $(kipiplugin_mpegencoder_la_OBJECTS) $(kipiplugin_mpegencoder_la_DEPENDENCIES) 
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_mpegencoder_la_LDFLAGS) $(kipiplugin_mpegencoder_la_OBJECTS) $(kipiplugin_mpegencoder_la_LIBADD) $(LIBS)
+-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+ 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
+-	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
++	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -482,12 +527,12 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+-	  rm -f $(DESTDIR)$(bindir)/$$f; \
++	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ 	done
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -499,37 +544,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_mpegencoder.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -540,11 +573,9 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-
+-man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
++	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -563,8 +594,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
++	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
++	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -584,36 +615,27 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+-	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
++	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
++	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -622,6 +644,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -633,10 +656,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -659,12 +683,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -678,7 +696,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -696,9 +714,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -718,7 +737,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -743,15 +762,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+-#>- 	install-man
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA install-man
+ #>+ 2
+-install-data-am:   install-kde_servicesDATA \
+-	install-man
++install-data-am:   \
++	install-kde_servicesDATA install-man
+ 
+ #>- install-exec-am: install-binSCRIPTS
+ #>+ 1
+@@ -790,17 +811,18 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-binSCRIPTS install-data install-data-am \
+-	install-exec install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+-	install-man install-man1 install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binSCRIPTS \
+-	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kde_servicesDATA uninstall-man uninstall-man1
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-binSCRIPTS install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-kde_moduleLTLIBRARIES \
++	install-kde_servicesDATA install-man install-man1 \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-binSCRIPTS uninstall-info-am \
++	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA \
++	uninstall-man uninstall-man1
+ 
+ 
+ # i18n translation messages
+@@ -859,7 +881,7 @@
+ 	-rm -f  plugin_mpegencoder.moc kimg2mpg.moc kshowdebuggingoutput.moc checkbinprog.moc optionsdialog.moc
+ 
+ #>+ 2
+-KDE_DIST=optionsdialog.h checkbinprog.h kimg2mpg.h plugin_mpegencoder.h images2mpg.1 kipiplugin_mpegencoder.desktop images2mpg kshowdebuggingoutput.h Makefile.in kimg2mpgbase.ui 
++KDE_DIST=optionsdialog.h checkbinprog.h kimg2mpg.h plugin_mpegencoder.h images2mpg.1 kipiplugin_mpegencoder.desktop images2mpg kshowdebuggingoutput.h Makefile.in kimg2mpgbase.ui Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+@@ -873,10 +895,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/mpegencoder/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/mpegencoder/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/mpegencoder/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/mpegencoder/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/mpegencoder/Makefile.in
  
  
 --- kipi-plugins/printwizard/Makefile.in
 +++ kipi-plugins/printwizard/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,67 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/printwizard
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_printwizard_la_OBJECTS = plugin_printwizard.lo \
++	frmprintwizard.lo cropframe.lo tphoto.lo utils.lo
++#>- kipiplugin_printwizard_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_printwizard_la_OBJECTS)
++#>+ 5
++kipiplugin_printwizard_la_final_OBJECTS = kipiplugin_printwizard_la.all_cpp.lo 
++kipiplugin_printwizard_la_nofinal_OBJECTS = plugin_printwizard.lo \
++	frmprintwizard.lo cropframe.lo tphoto.lo utils.lo frmprintwizardbase.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_printwizard_la_OBJECTS = $(kipiplugin_printwizard_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_printwizard_la_OBJECTS = $(kipiplugin_printwizard_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_printwizard_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_printwizard_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +148,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -213,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +286,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +298,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +319,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +367,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,7 +396,6 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+@@ -335,108 +407,80 @@
+ 
+ #LIBKIPI_LIBS = $(top_builddir)/libkipi/libkipi/libkipi.la
+ kipiplugin_printwizard_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+-
+ kipiplugin_printwizard_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+-
+ kde_services_DATA = kipiplugin_printwizard.desktop
+-subdir = kipi-plugins/printwizard
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_printwizard_la_OBJECTS = plugin_printwizard.lo \
+-	frmprintwizard.lo cropframe.lo tphoto.lo utils.lo
+-#>- kipiplugin_printwizard_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_printwizard_la_OBJECTS)
+-#>+ 5
+-kipiplugin_printwizard_la_final_OBJECTS = kipiplugin_printwizard_la.all_cpp.lo 
+-kipiplugin_printwizard_la_nofinal_OBJECTS = plugin_printwizard.lo \
+-	frmprintwizard.lo cropframe.lo tphoto.lo utils.lo frmprintwizardbase.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_printwizard_la_OBJECTS = $(kipiplugin_printwizard_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_printwizard_la_OBJECTS = $(kipiplugin_printwizard_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/cropframe.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/frmprintwizard.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_printwizard.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/tphoto.Plo ./$(DEPDIR)/utils.Plo
+-#>+ 8
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/frmprintwizardbase.P  $(DEPDIR)/kipiplugin_printwizard_la.all_cpp.P ./$(DEPDIR)/cropframe.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/frmprintwizard.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_printwizard.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/tphoto.Plo ./$(DEPDIR)/utils.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/frmprintwizardbase.P ./$(DEPDIR)/cropframe.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/frmprintwizard.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_printwizard.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/tphoto.Plo ./$(DEPDIR)/utils.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_printwizard_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_printwizard_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -421,9 +424,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/printwizard/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/printwizard/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/printwizard/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/printwizard/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -433,9 +436,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/printwizard/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/printwizard/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/printwizard/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/printwizard/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/printwizard/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -450,9 +453,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -796,9 +799,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/printwizard/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -447,7 +491,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_printwizard_la_LDFLAGS) $(kipiplugin_printwizard_la_OBJECTS) $(kipiplugin_printwizard_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -459,37 +503,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utils.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -500,33 +532,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -535,6 +558,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -546,10 +570,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -572,12 +597,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -591,7 +610,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -609,9 +628,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -631,7 +651,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -656,13 +676,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -698,8 +722,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -751,7 +775,7 @@
+ 	-rm -f  plugin_printwizard.moc cropframe.moc frmprintwizard.moc
+ 
+ #>+ 2
+-KDE_DIST=frmprintwizardbase.ui cropframe.h kipiplugin_printwizard.desktop utils.h Makefile.in tphoto.h frmprintwizard.h plugin_printwizard.h 
++KDE_DIST=frmprintwizardbase.ui cropframe.h kipiplugin_printwizard.desktop utils.h Makefile.in tphoto.h frmprintwizard.h Makefile.am plugin_printwizard.h 
+ 
+ #>+ 4
+ clean-ui:
+@@ -765,10 +789,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/printwizard/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/printwizard/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/printwizard/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/printwizard/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/printwizard/Makefile.in
  
  
 --- kipi-plugins/rawconverter/Makefile.in
 +++ kipi-plugins/rawconverter/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+ 
+ @SET_MAKE@
+ 
++
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +24,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +40,99 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++bin_PROGRAMS = kipidcraw$(EXEEXT)
++subdir = kipi-plugins/rawconverter
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_rawconverter_la_OBJECTS = plugin_rawconverter.lo \
++	dcrawiface.lo savesettingswidget.lo batchdialog.lo \
++	actionthread.lo dcrawsettingswidget.lo singledialog.lo \
++	previewwidget.lo iccjpeg.lo dcrawbinary.lo
++#>- kipiplugin_rawconverter_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_rawconverter_la_OBJECTS)
++#>+ 4
++kipiplugin_rawconverter_la_OBJECTS = plugin_rawconverter.lo \
++	dcrawiface.lo savesettingswidget.lo batchdialog.lo \
++	actionthread.lo dcrawsettingswidget.lo singledialog.lo \
++	previewwidget.lo iccjpeg.lo dcrawbinary.lo
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++PROGRAMS = $(bin_PROGRAMS)
++am_kipidcraw_OBJECTS = kipidcraw-dcraw.$(OBJEXT)
++#>- kipidcraw_OBJECTS = $(am_kipidcraw_OBJECTS)
++#>+ 1
++kipidcraw_OBJECTS = kipidcraw-dcraw.$(OBJEXT)
++kipidcraw_LDADD = $(LDADD)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_rawconverter_la_SOURCES) $(kipidcraw_SOURCES)
++DIST_SOURCES = $(kipiplugin_rawconverter_la_SOURCES) \
++	$(kipidcraw_SOURCES)
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +181,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +270,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -213,6 +311,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +319,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +331,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +352,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +400,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -326,15 +432,12 @@
+ # Requires by dcraw.c implementation.
+ # Require by dcraw implementation
+ KDE_OPTIONS = nofinal
+-
+ #>- METASOURCES = AUTO
+ SUBDIRS = profiles
+-
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
  
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_rawconverter.la
+-
+ kipiplugin_rawconverter_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+ 	$(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la 
+ 
+@@ -356,168 +459,86 @@
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_rawconverter.desktop
+-
+ kipirawconvertericondir = $(kde_datadir)/kipiplugin_rawconverter/icons
+ kipirawconvertericon_ICON = AUTO
+ 
+-
+-#-- dcraw binary -------------------------------------------------
+-
+-# RawConverter plugin use a dedicaced dcraw binary program to run. This is mandatory 
+-# since dcraw author have broken the command line options 
+-# compatibility with the 8.x serie.
+-# Also, dcraw is not available like a library.
+-# The dcraw.c source code is just a copy of official implementation, but 
+-# this one have been completly tested with this plugin. 
+-# Note: dcraw project page is http://cybercom.net/~dcoffin
+-bin_PROGRAMS = kipidcraw
+-
+ # This line is require to disable color management support (using LCMS library) witch 
+ # is not yet supported by plugin.
+ kipidcraw_CFLAGS = -DNO_LCMS -w 
+-
+ kipidcraw_SOURCES = dcraw.c
+-
+ kipidcraw_LDFLAGS = $(all_libraries) $(LIBJPEG) -lm
+-subdir = kipi-plugins/rawconverter
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_rawconverter_la_OBJECTS = plugin_rawconverter.lo \
+-	dcrawiface.lo savesettingswidget.lo batchdialog.lo \
+-	actionthread.lo dcrawsettingswidget.lo singledialog.lo \
+-	previewwidget.lo iccjpeg.lo dcrawbinary.lo
+-#>- kipiplugin_rawconverter_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_rawconverter_la_OBJECTS)
+-#>+ 4
+-kipiplugin_rawconverter_la_OBJECTS = plugin_rawconverter.lo \
+-	dcrawiface.lo savesettingswidget.lo batchdialog.lo \
+-	actionthread.lo dcrawsettingswidget.lo singledialog.lo \
+-	previewwidget.lo iccjpeg.lo dcrawbinary.lo
+-bin_PROGRAMS = kipidcraw$(EXEEXT)
+-PROGRAMS = $(bin_PROGRAMS)
+-
+-am_kipidcraw_OBJECTS = kipidcraw-dcraw.$(OBJEXT)
+-#>- kipidcraw_OBJECTS = $(am_kipidcraw_OBJECTS)
+-#>+ 1
+-kipidcraw_OBJECTS = kipidcraw-dcraw.$(OBJEXT)
+-kipidcraw_LDADD = $(LDADD)
+-kipidcraw_DEPENDENCIES =
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/actionthread.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/batchdialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/dcrawbinary.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/dcrawiface.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/dcrawsettingswidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/iccjpeg.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/kipidcraw-dcraw.Po \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_rawconverter.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/previewwidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/savesettingswidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/singledialog.Plo
+-#>+ 11
+- at AMDEP_TRUE@DEP_FILES =  ./$(DEPDIR)/actionthread.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/batchdialog.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dcrawbinary.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dcrawiface.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dcrawsettingswidget.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iccjpeg.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kipidcraw-dcraw.Po \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_rawconverter.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/previewwidget.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/savesettingswidget.Plo \
+- at AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/singledialog.Plo
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_rawconverter_la_SOURCES) \
+-	$(kipidcraw_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+-SOURCES = $(kipiplugin_rawconverter_la_SOURCES) $(kipidcraw_SOURCES)
+-
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+ .SUFFIXES: .c .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -460,9 +463,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/rawconverter/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -477,9 +480,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -928,9 +931,9 @@
- 	      exit 1;; \
- 	  esac; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -526,18 +547,17 @@
+ @KDE_USE_CLOSURE_TRUE at kipiplugin_rawconverter.la: kipiplugin_rawconverter.la.closure $(kipiplugin_rawconverter_la_OBJECTS) $(kipiplugin_rawconverter_la_DEPENDENCIES) 
+ @KDE_USE_CLOSURE_FALSE at kipiplugin_rawconverter.la: $(kipiplugin_rawconverter_la_OBJECTS) $(kipiplugin_rawconverter_la_DEPENDENCIES) 
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_rawconverter_la_LDFLAGS) $(kipiplugin_rawconverter_la_OBJECTS) $(kipiplugin_rawconverter_la_LIBADD) $(LIBS)
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -545,8 +565,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+-	  rm -f $(DESTDIR)$(bindir)/$$f; \
++	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -560,7 +580,7 @@
+ 	$(LINK) $(kipidcraw_LDFLAGS) $(kipidcraw_OBJECTS) $(kipidcraw_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -578,103 +598,60 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/singledialog.Plo at am__quote@
+ 
+ .c.o:
+- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@	fi
++ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@	fi
++ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ .c.lo:
+- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@	fi
++ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ kipidcraw-dcraw.o: dcraw.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kipidcraw_CFLAGS) $(CFLAGS) -MT kipidcraw-dcraw.o -MD -MP -MF "$(DEPDIR)/kipidcraw-dcraw.Tpo" \
+- at am__fastdepCC_TRUE@	  -c -o kipidcraw-dcraw.o `test -f 'dcraw.c' || echo '$(srcdir)/'`dcraw.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kipidcraw-dcraw.Tpo" "$(DEPDIR)/kipidcraw-dcraw.Po"; \
+- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/kipidcraw-dcraw.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@	fi
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kipidcraw_CFLAGS) $(CFLAGS) -MT kipidcraw-dcraw.o -MD -MP -MF "$(DEPDIR)/kipidcraw-dcraw.Tpo" -c -o kipidcraw-dcraw.o `test -f 'dcraw.c' || echo '$(srcdir)/'`dcraw.c; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kipidcraw-dcraw.Tpo" "$(DEPDIR)/kipidcraw-dcraw.Po"; else rm -f "$(DEPDIR)/kipidcraw-dcraw.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dcraw.c' object='kipidcraw-dcraw.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/kipidcraw-dcraw.Po' tmpdepfile='$(DEPDIR)/kipidcraw-dcraw.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kipidcraw_CFLAGS) $(CFLAGS) -c -o kipidcraw-dcraw.o `test -f 'dcraw.c' || echo '$(srcdir)/'`dcraw.c
+ 
+ kipidcraw-dcraw.obj: dcraw.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kipidcraw_CFLAGS) $(CFLAGS) -MT kipidcraw-dcraw.obj -MD -MP -MF "$(DEPDIR)/kipidcraw-dcraw.Tpo" \
+- at am__fastdepCC_TRUE@	  -c -o kipidcraw-dcraw.obj `if test -f 'dcraw.c'; then $(CYGPATH_W) 'dcraw.c'; else $(CYGPATH_W) '$(srcdir)/dcraw.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kipidcraw-dcraw.Tpo" "$(DEPDIR)/kipidcraw-dcraw.Po"; \
+- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/kipidcraw-dcraw.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@	fi
++ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kipidcraw_CFLAGS) $(CFLAGS) -MT kipidcraw-dcraw.obj -MD -MP -MF "$(DEPDIR)/kipidcraw-dcraw.Tpo" -c -o kipidcraw-dcraw.obj `if test -f 'dcraw.c'; then $(CYGPATH_W) 'dcraw.c'; else $(CYGPATH_W) '$(srcdir)/dcraw.c'; fi`; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kipidcraw-dcraw.Tpo" "$(DEPDIR)/kipidcraw-dcraw.Po"; else rm -f "$(DEPDIR)/kipidcraw-dcraw.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dcraw.c' object='kipidcraw-dcraw.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/kipidcraw-dcraw.Po' tmpdepfile='$(DEPDIR)/kipidcraw-dcraw.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kipidcraw_CFLAGS) $(CFLAGS) -c -o kipidcraw-dcraw.obj `if test -f 'dcraw.c'; then $(CYGPATH_W) 'dcraw.c'; else $(CYGPATH_W) '$(srcdir)/dcraw.c'; fi`
+ 
+-kipidcraw-dcraw.lo: dcraw.c
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kipidcraw_CFLAGS) $(CFLAGS) -MT kipidcraw-dcraw.lo -MD -MP -MF "$(DEPDIR)/kipidcraw-dcraw.Tpo" \
+- at am__fastdepCC_TRUE@	  -c -o kipidcraw-dcraw.lo `test -f 'dcraw.c' || echo '$(srcdir)/'`dcraw.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/kipidcraw-dcraw.Tpo" "$(DEPDIR)/kipidcraw-dcraw.Plo"; \
+- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/kipidcraw-dcraw.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@	fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dcraw.c' object='kipidcraw-dcraw.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/kipidcraw-dcraw.Plo' tmpdepfile='$(DEPDIR)/kipidcraw-dcraw.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kipidcraw_CFLAGS) $(CFLAGS) -c -o kipidcraw-dcraw.lo `test -f 'dcraw.c' || echo '$(srcdir)/'`dcraw.c
+-
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -685,23 +662,22 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -711,7 +687,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -723,7 +705,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -731,7 +713,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -752,7 +740,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -763,14 +751,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -779,19 +759,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -801,10 +784,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -827,12 +811,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -846,7 +824,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -861,15 +839,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -879,8 +859,9 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(bindir) $(DESTDIR)$(kde_servicesdir)
+-
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -900,7 +881,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -925,13 +906,17 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am: install-kde-icons   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am: install-kde-icons   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am: install-binPROGRAMS
+ #>+ 1
+@@ -969,26 +954,23 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
+-	clean-libtool clean-recursive ctags ctags-recursive distclean \
+-	distclean-compile distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-binPROGRAMS install-data install-data-am \
+-	install-data-recursive install-exec install-exec-am \
+-	install-exec-recursive install-info install-info-am \
+-	install-info-recursive install-kde_moduleLTLIBRARIES \
+-	install-kde_servicesDATA install-man install-recursive \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am installdirs-recursive maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
+-	ps-recursive tags tags-recursive uninstall uninstall-am \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-binPROGRAMS clean-generic \
++	clean-kde_moduleLTLIBRARIES clean-libtool clean-recursive \
++	ctags ctags-recursive distclean distclean-compile \
++	distclean-generic distclean-libtool distclean-recursive \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-binPROGRAMS install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-kde_moduleLTLIBRARIES \
++	install-kde_servicesDATA install-man install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic \
++	maintainer-clean-recursive mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-kde_servicesDATA uninstall-recursive
++	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA
+ 
+ 
+ messages: rc.cpp
+@@ -1067,7 +1049,7 @@
+ 	-rm -f  dcrawiface.moc dcrawbinary.moc batchdialog.moc plugin_rawconverter.moc dcrawsettingswidget.moc previewwidget.moc savesettingswidget.moc singledialog.moc
+ 
+ #>+ 2
+-KDE_DIST=dcrawsettingswidget.h savesettingswidget.h singledialog.h actionthread.h kipiplugin_rawconverter.desktop hi32-action-rawconverterbatch.png dcrawbinary.h hi32-action-rawconvertersingle.png actions.h rawdecodingsettings.h plugin_rawconverter.h iccjpeg.h previewwidget.h clistviewitem.h dcrawiface.h Makefile.in batchdialog.h mtqueue.h 
++KDE_DIST=dcrawsettingswidget.h savesettingswidget.h singledialog.h actionthread.h kipiplugin_rawconverter.desktop hi32-action-rawconverterbatch.png dcrawbinary.h hi32-action-rawconvertersingle.png actions.h rawdecodingsettings.h plugin_rawconverter.h iccjpeg.h previewwidget.h clistviewitem.h dcrawiface.h Makefile.in batchdialog.h mtqueue.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -1086,10 +1068,19 @@
+ 	-rm -f $(DESTDIR)$(kipirawconvertericondir)/hicolor/32x32/actions/rawconvertersingle.png
+ 	-rm -f $(DESTDIR)$(kipirawconvertericondir)/hicolor/32x32/actions/rawconverterbatch.png
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/rawconverter/Makefile.in
  
  
+--- kipi-plugins/rawconverter/profiles/Makefile.in
++++ kipi-plugins/rawconverter/profiles/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -22,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +38,30 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/rawconverter/profiles
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kipirawconverterprofilesdir)"
++kipirawconverterprofilesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kipirawconverterprofiles_DATA)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +110,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +199,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +240,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +248,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +260,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +281,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +329,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,29 +359,53 @@
+ xdg_menudir = @xdg_menudir@
+ kipirawconverterprofilesdir = $(kde_datadir)/kipiplugin_rawconverter/profiles
+ kipirawconverterprofiles_DATA = adobergb.icm srgb.icm widegamut.icm prophoto.icm
+-subdir = kipi-plugins/rawconverter/profiles
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-DATA = $(kipirawconverterprofiles_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/profiles/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/profiles/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/profiles/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/profiles/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/profiles/Makefile
++	  $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/profiles/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/rawconverter/profiles/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -357,23 +416,22 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kipirawconverterprofilesDATA_INSTALL = $(INSTALL_DATA)
+ install-kipirawconverterprofilesDATA: $(kipirawconverterprofiles_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kipirawconverterprofilesdir)
++	test -z "$(kipirawconverterprofilesdir)" || $(mkdir_p) "$(DESTDIR)$(kipirawconverterprofilesdir)"
+ 	@list='$(kipirawconverterprofiles_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kipirawconverterprofilesDATA_INSTALL) $$d$$p $(DESTDIR)$(kipirawconverterprofilesdir)/$$f"; \
+-	  $(kipirawconverterprofilesDATA_INSTALL) $$d$$p $(DESTDIR)$(kipirawconverterprofilesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kipirawconverterprofilesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipirawconverterprofilesdir)/$$f'"; \
++	  $(kipirawconverterprofilesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipirawconverterprofilesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kipirawconverterprofilesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kipirawconverterprofiles_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kipirawconverterprofilesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kipirawconverterprofilesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kipirawconverterprofilesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kipirawconverterprofilesdir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -381,12 +439,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -400,7 +452,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -418,9 +470,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kipirawconverterprofilesdir)
++	for dir in "$(DESTDIR)$(kipirawconverterprofilesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -440,7 +493,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -461,6 +514,8 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+@@ -495,29 +550,38 @@
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+-	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-kipirawconverterprofilesDATA \
+-	install-man install-strip installcheck installcheck-am \
+-	installdirs maintainer-clean maintainer-clean-generic \
+-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+-	ps ps-am uninstall uninstall-am uninstall-info-am \
+-	uninstall-kipirawconverterprofilesDATA
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am \
++	install-kipirawconverterprofilesDATA install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++	uninstall-info-am uninstall-kipirawconverterprofilesDATA
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=adobergb.icm widegamut.icm prophoto.icm srgb.icm Makefile.in 
++KDE_DIST=adobergb.icm widegamut.icm prophoto.icm srgb.icm Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/rawconverter/profiles/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/profiles/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  kipi-plugins/rawconverter/profiles/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/rawconverter/profiles/Makefile.in
+ 
+ 
 --- kipi-plugins/sendimages/Makefile.in
 +++ kipi-plugins/sendimages/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,67 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/sendimages
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_sendimages_la_OBJECTS = plugin_sendimages.lo \
++	sendimagesdialog.lo listimageserrordialog.lo sendimages.lo
++#>- kipiplugin_sendimages_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_sendimages_la_OBJECTS)
++#>+ 5
++kipiplugin_sendimages_la_final_OBJECTS = kipiplugin_sendimages_la.all_cpp.lo 
++kipiplugin_sendimages_la_nofinal_OBJECTS = plugin_sendimages.lo \
++	sendimagesdialog.lo listimageserrordialog.lo sendimages.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_sendimages_la_OBJECTS = $(kipiplugin_sendimages_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_sendimages_la_OBJECTS = $(kipiplugin_sendimages_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_sendimages_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_sendimages_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +148,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -213,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +286,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +298,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +319,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +367,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -325,7 +398,6 @@
+ INCLUDES = -I$(top_srcdir)/kipi-plugins/common/exiv2iface \
+            $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
  
+-
+ #>- METASOURCES = AUTO
+ 
+ # Install this plugin in the KDE modules directory
+@@ -349,104 +421,78 @@
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_sendimages.desktop
+-subdir = kipi-plugins/sendimages
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_sendimages_la_OBJECTS = plugin_sendimages.lo \
+-	sendimagesdialog.lo listimageserrordialog.lo sendimages.lo
+-#>- kipiplugin_sendimages_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_sendimages_la_OBJECTS)
+-#>+ 5
+-kipiplugin_sendimages_la_final_OBJECTS = kipiplugin_sendimages_la.all_cpp.lo 
+-kipiplugin_sendimages_la_nofinal_OBJECTS = plugin_sendimages.lo \
+-	sendimagesdialog.lo listimageserrordialog.lo sendimages.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_sendimages_la_OBJECTS = $(kipiplugin_sendimages_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_sendimages_la_OBJECTS = $(kipiplugin_sendimages_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/listimageserrordialog.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_sendimages.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/sendimages.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/sendimagesdialog.Plo
+-#>+ 8
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_sendimages_la.all_cpp.P ./$(DEPDIR)/listimageserrordialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_sendimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/sendimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/sendimagesdialog.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/listimageserrordialog.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_sendimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/sendimages.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/sendimagesdialog.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_sendimages_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_sendimages_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -429,9 +432,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/sendimages/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/sendimages/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/sendimages/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/sendimages/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -441,9 +444,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/sendimages/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/sendimages/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/sendimages/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/sendimages/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/sendimages/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -458,9 +461,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -807,9 +810,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/sendimages/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -457,7 +503,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_sendimages_la_LDFLAGS) $(kipiplugin_sendimages_la_OBJECTS) $(kipiplugin_sendimages_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -468,37 +514,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sendimagesdialog.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -509,33 +543,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -544,6 +569,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -555,10 +581,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -581,12 +608,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -600,7 +621,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -618,9 +639,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -640,7 +662,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -665,13 +687,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -707,8 +733,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -768,7 +794,7 @@
+ 	-rm -f  listimageserrordialog.moc sendimages.moc sendimagesdialog.moc plugin_sendimages.moc
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_sendimages.desktop actions.h sendimages.h plugin_sendimages.h listimageserrordialog.h Makefile.in sendimagesdialog.h 
++KDE_DIST=kipiplugin_sendimages.desktop actions.h sendimages.h plugin_sendimages.h listimageserrordialog.h Makefile.in sendimagesdialog.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -777,10 +803,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/sendimages/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/sendimages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/sendimages/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/sendimages/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/sendimages/Makefile.in
  
  
 --- kipi-plugins/simpleviewerexport/Makefile.in
 +++ kipi-plugins/simpleviewerexport/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,72 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/simpleviewerexport
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)" \
++	"$(DESTDIR)$(kipiplugin_simpleviewer_svdir)" \
++	"$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_simpleviewer_la_OBJECTS = plugin_simpleviewer.lo \
++	svedialog.lo simpleviewerexport.lo firstrundlg.lo
++#>- kipiplugin_simpleviewer_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_simpleviewer_la_OBJECTS)
++#>+ 5
++kipiplugin_simpleviewer_la_final_OBJECTS = kipiplugin_simpleviewer_la.all_cpp.lo 
++kipiplugin_simpleviewer_la_nofinal_OBJECTS = plugin_simpleviewer.lo \
++	svedialog.lo simpleviewerexport.lo firstrundlg.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_simpleviewer_la_OBJECTS = $(kipiplugin_simpleviewer_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_simpleviewer_la_OBJECTS = $(kipiplugin_simpleviewer_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_simpleviewer_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_simpleviewer_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++kipiplugin_simpleviewer_svDATA_INSTALL = $(INSTALL_DATA)
++kipiplugin_simpleviewer_svtemplateDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA) $(kipiplugin_simpleviewer_sv_DATA) \
++	$(kipiplugin_simpleviewer_svtemplate_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +153,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +242,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -213,6 +283,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +291,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +303,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +324,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +372,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,7 +401,6 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+@@ -346,108 +423,80 @@
+ # Install the SimpleViewer files
+ kipiplugin_simpleviewer_svdir = $(kde_datadir)/kipiplugin_simpleviewerexport/simpleviewer_html
+ kipiplugin_simpleviewer_sv_DATA = upgrade.html space.png
+-
+ kipiplugin_simpleviewer_svtemplatedir = $(kde_datadir)/kipiplugin_simpleviewerexport
+ kipiplugin_simpleviewer_svtemplate_DATA = index.template
+-subdir = kipi-plugins/simpleviewerexport
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_simpleviewer_la_OBJECTS = plugin_simpleviewer.lo \
+-	svedialog.lo simpleviewerexport.lo firstrundlg.lo
+-#>- kipiplugin_simpleviewer_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_simpleviewer_la_OBJECTS)
+-#>+ 5
+-kipiplugin_simpleviewer_la_final_OBJECTS = kipiplugin_simpleviewer_la.all_cpp.lo 
+-kipiplugin_simpleviewer_la_nofinal_OBJECTS = plugin_simpleviewer.lo \
+-	svedialog.lo simpleviewerexport.lo firstrundlg.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_simpleviewer_la_OBJECTS = $(kipiplugin_simpleviewer_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_simpleviewer_la_OBJECTS = $(kipiplugin_simpleviewer_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/firstrundlg.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_simpleviewer.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/simpleviewerexport.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/svedialog.Plo
+-#>+ 8
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_simpleviewer_la.all_cpp.P ./$(DEPDIR)/firstrundlg.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_simpleviewer.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/simpleviewerexport.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/svedialog.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/firstrundlg.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_simpleviewer.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/simpleviewerexport.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/svedialog.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_simpleviewer_la_SOURCES)
+-DATA = $(kde_services_DATA) $(kipiplugin_simpleviewer_sv_DATA) \
+-	$(kipiplugin_simpleviewer_svtemplate_DATA)
+-
+-DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_simpleviewer_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -437,9 +440,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/simpleviewerexport/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/simpleviewerexport/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/simpleviewerexport/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/simpleviewerexport/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -449,9 +452,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/simpleviewerexport/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/simpleviewerexport/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/simpleviewerexport/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/simpleviewerexport/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/simpleviewerexport/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -466,9 +469,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -859,9 +862,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/simpleviewerexport/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -458,7 +507,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_simpleviewer_la_LDFLAGS) $(kipiplugin_simpleviewer_la_OBJECTS) $(kipiplugin_simpleviewer_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -469,37 +518,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/svedialog.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -510,69 +547,58 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+-kipiplugin_simpleviewer_svDATA_INSTALL = $(INSTALL_DATA)
+ install-kipiplugin_simpleviewer_svDATA: $(kipiplugin_simpleviewer_sv_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kipiplugin_simpleviewer_svdir)
++	test -z "$(kipiplugin_simpleviewer_svdir)" || $(mkdir_p) "$(DESTDIR)$(kipiplugin_simpleviewer_svdir)"
+ 	@list='$(kipiplugin_simpleviewer_sv_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kipiplugin_simpleviewer_svDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f"; \
+-	  $(kipiplugin_simpleviewer_svDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kipiplugin_simpleviewer_svDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f'"; \
++	  $(kipiplugin_simpleviewer_svDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f"; \
+ 	done
+ 
+ uninstall-kipiplugin_simpleviewer_svDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kipiplugin_simpleviewer_sv_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f"; \
+ 	done
+-kipiplugin_simpleviewer_svtemplateDATA_INSTALL = $(INSTALL_DATA)
+ install-kipiplugin_simpleviewer_svtemplateDATA: $(kipiplugin_simpleviewer_svtemplate_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)
++	test -z "$(kipiplugin_simpleviewer_svtemplatedir)" || $(mkdir_p) "$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)"
+ 	@list='$(kipiplugin_simpleviewer_svtemplate_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kipiplugin_simpleviewer_svtemplateDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f"; \
+-	  $(kipiplugin_simpleviewer_svtemplateDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kipiplugin_simpleviewer_svtemplateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f'"; \
++	  $(kipiplugin_simpleviewer_svtemplateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f"; \
+ 	done
+ 
+ uninstall-kipiplugin_simpleviewer_svtemplateDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kipiplugin_simpleviewer_svtemplate_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -581,6 +607,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -592,10 +619,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -618,12 +646,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -637,7 +659,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -655,9 +677,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir) $(DESTDIR)$(kipiplugin_simpleviewer_svdir) $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kipiplugin_simpleviewer_svdir)" "$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -677,7 +700,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -702,15 +725,19 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA \
+ #>- 	install-kipiplugin_simpleviewer_svDATA \
+ #>- 	install-kipiplugin_simpleviewer_svtemplateDATA
+-#>+ 3
+-install-data-am:   install-kde_servicesDATA \
++#>+ 4
++install-data-am:   \
++	install-kde_servicesDATA \
+ 	install-kipiplugin_simpleviewer_svDATA \
+ 	install-kipiplugin_simpleviewer_svtemplateDATA
+ 
+@@ -750,17 +777,18 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-kipiplugin_simpleviewer_svDATA \
+ 	install-kipiplugin_simpleviewer_svtemplateDATA install-man \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
+-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++	uninstall-kde_servicesDATA \
+ 	uninstall-kipiplugin_simpleviewer_svDATA \
+ 	uninstall-kipiplugin_simpleviewer_svtemplateDATA
+ 
+@@ -815,7 +843,7 @@
+ 	-rm -f  firstrundlg.moc plugin_simpleviewer.moc simpleviewerexport.moc svedialog.moc
+ 
+ #>+ 2
+-KDE_DIST=svedialog.h plugin_simpleviewer.h space.png index.template simpleviewerexport.h index.html firstrundlg.h test.txt upgrade.html Makefile.in kipiplugin_simpleviewer.desktop 
++KDE_DIST=svedialog.h plugin_simpleviewer.h space.png index.template simpleviewerexport.h index.html firstrundlg.h test.txt upgrade.html Makefile.in kipiplugin_simpleviewer.desktop Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -824,10 +852,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/simpleviewerexport/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/simpleviewerexport/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/simpleviewerexport/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/simpleviewerexport/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/simpleviewerexport/Makefile.in
  
  
 --- kipi-plugins/slideshow/Makefile.in
 +++ kipi-plugins/slideshow/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,67 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/slideshow
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_slideshow_la_OBJECTS = plugin_slideshow.lo slideshow.lo \
++	slideshowconfig.lo imlibiface.lo slideshowgl.lo toolbar.lo
++#>- kipiplugin_slideshow_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_slideshow_la_OBJECTS)
++#>+ 5
++kipiplugin_slideshow_la_final_OBJECTS = kipiplugin_slideshow_la.all_cpp.lo 
++kipiplugin_slideshow_la_nofinal_OBJECTS = plugin_slideshow.lo slideshow.lo \
++	slideshowconfig.lo imlibiface.lo slideshowgl.lo toolbar.lo slideshowconfigbase.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_slideshow_la_OBJECTS = $(kipiplugin_slideshow_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_slideshow_la_OBJECTS = $(kipiplugin_slideshow_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_slideshow_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_slideshow_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +148,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -213,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +286,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +298,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +319,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +367,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -327,9 +400,7 @@
  
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_slideshow.la
+-
+ kipiplugin_slideshow_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+-
+ #>- kipiplugin_slideshow_la_SOURCES = plugin_slideshow.cpp slideshow.cpp \
+ #>- 	slideshowconfig.cpp imlibiface.cpp slideshowgl.cpp toolbar.cpp slideshowconfigbase.ui
+ #>+ 2
+@@ -339,113 +410,82 @@
+ 
+ #kipiplugin_slideshow_la_LIBADD = -lkdefx $(LIB_IMLIB2) $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ kipiplugin_slideshow_la_LIBADD = -lkdefx -lImlib2 $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+-
+ kipiplugin_slideshow_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+-
+ kde_services_DATA = kipiplugin_slideshow.desktop
+-
+ kipiplugin_slideshowicondir = $(kde_datadir)/kipiplugin_slideshow/icons
+ kipiplugin_slideshowicon_ICON = AUTO
+-subdir = kipi-plugins/slideshow
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_slideshow_la_OBJECTS = plugin_slideshow.lo slideshow.lo \
+-	slideshowconfig.lo imlibiface.lo slideshowgl.lo toolbar.lo
+-#>- kipiplugin_slideshow_la_OBJECTS = $(am_kipiplugin_slideshow_la_OBJECTS)
+-#>+ 5
+-kipiplugin_slideshow_la_final_OBJECTS = kipiplugin_slideshow_la.all_cpp.lo 
+-kipiplugin_slideshow_la_nofinal_OBJECTS = plugin_slideshow.lo slideshow.lo \
+-	slideshowconfig.lo imlibiface.lo slideshowgl.lo toolbar.lo slideshowconfigbase.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_slideshow_la_OBJECTS = $(kipiplugin_slideshow_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_slideshow_la_OBJECTS = $(kipiplugin_slideshow_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/imlibiface.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/plugin_slideshow.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/slideshow.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/slideshowconfig.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/slideshowgl.Plo ./$(DEPDIR)/toolbar.Plo
+-#>+ 10
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/slideshowconfigbase.P  $(DEPDIR)/kipiplugin_slideshow_la.all_cpp.P ./$(DEPDIR)/imlibiface.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_slideshow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/slideshow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/slideshowconfig.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/slideshowgl.Plo ./$(DEPDIR)/toolbar.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/slideshowconfigbase.P ./$(DEPDIR)/imlibiface.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/plugin_slideshow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/slideshow.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/slideshowconfig.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/slideshowgl.Plo ./$(DEPDIR)/toolbar.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_slideshow_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_slideshow_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -424,9 +427,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/slideshow/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/slideshow/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/slideshow/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/slideshow/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -436,9 +439,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/slideshow/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/slideshow/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/slideshow/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/slideshow/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/slideshow/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -453,9 +456,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -820,9 +823,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/slideshow/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -456,7 +496,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_slideshow_la_LDFLAGS) $(kipiplugin_slideshow_la_OBJECTS) $(kipiplugin_slideshow_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -469,37 +509,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/toolbar.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -510,33 +538,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -545,6 +564,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -556,10 +576,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -582,12 +603,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -601,7 +616,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -619,9 +634,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -641,7 +657,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -666,13 +682,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am: install-kde-icons   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am: install-kde-icons   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -711,8 +731,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -778,7 +798,7 @@
+ 	-rm -f  plugin_slideshow.moc slideshow.moc slideshowconfig.moc toolbar.moc slideshowgl.moc
+ 
+ #>+ 2
+-KDE_DIST=slideshowconfig.h slideshow.h toolbar.h plugin_slideshow.h kipiplugin_slideshow.desktop slideshowgl.h slideshowconfigbase.ui Makefile.in hi22-action-slideshow.png imlibiface.h 
++KDE_DIST=slideshowconfig.h slideshow.h toolbar.h plugin_slideshow.h kipiplugin_slideshow.desktop slideshowgl.h slideshowconfigbase.ui Makefile.in hi22-action-slideshow.png imlibiface.h Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+@@ -800,10 +820,19 @@
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kipiplugin_slideshowicondir)/hicolor/22x22/actions/slideshow.png
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/slideshow/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/slideshow/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/slideshow/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/slideshow/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/slideshow/Makefile.in
  
  
 --- kipi-plugins/timeadjust/Makefile.in
 +++ kipi-plugins/timeadjust/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,67 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/timeadjust
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_timeadjust_la_OBJECTS = plugin_timeadjust.lo \
++	timeadjustdialog.lo
++#>- kipiplugin_timeadjust_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_timeadjust_la_OBJECTS)
++#>+ 5
++kipiplugin_timeadjust_la_final_OBJECTS = kipiplugin_timeadjust_la.all_cpp.lo 
++kipiplugin_timeadjust_la_nofinal_OBJECTS = plugin_timeadjust.lo \
++	timeadjustdialog.lo
++ at KDE_USE_FINAL_FALSE@kipiplugin_timeadjust_la_OBJECTS = $(kipiplugin_timeadjust_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kipiplugin_timeadjust_la_OBJECTS = $(kipiplugin_timeadjust_la_final_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_timeadjust_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_timeadjust_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +148,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -213,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +286,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +298,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +319,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +367,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -323,12 +396,10 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+-
+ #>- METASOURCES = AUTO
  
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_timeadjust.la
+-
+ kipiplugin_timeadjust_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+ 	$(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la 
+ 
+@@ -346,98 +417,78 @@
+ 
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_timeadjust.desktop
+-subdir = kipi-plugins/timeadjust
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_timeadjust_la_OBJECTS = plugin_timeadjust.lo \
+-	timeadjustdialog.lo
+-#>- kipiplugin_timeadjust_la_OBJECTS = \
+-#>- 	$(am_kipiplugin_timeadjust_la_OBJECTS)
+-#>+ 5
+-kipiplugin_timeadjust_la_final_OBJECTS = kipiplugin_timeadjust_la.all_cpp.lo 
+-kipiplugin_timeadjust_la_nofinal_OBJECTS = plugin_timeadjust.lo \
+-	timeadjustdialog.lo
+- at KDE_USE_FINAL_FALSE@kipiplugin_timeadjust_la_OBJECTS = $(kipiplugin_timeadjust_la_nofinal_OBJECTS)
+- at KDE_USE_FINAL_TRUE@kipiplugin_timeadjust_la_OBJECTS = $(kipiplugin_timeadjust_la_final_OBJECTS)
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plugin_timeadjust.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/timeadjustdialog.Plo
+-#>+ 4
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =   $(DEPDIR)/kipiplugin_timeadjust_la.all_cpp.P ./$(DEPDIR)/plugin_timeadjust.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/timeadjustdialog.Plo
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  ./$(DEPDIR)/plugin_timeadjust.Plo \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/timeadjustdialog.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_timeadjust_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_timeadjust_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -424,9 +427,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/timeadjust/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/timeadjust/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/timeadjust/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/timeadjust/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -436,9 +439,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/timeadjust/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/timeadjust/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/timeadjust/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/timeadjust/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/timeadjust/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -453,9 +456,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -785,9 +788,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/timeadjust/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -448,7 +499,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_timeadjust_la_LDFLAGS) $(kipiplugin_timeadjust_la_OBJECTS) $(kipiplugin_timeadjust_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -457,37 +508,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/timeadjustdialog.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -498,33 +537,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -533,6 +563,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -544,10 +575,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -570,12 +602,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -589,7 +615,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -607,9 +633,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -629,7 +656,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -654,13 +681,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -696,8 +727,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -743,7 +774,7 @@
+ 	-rm -f  plugin_timeadjust.moc timeadjustdialog.moc
+ 
+ #>+ 2
+-KDE_DIST=timeadjustdialog.h kipiplugin_timeadjust.desktop plugin_timeadjust.h Makefile.in 
++KDE_DIST=timeadjustdialog.h kipiplugin_timeadjust.desktop plugin_timeadjust.h Makefile.in Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -752,10 +783,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/timeadjust/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/timeadjust/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/timeadjust/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/timeadjust/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/timeadjust/Makefile.in
  
  
 --- kipi-plugins/wallpaper/Makefile.in
 +++ kipi-plugins/wallpaper/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,7 @@
+ 
+ @SET_MAKE@
+ 
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +23,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +39,62 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = kipi-plugins/wallpaper
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
++	"$(DESTDIR)$(kde_servicesdir)"
++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am_kipiplugin_wallpaper_la_OBJECTS = plugin_wallpaper.lo
++#>- kipiplugin_wallpaper_la_OBJECTS =  \
++#>- 	$(am_kipiplugin_wallpaper_la_OBJECTS)
++#>+ 1
++kipiplugin_wallpaper_la_OBJECTS = plugin_wallpaper.lo
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kipiplugin_wallpaper_la_SOURCES)
++DIST_SOURCES = $(kipiplugin_wallpaper_la_SOURCES)
++kde_servicesDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(kde_services_DATA)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +143,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +232,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -213,6 +273,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +281,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +293,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +314,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +362,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -324,100 +392,85 @@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(LIBKIPI_CFLAGS) $(all_includes)
+ #>- METASOURCES = AUTO
+-
+ kde_module_LTLIBRARIES = kipiplugin_wallpaper.la
+ kipiplugin_wallpaper_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+ kipiplugin_wallpaper_la_SOURCES = plugin_wallpaper.cpp
+-
+ kipiplugin_wallpaper_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+-
+ kipiplugin_wallpaper_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-
+ pluginsdir = $(kde_datadir)/kipi/plugins
+-
+ kde_services_DATA = kipiplugin_wallpaper.desktop
+-subdir = kipi-plugins/wallpaper
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
+-
+-am_kipiplugin_wallpaper_la_OBJECTS = plugin_wallpaper.lo
+-#>- kipiplugin_wallpaper_la_OBJECTS = $(am_kipiplugin_wallpaper_la_OBJECTS)
+-#>+ 1
+-kipiplugin_wallpaper_la_OBJECTS = plugin_wallpaper.lo
+-
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+-am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plugin_wallpaper.Plo
+-#>+ 1
+- at AMDEP_TRUE@DEP_FILES =  ./$(DEPDIR)/plugin_wallpaper.Plo
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 2
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(kipiplugin_wallpaper_la_SOURCES)
+-DATA = $(kde_services_DATA)
+-
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(kipiplugin_wallpaper_la_SOURCES)
+-
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -411,9 +414,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/wallpaper/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/wallpaper/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  kipi-plugins/wallpaper/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  kipi-plugins/wallpaper/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -423,9 +426,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/wallpaper/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/wallpaper/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  kipi-plugins/wallpaper/Makefile
 +	  $(AUTOMAKE) --foreign  kipi-plugins/wallpaper/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/wallpaper/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -440,9 +443,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -763,9 +766,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kipi-plugins/wallpaper/Makefile'; \
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
++	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-kde_moduleLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
++	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ 	done
+ 
+ clean-kde_moduleLTLIBRARIES:
+ 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+ 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -428,7 +481,7 @@
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_wallpaper_la_LDFLAGS) $(kipiplugin_wallpaper_la_OBJECTS) $(kipiplugin_wallpaper_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT) core *.core
++	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -436,37 +489,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_wallpaper.Plo at am__quote@
+ 
+ .cpp.o:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+ 
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCXX_TRUE@	fi
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -477,33 +518,24 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ install-kde_servicesDATA: $(kde_services_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
++	test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+ uninstall-kde_servicesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kde_services_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -512,6 +544,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -523,10 +556,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -549,12 +583,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -568,7 +596,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -586,9 +614,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
++	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -608,7 +637,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -633,13 +662,17 @@
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
+-#>+ 1
+-install-data-am:   install-kde_servicesDATA
++#>- install-data-am: install-kde_moduleLTLIBRARIES \
++#>- 	install-kde_servicesDATA
++#>+ 2
++install-data-am:   \
++	install-kde_servicesDATA
+ 
+ #>- install-exec-am:
+ #>+ 1
+@@ -675,8 +708,8 @@
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
+ 	install-man install-strip installcheck installcheck-am \
+@@ -714,7 +747,7 @@
+ 	-rm -f  plugin_wallpaper.moc
+ 
+ #>+ 2
+-KDE_DIST=plugin_wallpaper.h Makefile.in kipiplugin_wallpaper.desktop 
++KDE_DIST=plugin_wallpaper.h Makefile.in Makefile.am kipiplugin_wallpaper.desktop 
+ 
+ #>+ 3
+ clean-closures:
+@@ -723,10 +756,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  kipi-plugins/wallpaper/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kipi-plugins/wallpaper/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kipi-plugins/wallpaper/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  kipi-plugins/wallpaper/Makefile
  	cd $(top_srcdir) && perl admin/am_edit kipi-plugins/wallpaper/Makefile.in
  
  
---- Makefile.in
-+++ Makefile.in
-@@ -222,6 +222,9 @@
+--- po/Makefile.in
++++ po/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,37 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +116,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +205,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -389,7 +392,7 @@
+@@ -213,6 +246,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +254,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +266,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +287,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +335,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -325,40 +366,53 @@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+ SUBDIRS =. ar br ca cs cy da de el en_GB es et fi fr ga gl hu is it ja lt mt nb nl nn pa pl pt pt_BR ru rw sk sr sr at Latn sv ta tr uk zh_CN
+-subdir = po
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
  .SUFFIXES:
- am--refresh:
- 	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -431,12 +434,12 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  po/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  po/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/Makefile
++	  $(AUTOMAKE) --foreign  po/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--$(top_srcdir)/configure:  $(am__configure_deps)
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -377,7 +431,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -389,7 +449,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -397,7 +457,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -418,7 +484,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -429,14 +495,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -445,19 +503,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -467,10 +528,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -493,12 +555,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -512,7 +568,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -527,15 +583,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -545,7 +603,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -565,7 +622,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -587,6 +644,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -621,37 +680,42 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in 
++KDE_DIST=Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  po/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
+ 
+ 
+--- po/ar/Makefile.in
++++ po/ar/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/ar
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/ar
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
+ all: all-nls docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ar/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  po/ar/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  po/ar/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ar/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/ar/Makefile
++	  $(AUTOMAKE) --foreign  po/ar/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit po/ar/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- 	cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- 	cd $(srcdir) && rm -f configure
- 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- config.h: stamp-h1
-@@ -448,7 +451,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in:  $(am__configure_deps) 
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	cd $(top_srcdir) && $(AUTOHEADER)
- 	rm -f stamp-h1
- 	touch $@
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/ar/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ar/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  po/ar/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit po/ar/Makefile.in
+ 
+ 
 --- po/br/Makefile.in
 +++ po/br/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/br
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/br
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/br/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/br/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/br/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/br/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/br/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/br/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/br/Makefile
 +	  $(AUTOMAKE) --foreign  po/br/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/br/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/br/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/br/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/br/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/br/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in
  
  
 --- po/ca/Makefile.in
 +++ po/ca/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/ca
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
+-subdir = po/ca
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ca/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ca/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/ca/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/ca/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ca/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ca/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/ca/Makefile
 +	  $(AUTOMAKE) --foreign  po/ca/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -821,9 +824,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ca/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 49
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -759,10 +814,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/ca/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ca/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/ca/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/ca/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in
  
  
 --- po/cs/Makefile.in
 +++ po/cs/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/cs
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/cs
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/cs/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/cs/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/cs/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/cs/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/cs/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/cs/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/cs/Makefile
 +	  $(AUTOMAKE) --foreign  po/cs/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/cs/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 58
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -771,10 +826,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/cs/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/cs/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/cs/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/cs/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in
  
  
 --- po/cy/Makefile.in
 +++ po/cy/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/cy
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
+-subdir = po/cy
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/cy/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/cy/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/cy/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/cy/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/cy/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/cy/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/cy/Makefile
 +	  $(AUTOMAKE) --foreign  po/cy/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -825,9 +828,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/cy/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 52
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -763,10 +818,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/cy/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/cy/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/cy/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/cy/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in
  
  
 --- po/da/Makefile.in
 +++ po/da/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/da
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/da
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/da/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/da/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/da/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/da/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/da/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/da/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/da/Makefile
 +	  $(AUTOMAKE) --foreign  po/da/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/da/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/da/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/da/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/da/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/da/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in
  
  
 --- po/de/Makefile.in
 +++ po/de/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/de
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/de
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/de/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/de/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/de/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/de/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/de/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/de/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/de/Makefile
 +	  $(AUTOMAKE) --foreign  po/de/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/de/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/de/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/de/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/de/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/de/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in
  
  
 --- po/el/Makefile.in
 +++ po/el/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/el
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/el
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/el/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/el/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/el/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/el/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/el/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/el/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/el/Makefile
 +	  $(AUTOMAKE) --foreign  po/el/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/el/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/el/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/el/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/el/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/el/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in
  
  
 --- po/en_GB/Makefile.in
 +++ po/en_GB/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/en_GB
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
+-subdir = po/en_GB
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/en_GB/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/en_GB/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/en_GB/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/en_GB/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/en_GB/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/en_GB/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/en_GB/Makefile
 +	  $(AUTOMAKE) --foreign  po/en_GB/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -821,9 +824,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/en_GB/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 49
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -759,10 +814,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/en_GB/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/en_GB/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/en_GB/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/en_GB/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in
  
  
 --- po/es/Makefile.in
 +++ po/es/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/es
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/es
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/es/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/es/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/es/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/es/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/es/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/es/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/es/Makefile
 +	  $(AUTOMAKE) --foreign  po/es/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/es/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/es/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/es/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/es/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/es/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in
  
  
 --- po/et/Makefile.in
 +++ po/et/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/et
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/et
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/et/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/et/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/et/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/et/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/et/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/et/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/et/Makefile
 +	  $(AUTOMAKE) --foreign  po/et/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/et/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/et/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/et/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/et/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/et/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in
  
  
 --- po/fi/Makefile.in
 +++ po/fi/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/fi
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_galleryexport.po kipiplugin_jpeglossless.po kipiplugin_printwizard.po kipiplugin_sendimages.po kipiplugin_wallpaper.po kipiplugin_htmlexport.po
+ GMOFILES = kipiplugin_galleryexport.gmo kipiplugin_jpeglossless.gmo kipiplugin_printwizard.gmo kipiplugin_sendimages.gmo kipiplugin_wallpaper.gmo kipiplugin_htmlexport.gmo
+-subdir = po/fi
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/fi/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/fi/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/fi/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/fi/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/fi/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/fi/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/fi/Makefile
 +	  $(AUTOMAKE) --foreign  po/fi/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/fi/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -773,9 +776,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/fi/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_wallpaper.po kipiplugin_galleryexport.po Makefile.in kipiplugin_printwizard.po 
++KDE_DIST=kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_wallpaper.po kipiplugin_galleryexport.po Makefile.in kipiplugin_printwizard.po Makefile.am 
+ 
+ #>+ 19
+ kipiplugin_galleryexport.gmo: kipiplugin_galleryexport.po
+@@ -719,10 +774,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/fi/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/fi/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/fi/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/fi/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/fi/Makefile.in
  
  
 --- po/fr/Makefile.in
 +++ po/fr/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/fr
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
+-subdir = po/fr
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/fr/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/fr/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/fr/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/fr/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/fr/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/fr/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/fr/Makefile
 +	  $(AUTOMAKE) --foreign  po/fr/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -829,9 +832,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/fr/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 55
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -767,10 +822,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/fr/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/fr/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/fr/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/fr/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in
  
  
 --- po/ga/Makefile.in
 +++ po/ga/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/ga
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/ga
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ga/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ga/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/ga/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/ga/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ga/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ga/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/ga/Makefile
 +	  $(AUTOMAKE) --foreign  po/ga/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ga/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/ga/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ga/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/ga/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/ga/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in
  
  
 --- po/gl/Makefile.in
 +++ po/gl/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/gl
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/gl
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/gl/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/gl/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/gl/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/gl/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/gl/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/gl/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/gl/Makefile
 +	  $(AUTOMAKE) --foreign  po/gl/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/gl/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 58
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -771,10 +826,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/gl/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/gl/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/gl/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/gl/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in
  
  
 --- po/hu/Makefile.in
 +++ po/hu/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/hu
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo
+-subdir = po/hu
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/hu/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/hu/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/hu/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/hu/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/hu/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/hu/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/hu/Makefile
 +	  $(AUTOMAKE) --foreign  po/hu/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -805,9 +808,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/hu/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am 
+ 
+ #>+ 37
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -743,10 +798,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/hu/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/hu/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/hu/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/hu/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in
  
  
 --- po/is/Makefile.in
 +++ po/is/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/is
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
+-subdir = po/is
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/is/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/is/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/is/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/is/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/is/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/is/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/is/Makefile
 +	  $(AUTOMAKE) --foreign  po/is/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -821,9 +824,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/is/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 49
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -759,10 +814,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/is/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/is/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/is/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/is/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in
  
  
 --- po/it/Makefile.in
 +++ po/it/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/it
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/it
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/it/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/it/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/it/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/it/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/it/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/it/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/it/Makefile
 +	  $(AUTOMAKE) --foreign  po/it/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/it/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/it/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/it/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/it/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/it/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in
  
  
 --- po/ja/Makefile.in
 +++ po/ja/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/ja
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/ja
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ja/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ja/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/ja/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/ja/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ja/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ja/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/ja/Makefile
 +	  $(AUTOMAKE) --foreign  po/ja/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ja/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/ja/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ja/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/ja/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/ja/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in
  
  
 --- po/lt/Makefile.in
 +++ po/lt/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/lt
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
+-subdir = po/lt
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/lt/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/lt/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/lt/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/lt/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/lt/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/lt/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/lt/Makefile
 +	  $(AUTOMAKE) --foreign  po/lt/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -825,9 +828,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/lt/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/lt/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/lt/Makefile
-+	  $(AUTOMAKE) --foreign  po/lt/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
  
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
  
---- po/Makefile.in
-+++ po/Makefile.in
-@@ -204,6 +204,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -368,7 +371,7 @@
- all: docs-am  all-recursive
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
  
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -377,9 +380,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/Makefile'; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  po/Makefile
-+#>- 	  $(AUTOMAKE) --foreign  po/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -389,9 +392,9 @@
- 	      exit 1;; \
- 	  esac; \
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/Makefile
-+	  $(AUTOMAKE) --foreign  po/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -406,9 +409,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
  
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
  
- mostlyclean-libtool:
-@@ -710,9 +713,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/Makefile
-+	  $(AUTOMAKE) --foreign  po/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
  
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 52
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -763,10 +818,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/lt/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/lt/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  po/lt/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in
+ 
+ 
 --- po/mt/Makefile.in
 +++ po/mt/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/mt
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
+-subdir = po/mt
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/mt/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/mt/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/mt/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/mt/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/mt/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/mt/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/mt/Makefile
 +	  $(AUTOMAKE) --foreign  po/mt/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/mt/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -821,9 +824,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/mt/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 49
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -759,10 +814,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/mt/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/mt/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/mt/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/mt/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/mt/Makefile.in
  
  
 --- po/nb/Makefile.in
 +++ po/nb/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/nb
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_jpeglossless.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_findimages.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_jpeglossless.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_findimages.gmo kipiplugins.gmo
+-subdir = po/nb
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/nb/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/nb/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/nb/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/nb/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/nb/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/nb/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/nb/Makefile
 +	  $(AUTOMAKE) --foreign  po/nb/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -809,9 +812,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/nb/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 40
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -747,10 +802,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/nb/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/nb/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/nb/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/nb/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in
  
  
 --- po/nl/Makefile.in
 +++ po/nl/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/nl
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/nl
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/nl/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/nl/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/nl/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/nl/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/nl/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/nl/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/nl/Makefile
 +	  $(AUTOMAKE) --foreign  po/nl/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/nl/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/nl/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/nl/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/nl/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/nl/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in
  
  
 --- po/nn/Makefile.in
 +++ po/nn/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/nn
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_calendar.po kipiplugin_printwizard.po kipiplugin_wallpaper.po
+ GMOFILES = kipiplugin_calendar.gmo kipiplugin_printwizard.gmo kipiplugin_wallpaper.gmo
+-subdir = po/nn
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/nn/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/nn/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/nn/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/nn/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/nn/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/nn/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/nn/Makefile
 +	  $(AUTOMAKE) --foreign  po/nn/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/nn/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -769,9 +772,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/nn/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_wallpaper.po kipiplugin_calendar.po Makefile.in kipiplugin_printwizard.po 
++KDE_DIST=kipiplugin_wallpaper.po kipiplugin_calendar.po Makefile.in kipiplugin_printwizard.po Makefile.am 
+ 
+ #>+ 10
+ kipiplugin_calendar.gmo: kipiplugin_calendar.po
+@@ -707,10 +762,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/nn/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/nn/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/nn/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/nn/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/nn/Makefile.in
  
  
 --- po/pa/Makefile.in
 +++ po/pa/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/pa
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/pa
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pa/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pa/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/pa/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/pa/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pa/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pa/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/pa/Makefile
 +	  $(AUTOMAKE) --foreign  po/pa/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/pa/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -817,9 +820,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pa/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 49
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -759,10 +814,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/pa/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pa/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/pa/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/pa/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/pa/Makefile.in
  
  
 --- po/pl/Makefile.in
 +++ po/pl/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/pl
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/pl
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pl/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pl/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/pl/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/pl/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pl/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pl/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/pl/Makefile
 +	  $(AUTOMAKE) --foreign  po/pl/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -825,9 +828,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pl/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/pl/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pl/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/pl/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/pl/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in
  
  
 --- po/pt/Makefile.in
 +++ po/pt/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/pt
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/pt
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pt/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pt/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/pt/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/pt/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pt/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pt/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/pt/Makefile
 +	  $(AUTOMAKE) --foreign  po/pt/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pt/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/pt/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pt/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/pt/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/pt/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in
  
  
 --- po/pt_BR/Makefile.in
 +++ po/pt_BR/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/pt_BR
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
+-subdir = po/pt_BR
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pt_BR/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pt_BR/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/pt_BR/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/pt_BR/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pt_BR/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pt_BR/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/pt_BR/Makefile
 +	  $(AUTOMAKE) --foreign  po/pt_BR/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -821,9 +824,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/pt_BR/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 49
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -759,10 +814,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/pt_BR/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/pt_BR/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/pt_BR/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/pt_BR/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in
  
  
+--- po/ru/Makefile.in
++++ po/ru/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/ru
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_htmlexport.po
+ GMOFILES = kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_htmlexport.gmo
+-subdir = po/ru
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
+ all: all-nls docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ru/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  po/ru/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  po/ru/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ru/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/ru/Makefile
++	  $(AUTOMAKE) --foreign  po/ru/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit po/ru/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po Makefile.in kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po Makefile.in Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 34
+ kipiplugin_calendar.gmo: kipiplugin_calendar.po
+@@ -739,10 +794,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/ru/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ru/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  po/ru/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit po/ru/Makefile.in
+ 
+ 
 --- po/rw/Makefile.in
 +++ po/rw/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/rw
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
+-subdir = po/rw
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/rw/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/rw/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/rw/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/rw/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/rw/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/rw/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/rw/Makefile
 +	  $(AUTOMAKE) --foreign  po/rw/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/rw/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -825,9 +828,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/rw/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 52
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -763,10 +818,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/rw/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/rw/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/rw/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/rw/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/rw/Makefile.in
  
  
+--- po/sk/Makefile.in
++++ po/sk/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/sk
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/sk
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
+ all: all-nls docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sk/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  po/sk/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  po/sk/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sk/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/sk/Makefile
++	  $(AUTOMAKE) --foreign  po/sk/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit po/sk/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/sk/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sk/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  po/sk/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit po/sk/Makefile.in
+ 
+ 
 --- po/sr/Makefile.in
 +++ po/sr/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/sr
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
+-subdir = po/sr
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/sr/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sr/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/sr/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/sr/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/sr/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sr/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/sr/Makefile
 +	  $(AUTOMAKE) --foreign  po/sr/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -829,9 +832,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/sr/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 55
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -767,10 +822,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/sr/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sr/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/sr/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/sr/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in
  
  
 --- po/sr at Latn/Makefile.in
 +++ po/sr at Latn/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/sr at Latn
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
+-subdir = po/sr at Latn
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/sr at Latn/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sr at Latn/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/sr at Latn/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/sr at Latn/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/sr at Latn/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sr at Latn/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/sr at Latn/Makefile
 +	  $(AUTOMAKE) --foreign  po/sr at Latn/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/sr at Latn/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -829,9 +832,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/sr at Latn/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 55
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -767,10 +822,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/sr at Latn/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sr at Latn/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/sr at Latn/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/sr at Latn/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/sr at Latn/Makefile.in
  
  
 --- po/sv/Makefile.in
 +++ po/sv/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/sv
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/sv
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/sv/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sv/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/sv/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/sv/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/sv/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sv/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/sv/Makefile
 +	  $(AUTOMAKE) --foreign  po/sv/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/sv/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/sv/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/sv/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/sv/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/sv/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in
  
  
 --- po/ta/Makefile.in
 +++ po/ta/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/ta
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
+-subdir = po/ta
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ta/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ta/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/ta/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/ta/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ta/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ta/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/ta/Makefile
 +	  $(AUTOMAKE) --foreign  po/ta/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -821,9 +824,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/ta/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 49
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -759,10 +814,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/ta/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/ta/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/ta/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/ta/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in
  
  
 --- po/tr/Makefile.in
 +++ po/tr/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/tr
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_gpssync.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_gpssync.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
+-subdir = po/tr
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/tr/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/tr/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/tr/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/tr/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/tr/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/tr/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/tr/Makefile
 +	  $(AUTOMAKE) --foreign  po/tr/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -833,9 +836,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/tr/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_gpssync.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 61
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -775,10 +830,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/tr/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/tr/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/tr/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/tr/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in
  
  
 --- po/uk/Makefile.in
 +++ po/uk/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/uk
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_calendar.po kipiplugin_rawconverter.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_htmlexport.po
+ GMOFILES = kipiplugin_calendar.gmo kipiplugin_rawconverter.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_htmlexport.gmo
+-subdir = po/uk
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/uk/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/uk/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/uk/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/uk/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/uk/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/uk/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/uk/Makefile
 +	  $(AUTOMAKE) --foreign  po/uk/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -781,9 +784,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/uk/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_htmlexport.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_calendar.po kipiplugin_rawconverter.po Makefile.in kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_htmlexport.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_calendar.po kipiplugin_rawconverter.po Makefile.in Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 19
+ kipiplugin_calendar.gmo: kipiplugin_calendar.po
+@@ -719,10 +774,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/uk/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/uk/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/uk/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/uk/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in
  
  
 --- po/zh_CN/Makefile.in
 +++ po/zh_CN/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -22,7 +21,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,6 +37,39 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = po/zh_CN
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -87,6 +118,7 @@
+ GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
+ GPHOTO_CONFIG = @GPHOTO_CONFIG@
+ GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -175,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,7 +378,7 @@
+@@ -213,6 +248,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -220,12 +256,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -235,6 +268,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -254,14 +289,18 @@
+ compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
+ compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_x11_FALSE = @include_x11_FALSE@
+@@ -298,13 +337,17 @@
+ libexecdir = @libexecdir@
+ libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@
+ libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
+ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -330,40 +373,53 @@
+ #>+ 2
+ POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_imagesgallery.po kipiplugin_printwizard.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugins.po
+ GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_imagesgallery.gmo kipiplugin_printwizard.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugins.gmo
+-subdir = po/zh_CN
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
  all: all-nls docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -384,9 +387,9 @@
- #>- 	      exit 1;; \
- #>- 	  esac; \
- #>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/zh_CN/Makefile'; \
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/zh_CN/Makefile'; \
  #>- 	cd $(top_srcdir) && \
 -#>- 	  $(AUTOMAKE) --gnu  po/zh_CN/Makefile
+-#>+ 3
 +#>- 	  $(AUTOMAKE) --foreign  po/zh_CN/Makefile
- #>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -396,9 +399,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/zh_CN/Makefile'; \
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/zh_CN/Makefile'; \
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  po/zh_CN/Makefile
 +	  $(AUTOMAKE) --foreign  po/zh_CN/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -413,9 +416,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -793,9 +796,9 @@
- 	      exit 1;; \
- 	  esac; \
+ 	-rm -f *.lo
+@@ -382,7 +438,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -394,7 +456,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
  	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/zh_CN/Makefile'; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -402,7 +464,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -423,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -434,14 +502,6 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -450,19 +510,22 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
++tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
++	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
++	  empty_fix=; \
+ 	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && \
++	    test ! -f $$subdir/TAGS || \
+ 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+@@ -472,10 +535,11 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,14 +562,6 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-#>+ 1
+-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
+-top_distdir = ../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ #>- distdir: $(DISTFILES)
+ #>+ 1
+@@ -521,7 +577,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkinstalldirs) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -536,15 +592,17 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="$(top_distdir)" \
+-	        distdir=../$(distdir)/$$subdir \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -554,7 +612,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -576,7 +633,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -598,6 +655,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -636,29 +695,25 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libtool clean-recursive ctags \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
+ 	ctags-recursive distclean distclean-generic distclean-libtool \
+-	distclean-recursive distclean-tags distdir dvi dvi-am \
+-	dvi-recursive info info-am info-recursive install install-am \
+-	install-data install-data-am install-data-recursive \
+-	install-exec install-exec-am install-exec-recursive \
+-	install-info install-info-am install-info-recursive install-man \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+-	uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
+ 
+ # 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:
+ 
+ #>+ 2
+-KDE_DIST=kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_imagesgallery.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po 
++KDE_DIST=kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_imagesgallery.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po 
+ 
+ #>+ 28
+ kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
+@@ -731,10 +786,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  po/zh_CN/Makefile
++		@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/zh_CN/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  po/zh_CN/Makefile
++	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  po/zh_CN/Makefile
  	cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in
  




More information about the pkg-kde-commits mailing list