rev 5436 -
kde-extras/kipi-plugins/branches/experimental/debian/patches
Achim Bohnet
ach-guest at alioth.debian.org
Thu Jan 25 23:42:14 CET 2007
Author: ach-guest
Date: 2007-01-25 23:41:48 +0100 (Thu, 25 Jan 2007)
New Revision: 5436
Modified:
kde-extras/kipi-plugins/branches/experimental/debian/patches/98_buildprep.diff
kde-extras/kipi-plugins/branches/experimental/debian/patches/98_configure.diff
Log:
kipi-plugins: patches/98_*.diff update
Modified: kde-extras/kipi-plugins/branches/experimental/debian/patches/98_buildprep.diff
===================================================================
--- kde-extras/kipi-plugins/branches/experimental/debian/patches/98_buildprep.diff 2007-01-25 22:40:56 UTC (rev 5435)
+++ kde-extras/kipi-plugins/branches/experimental/debian/patches/98_buildprep.diff 2007-01-25 22:41:48 UTC (rev 5436)
@@ -2,92 +2,7 @@
# 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 @@
+@@ -134,6 +134,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -95,7 +10,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +223,9 @@
+@@ -222,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -105,7 +20,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +264,7 @@
+@@ -260,6 +264,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -113,7 +28,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +272,9 @@
+@@ -267,12 +272,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -126,16 +41,7 @@
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 @@
+@@ -303,14 +305,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -154,14 +60,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +353,17 @@
+@@ -347,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -172,458 +78,39 @@
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
-
+@@ -383,7 +392,7 @@
.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:
-+ @:
+ 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*) \
-+#>- 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)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -425,12 +434,12 @@
+ $(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: $(am__configure_deps)
+$(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): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -391,10 +451,10 @@
+@@ -442,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: $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(srcdir)/config.h.in: $(am__configure_deps)
+$(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=stamp-h.in 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
-
-
+ rm -f stamp-h1
+ touch $@
--- acinclude.m4
+++ acinclude.m4
@@ -2144,9 +2144,6 @@
@@ -4433,7 +3920,7 @@
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--- config.h.in
+++ config.h.in
-@@ -120,22 +120,22 @@
+@@ -111,22 +111,22 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
@@ -5174,7 +4661,7 @@
# 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 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 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 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
@@ -5691,15 +5178,9 @@
-# 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
+-do
- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
+- case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -5709,9 +5190,15 @@
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
--do
++# 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`
-- case $ac_val in
++ eval ac_val=\$$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; }; };;
@@ -5924,17 +5411,6 @@
--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
-@@ -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
@@ -6603,7 +6079,7 @@
# The aliases save the names the user supplied, while $host etc.
-@@ -1648,20 +2297,20 @@
+@@ -1648,17 +2297,17 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
test "$program_prefix" != NONE &&
@@ -6623,11 +6099,7 @@
+rm -f conftest.sed
--am__api_version="1.7"
-+am__api_version="1.9"
-
-
- test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
+ am__api_version="1.9"
@@ -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
@@ -6709,56 +6181,18 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -1817,9 +2467,8 @@
+@@ -1817,8 +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
+@@ -1869,8 +2519,8 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6769,7 +6203,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1851,54 +2533,57 @@
+@@ -1883,54 +2533,57 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6848,26 +6282,7 @@
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 @@
+@@ -2001,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
@@ -6878,7 +6293,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1986,32 +2668,34 @@
+@@ -2015,32 +2668,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6920,7 +6335,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2024,27 +2708,41 @@
+@@ -2053,27 +2708,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6969,20 +6384,10 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -2054,6 +2752,38 @@
+@@ -2093,6 +2762,31 @@
- # 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.
@@ -7005,11 +6410,14 @@
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
++
++
++
+ unset CDPATH
+@@ -2111,14 +2805,14 @@
-@@ -2075,14 +2805,14 @@
-
if test "x$prefix" = "xNONE"; then
- echo "$as_me:$LINENO: checking for kde-config" >&5
@@ -7026,7 +6434,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2125,8 +2855,8 @@
+@@ -2161,8 +2855,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -7037,7 +6445,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2137,8 +2867,8 @@
+@@ -2173,8 +2867,8 @@
{ (exit 1); exit 1; }; }
else
@@ -7048,7 +6456,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2147,14 +2877,14 @@
+@@ -2183,14 +2877,14 @@
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
@@ -7066,7 +6474,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2197,8 +2927,8 @@
+@@ -2233,8 +2927,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -7077,7 +6485,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2209,8 +2939,8 @@
+@@ -2245,8 +2939,8 @@
{ (exit 1); exit 1; }; }
else
@@ -7088,7 +6496,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2232,16 +2962,16 @@
+@@ -2268,16 +2962,16 @@
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -7111,7 +6519,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2254,13 +2984,13 @@
+@@ -2290,13 +2984,13 @@
@@ -7129,7 +6537,7 @@
val=
-@@ -2277,11 +3007,11 @@
+@@ -2313,11 +3007,11 @@
@@ -7143,7 +6551,7 @@
am_make=${MAKE-make}
-@@ -2291,8 +3021,8 @@
+@@ -2327,8 +3021,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -7154,7 +6562,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2319,15 +3049,15 @@
+@@ -2355,15 +3049,15 @@
fi
@@ -7175,7 +6583,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2347,10 +3077,9 @@
+@@ -2383,10 +3077,9 @@
@@ -7188,7 +6596,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2370,18 +3099,18 @@
+@@ -2406,18 +3099,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -7214,7 +6622,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2390,12 +3119,12 @@
+@@ -2426,12 +3119,12 @@
else
kde_use_strict_options="no"
@@ -7231,7 +6639,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2404,20 +3133,21 @@
+@@ -2440,20 +3133,21 @@
else
kde_use_warnings="yes"
@@ -7258,7 +6666,7 @@
CFLAGS=" $CFLAGS"
-@@ -2429,8 +3159,8 @@
+@@ -2465,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
@@ -7269,7 +6677,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2443,32 +3173,34 @@
+@@ -2479,32 +3173,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7311,7 +6719,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2481,36 +3213,51 @@
+@@ -2517,36 +3213,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7373,7 +6781,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2523,74 +3270,34 @@
+@@ -2559,74 +3270,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7457,7 +6865,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2604,7 +3311,7 @@
+@@ -2640,7 +3311,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7466,7 +6874,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2615,6 +3322,7 @@
+@@ -2651,6 +3322,7 @@
fi
done
done
@@ -7474,7 +6882,7 @@
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 @@
+@@ -2668,22 +3340,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7505,7 +6913,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2660,36 +3369,38 @@
+@@ -2696,36 +3369,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7552,7 +6960,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2702,29 +3413,45 @@
+@@ -2738,29 +3413,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7604,7 +7012,7 @@
fi
fi
-@@ -2737,21 +3464,35 @@
+@@ -2773,21 +3464,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7648,7 +7056,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2776,46 +3517,70 @@
+@@ -2812,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.
@@ -7741,7 +7149,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2828,19 +3593,23 @@
+@@ -2864,19 +3593,23 @@
fi
ac_exeext=$ac_cv_exeext
@@ -7772,7 +7180,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2859,22 +3628,27 @@
+@@ -2895,22 +3628,27 @@
fi
fi
fi
@@ -7812,7 +7220,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2885,9 +3659,8 @@
+@@ -2921,9 +3659,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7823,7 +7231,7 @@
break;;
* ) break;;
esac
-@@ -2901,14 +3674,14 @@
+@@ -2937,14 +3674,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -7842,7 +7250,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2928,14 +3701,20 @@
+@@ -2964,14 +3701,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -7867,7 +7275,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2953,12 +3732,12 @@
+@@ -2989,12 +3732,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -7884,7 +7292,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2981,24 +3760,36 @@
+@@ -3017,24 +3760,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7929,7 +7337,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3007,24 +3798,28 @@
+@@ -3043,24 +3798,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7966,7 +7374,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3040,24 +3835,36 @@
+@@ -3076,24 +3835,147 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7979,6 +7387,117 @@
+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'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$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_cc_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { 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'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$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
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ 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. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -8011,90 +7530,69 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3066,285 +3873,278 @@
+@@ -3102,12 +3984,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
--fi
++
+ fi
-rm -f 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
++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: 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
+@@ -3123,12 +4013,12 @@
+ 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
++{ 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_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
++ 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. */
--#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
+@@ -3162,12 +4052,17 @@
+ /* 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
++ 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 -std1. */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++ that's true only with -std. */
+ 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];
++/* 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);};
+@@ -3182,205 +4077,74 @@
return 0;
}
_ACEOF
@@ -8106,12 +7604,13 @@
-# 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
++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 { (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;;
@@ -8153,29 +7652,45 @@
(exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
-+ :
++ ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--fi
++
+ fi
-rm -f conftest.err conftest.$ac_objext
--done
++
++rm -f core conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
-rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
++rm -f conftest.$ac_ext
+ CC=$ac_save_CC
+
+ fi
-
--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 ;;
-- *)
++# 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; } ;;
+ *)
- 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
--
++ 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
+
-# 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
@@ -8216,255 +7731,103 @@
- '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. */
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-exit (42);
-+
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
+- ;
+- 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_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'
+- 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_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
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-continue
-+
- fi
+-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. */
+-/* 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 ()
- {
+-int
+-main ()
+-{
-exit (42);
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
- }
- _ACEOF
+- ;
+- 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_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'
+- 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_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
+-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
+-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
-
+-fi
+-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -8474,7 +7837,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3353,8 +4153,8 @@
+@@ -3389,8 +4153,8 @@
depcc="$CC" am_compiler_list=
@@ -8485,36 +7848,7 @@
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 @@
+@@ -3479,8 +4243,8 @@
fi
fi
@@ -8525,7 +7859,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3459,8 +4266,8 @@
+@@ -3502,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
@@ -8536,7 +7870,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3494,8 +4301,13 @@
+@@ -3537,8 +4301,13 @@
#endif
Syntax error
_ACEOF
@@ -8552,7 +7886,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3520,9 +4332,10 @@
+@@ -3563,9 +4332,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8564,7 +7898,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3532,8 +4345,13 @@
+@@ -3575,8 +4345,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8580,7 +7914,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3560,6 +4378,7 @@
+@@ -3603,6 +4378,7 @@
ac_preproc_ok=:
break
fi
@@ -8588,7 +7922,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3577,8 +4396,8 @@
+@@ -3620,8 +4396,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8599,7 +7933,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3601,8 +4420,13 @@
+@@ -3644,8 +4420,13 @@
#endif
Syntax error
_ACEOF
@@ -8615,7 +7949,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3627,9 +4451,10 @@
+@@ -3670,9 +4451,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8627,7 +7961,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3639,8 +4464,13 @@
+@@ -3682,8 +4464,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8643,7 +7977,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3667,6 +4497,7 @@
+@@ -3710,6 +4497,7 @@
ac_preproc_ok=:
break
fi
@@ -8651,7 +7985,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3717,18 +4548,22 @@
+@@ -3760,18 +4548,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8679,7 +8013,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3741,36 +4576,38 @@
+@@ -3784,36 +4576,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8726,7 +8060,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3783,55 +4620,85 @@
+@@ -3826,55 +4620,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8830,7 +8164,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3854,24 +4721,36 @@
+@@ -3897,24 +4721,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8875,7 +8209,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3880,24 +4759,28 @@
+@@ -3923,24 +4759,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8912,7 +8246,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3913,24 +4796,36 @@
+@@ -3956,24 +4796,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8957,7 +8291,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3939,70 +4834,53 @@
+@@ -3982,70 +4834,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9052,7 +8386,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4011,61 +4889,91 @@
+@@ -4054,61 +4889,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9166,7 +8500,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4074,8 +4982,8 @@
+@@ -4117,8 +4982,8 @@
depcc="$CXX" am_compiler_list=
@@ -9177,36 +8511,7 @@
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 @@
+@@ -4207,8 +5072,8 @@
fi
fi
@@ -9217,7 +8522,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4176,8 +5091,8 @@
+@@ -4226,8 +5091,8 @@
@@ -9228,7 +8533,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4202,24 +5117,36 @@
+@@ -4252,24 +5117,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9273,7 +8578,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4228,13 +5155,14 @@
+@@ -4278,13 +5155,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9292,7 +8597,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4276,17 +5204,16 @@
+@@ -4326,17 +5204,16 @@
fi
fi
@@ -9314,7 +8619,7 @@
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 @@
+@@ -4364,24 +5241,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9359,7 +8664,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4340,8 +5279,10 @@
+@@ -4390,8 +5279,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9371,7 +8676,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4354,29 +5295,28 @@
+@@ -4404,29 +5295,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9409,7 +8714,7 @@
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 @@
+@@ -4453,24 +5343,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9454,7 +8759,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4429,8 +5381,10 @@
+@@ -4479,8 +5381,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9466,7 +8771,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4443,13 +5397,13 @@
+@@ -4493,13 +5397,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9484,7 +8789,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4470,16 +5424,15 @@
+@@ -4520,16 +5424,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -9505,7 +8810,7 @@
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 @@
+@@ -4556,24 +5459,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9550,7 +8855,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4532,8 +5497,10 @@
+@@ -4582,8 +5497,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9562,7 +8867,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4546,16 +5513,16 @@
+@@ -4596,16 +5513,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9583,7 +8888,7 @@
:
fi
-@@ -4570,16 +5537,15 @@
+@@ -4620,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"
@@ -9604,7 +8909,7 @@
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 @@
+@@ -4656,24 +5572,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9649,7 +8954,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4632,8 +5610,10 @@
+@@ -4682,8 +5610,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9661,7 +8966,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4646,27 +5626,26 @@
+@@ -4696,27 +5626,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9696,7 +9001,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4691,24 +5670,36 @@
+@@ -4741,24 +5670,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9741,7 +9046,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4717,8 +5708,10 @@
+@@ -4767,8 +5708,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9753,7 +9058,7 @@
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
ac_ext=c
-@@ -4731,13 +5724,13 @@
+@@ -4781,13 +5724,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9771,7 +9076,7 @@
:
fi
-@@ -4745,16 +5738,15 @@
+@@ -4795,16 +5738,15 @@
;;
esac
@@ -9792,7 +9097,7 @@
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 @@
+@@ -4831,24 +5773,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9837,7 +9142,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4807,8 +5811,10 @@
+@@ -4857,8 +5811,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9849,7 +9154,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4821,28 +5827,27 @@
+@@ -4871,28 +5827,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9886,7 +9191,7 @@
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 @@
+@@ -4919,24 +5874,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9931,7 +9236,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4895,8 +5912,10 @@
+@@ -4945,8 +5912,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9943,7 +9248,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4909,28 +5928,27 @@
+@@ -4959,28 +5928,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9980,7 +9285,7 @@
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 @@
+@@ -5007,24 +5975,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10025,7 +9330,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4983,8 +6013,10 @@
+@@ -5033,8 +6013,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10037,7 +9342,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4997,13 +6029,13 @@
+@@ -5047,13 +6029,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10055,7 +9360,7 @@
:
fi
-@@ -5015,13 +6047,13 @@
+@@ -5065,13 +6047,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -10073,7 +9378,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5029,16 +6061,15 @@
+@@ -5079,16 +6061,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -10094,7 +9399,7 @@
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 @@
+@@ -5115,24 +6096,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10139,7 +9444,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5091,8 +6134,10 @@
+@@ -5141,8 +6134,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10151,7 +9456,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5105,13 +6150,13 @@
+@@ -5155,13 +6150,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10169,7 +9474,7 @@
:
fi
-@@ -5123,16 +6168,15 @@
+@@ -5173,16 +6168,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -10190,7 +9495,7 @@
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 @@
+@@ -5209,24 +6203,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10235,7 +9540,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5185,8 +6241,10 @@
+@@ -5235,8 +6241,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10247,7 +9552,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5199,28 +6257,27 @@
+@@ -5249,28 +6257,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10284,7 +9589,7 @@
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 @@
+@@ -5297,24 +6304,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10329,7 +9634,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5273,8 +6342,10 @@
+@@ -5323,8 +6342,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10341,7 +9646,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5287,28 +6358,27 @@
+@@ -5337,28 +6358,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10378,7 +9683,7 @@
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 @@
+@@ -5385,24 +6405,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10423,7 +9728,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5361,8 +6443,10 @@
+@@ -5411,8 +6443,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10435,7 +9740,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5375,28 +6459,27 @@
+@@ -5425,28 +6459,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10472,7 +9777,7 @@
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 @@
+@@ -5473,24 +6506,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10517,7 +9822,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5449,8 +6544,10 @@
+@@ -5499,8 +6544,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10529,7 +9834,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5463,13 +6560,13 @@
+@@ -5513,13 +6560,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10547,7 +9852,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5477,37 +6574,37 @@
+@@ -5527,37 +6574,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -10599,7 +9904,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5539,24 +6636,36 @@
+@@ -5589,24 +6636,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10644,7 +9949,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5565,18 +6674,19 @@
+@@ -5615,18 +6674,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10668,7 +9973,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5596,16 +6706,15 @@
+@@ -5646,16 +6706,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10689,7 +9994,7 @@
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 @@
+@@ -5682,24 +6741,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10734,7 +10039,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5658,8 +6779,10 @@
+@@ -5708,8 +6779,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10746,7 +10051,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5672,29 +6795,28 @@
+@@ -5722,29 +6795,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10784,7 +10089,7 @@
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 @@
+@@ -5771,24 +6843,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10829,7 +10134,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5747,8 +6881,10 @@
+@@ -5797,8 +6881,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10841,7 +10146,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5761,28 +6897,27 @@
+@@ -5811,28 +6897,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10878,7 +10183,7 @@
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 @@
+@@ -5859,24 +6944,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10923,7 +10228,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5835,8 +6982,10 @@
+@@ -5885,8 +6982,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10935,7 +10240,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5849,28 +6998,27 @@
+@@ -5899,28 +6998,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10972,7 +10277,7 @@
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 @@
+@@ -5947,24 +7045,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11017,7 +10322,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5923,8 +7083,10 @@
+@@ -5973,8 +7083,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11029,7 +10334,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5937,28 +7099,27 @@
+@@ -5987,28 +7099,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11066,7 +10371,7 @@
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 @@
+@@ -6035,24 +7146,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11111,7 +10416,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6011,8 +7184,10 @@
+@@ -6061,8 +7184,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11123,7 +10428,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6025,28 +7200,27 @@
+@@ -6075,28 +7200,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11160,7 +10465,7 @@
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 @@
+@@ -6123,24 +7247,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11205,7 +10510,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6099,8 +7285,10 @@
+@@ -6149,8 +7285,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11217,7 +10522,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6113,13 +7301,13 @@
+@@ -6163,13 +7301,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11235,7 +10540,7 @@
:
fi
-@@ -6226,13 +7414,13 @@
+@@ -6276,13 +7414,13 @@
fi
@@ -11252,7 +10557,7 @@
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 @@
+@@ -6312,8 +7450,13 @@
#endif
Syntax error
_ACEOF
@@ -11268,7 +10573,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6288,9 +7481,10 @@
+@@ -6338,9 +7481,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11280,7 +10585,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6300,8 +7494,13 @@
+@@ -6350,8 +7494,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11296,7 +10601,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6328,6 +7527,7 @@
+@@ -6378,6 +7527,7 @@
ac_preproc_ok=:
break
fi
@@ -11304,7 +10609,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6345,8 +7545,8 @@
+@@ -6395,8 +7545,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -11315,7 +10620,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6369,8 +7569,13 @@
+@@ -6419,8 +7569,13 @@
#endif
Syntax error
_ACEOF
@@ -11331,7 +10636,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6395,9 +7600,10 @@
+@@ -6445,9 +7600,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11343,7 +10648,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6407,8 +7613,13 @@
+@@ -6457,8 +7613,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11359,7 +10664,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6435,6 +7646,7 @@
+@@ -6485,6 +7646,7 @@
ac_preproc_ok=:
break
fi
@@ -11367,7 +10672,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6461,16 +7673,15 @@
+@@ -6511,16 +7673,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -11388,7 +10693,7 @@
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 @@
+@@ -6547,24 +7708,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11433,7 +10738,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6523,8 +7746,10 @@
+@@ -6573,8 +7746,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11445,7 +10750,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6537,22 +7762,21 @@
+@@ -6587,22 +7762,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11474,7 +10779,7 @@
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 @@
+@@ -6618,36 +7792,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -11521,7 +10826,7 @@
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 @@
+@@ -6674,24 +7848,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11566,7 +10871,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6650,8 +7886,10 @@
+@@ -6700,8 +7886,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11578,7 +10883,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6664,29 +7902,28 @@
+@@ -6714,29 +7902,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11616,7 +10921,7 @@
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 @@
+@@ -6763,24 +7950,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11661,7 +10966,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6739,8 +7988,10 @@
+@@ -6789,8 +7988,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11673,7 +10978,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6753,13 +8004,13 @@
+@@ -6803,13 +8004,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11691,7 +10996,7 @@
:
fi
-@@ -6769,13 +8020,13 @@
+@@ -6819,13 +8020,13 @@
@@ -11709,7 +11014,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6788,13 +8039,13 @@
+@@ -6838,13 +8039,13 @@
@@ -11727,7 +11032,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6808,16 +8059,15 @@
+@@ -6858,16 +8059,15 @@
case $host in
*-*-linux-gnu)
@@ -11748,7 +11053,7 @@
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 @@
+@@ -6894,24 +8094,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11793,7 +11098,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6870,8 +8132,10 @@
+@@ -6920,8 +8132,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11805,7 +11110,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6884,20 +8148,19 @@
+@@ -6934,20 +8148,19 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11832,7 +11137,7 @@
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 @@
+@@ -6974,24 +8187,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11877,7 +11182,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6950,8 +8225,10 @@
+@@ -7000,8 +8225,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11889,7 +11194,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6964,20 +8241,20 @@
+@@ -7014,20 +8241,20 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11916,7 +11221,7 @@
:
KDE_NO_UNDEFINED=""
fi
-@@ -6990,13 +8267,13 @@
+@@ -7040,13 +8267,13 @@
@@ -11934,7 +11239,7 @@
if test "$kde_use_nmcheck" = "yes"; then
KDE_USE_NMCHECK_TRUE=""
-@@ -7011,10 +8288,9 @@
+@@ -7061,10 +8288,9 @@
@@ -11947,7 +11252,7 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -7033,12 +8309,12 @@
+@@ -7083,12 +8309,12 @@
esac
else
enable_shared=yes
@@ -11964,7 +11269,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7057,18 +8333,19 @@
+@@ -7107,18 +8333,19 @@
esac
else
enable_static=no
@@ -11989,7 +11294,7 @@
if test "$kdelibsuff" = "auto"; then
-@@ -7089,8 +8366,8 @@
+@@ -7139,8 +8366,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -12000,7 +11305,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7106,14 +8383,13 @@
+@@ -7156,14 +8383,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -12019,7 +11324,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7132,10 +8408,11 @@
+@@ -7182,10 +8408,11 @@
esac
else
enable_fast_install=yes
@@ -12034,7 +11339,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7159,7 +8436,7 @@
+@@ -7209,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
@@ -12043,7 +11348,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7188,37 +8465,184 @@
+@@ -7238,37 +8465,184 @@
fi
SED=$lt_cv_path_SED
@@ -12245,7 +11550,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7247,11 +8671,11 @@
+@@ -7297,11 +8671,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -12261,7 +11566,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7264,7 +8688,7 @@
+@@ -7314,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,
@@ -12270,7 +11575,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'*)
-@@ -7284,21 +8708,21 @@
+@@ -7334,21 +8708,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -12299,7 +11604,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7308,29 +8732,38 @@
+@@ -7358,29 +8732,38 @@
;;
esac
fi
@@ -12346,7 +11651,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7338,56 +8771,63 @@
+@@ -7388,56 +8771,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -12444,7 +11749,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7414,44 +8854,36 @@
+@@ -7464,44 +8854,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -12499,7 +11804,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7467,7 +8899,7 @@
+@@ -7517,7 +8899,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -12508,7 +11813,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
-@@ -7483,43 +8915,27 @@
+@@ -7533,43 +8915,27 @@
esac
;;
@@ -12565,7 +11870,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
-@@ -7538,32 +8954,22 @@
+@@ -7588,32 +8954,22 @@
;;
openbsd*)
@@ -12601,7 +11906,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]'
-@@ -7584,17 +8990,20 @@
+@@ -7634,17 +8990,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12625,7 +11930,7 @@
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 @@
+@@ -7653,14 +9012,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12646,16 +11951,16 @@
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 @@
+@@ -7687,7 +9049,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7640 "configure"' > conftest.$ac_ext
+- echo '#line 7690 "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=$?
-@@ -7680,14 +9092,13 @@
+@@ -7730,14 +9092,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12672,7 +11977,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7699,7 +9110,6 @@
+@@ -7749,7 +9110,6 @@
esac
;;
*64-bit*)
@@ -12680,7 +11985,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7724,8 +9134,8 @@
+@@ -7774,8 +9134,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12691,7 +11996,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7751,24 +9161,36 @@
+@@ -7801,24 +9161,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12736,7 +12041,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7777,9 +9199,10 @@
+@@ -7827,9 +9199,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12749,7 +12054,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -7788,13 +9211,33 @@
+@@ -7838,13 +9211,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12785,7 +12090,7 @@
esac
-@@ -7802,8 +9245,8 @@
+@@ -7852,8 +9245,8 @@
@@ -12796,7 +12101,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7827,24 +9270,36 @@
+@@ -7877,24 +9270,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12841,7 +12146,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7853,9 +9308,10 @@
+@@ -7903,9 +9308,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12854,7 +12159,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7911,6 +9367,7 @@
+@@ -7961,6 +9367,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12862,7 +12167,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7930,18 +9387,27 @@
+@@ -7980,18 +9387,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12896,7 +12201,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7954,12 +9420,14 @@
+@@ -8004,12 +9420,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12914,7 +12219,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7982,9 +9450,9 @@
+@@ -8032,9 +9450,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12927,7 +12232,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -7998,24 +9466,36 @@
+@@ -8048,24 +9466,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12972,7 +12277,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8024,12 +9504,14 @@
+@@ -8074,12 +9504,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12991,7 +12296,7 @@
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 @@
+@@ -8094,18 +9526,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -13019,7 +12324,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8066,24 +9549,36 @@
+@@ -8116,24 +9549,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -13064,7 +12369,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8092,15 +9587,16 @@
+@@ -8142,15 +9587,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13087,7 +12392,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8109,8 +9605,13 @@
+@@ -8159,8 +9605,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -13103,7 +12408,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8134,9 +9635,10 @@
+@@ -8184,9 +9635,10 @@
ac_header_preproc=no
fi
@@ -13116,7 +12421,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8160,25 +9662,19 @@
+@@ -8210,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;}
@@ -13149,7 +12454,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8190,12790 +9686,12907 @@
+@@ -8240,324 +9686,693 @@
done
@@ -13262,7 +12567,7 @@
-
-
-# Provide some information about the compiler.
--echo "$as_me:8285:" \
+-echo "$as_me:8335:" \
- "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
@@ -13394,22 +12699,6 @@
-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. */
@@ -13423,10 +12712,23 @@
+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
+ 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_cv_prog_f77_g=yes
+ (exit $ac_status); } >/dev/null; then
@@ -13436,21 +12738,33 @@
+ else
+ ac_cpp_err=
+ fi
-+else
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_prog_f77_g=no
+ ac_cpp_err=yes
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+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
-
--ac_cv_prog_f77_g=no
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ # Passes both tests.
+ac_preproc_ok=:
+break
-+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"
+
+rm -f conftest.err conftest.$ac_ext
+
@@ -13459,27 +12773,14 @@
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
-
- 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
++
++fi
+ CXXCPP=$ac_cv_prog_CXXCPP
- else
-- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-- FFLAGS="-O2"
++else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
@@ -13523,88 +12824,26 @@
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
else
-- FFLAGS=
+- FFLAGS="-g"
+ ac_cpp_err=
fi
-+else
+ else
+- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+- FFLAGS="-O2"
+ ac_cpp_err=yes
- 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
++fi
+if test -z "$ac_cpp_err"; then
+ :
- 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
-- ;;
++else
+ 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
-
-- *)
-- # 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
@@ -13631,9 +12870,10 @@
+ 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
@@ -13643,31 +12883,32 @@
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-
++
+ # Passes both tests.
+ac_preproc_ok=:
+break
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
+-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
+rm -f conftest.err conftest.$ac_ext
-+
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
- else
-- echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
++else
+ { { 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
++fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
@@ -13675,13 +12916,13 @@
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+fi
--
--# 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
+-# 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
+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'
@@ -13696,6 +12937,24 @@
+if test "${ac_cv_prog_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
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
+- ;;
+-
+- 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;
+- ;;
+ if test -n "$F77"; then
+ ac_cv_prog_F77="$F77" # Let the user override the test.
+else
@@ -13714,17 +12973,16 @@
+done
+IFS=$as_save_IFS
--# 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'
+- 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;
+- ;;
+fi
+fi
+F77=$ac_cv_prog_F77
@@ -13736,26 +12994,30 @@
+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'"
+- *)
+- # 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
--# 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
+ 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
@@ -13780,61 +13042,31 @@
+ 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
++ fi
+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
+-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
+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
+ else
+- echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
-+fi
+ 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
@@ -13852,21 +13084,14 @@
+ 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
+-# 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
+-# These are sane defaults that work on at least a few old systems.
+# 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`
@@ -13877,13 +13102,8 @@
+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
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
@@ -13892,27 +13112,8 @@
+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'
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
@@ -13925,13 +13126,7 @@
+ 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
@@ -13945,33 +13140,8 @@
+ 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
++#endif
++
+ end
+_ACEOF
+rm -f conftest.$ac_objext
@@ -13982,38 +13152,11 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
++ 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
++ 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
@@ -14039,26 +13182,13 @@
+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
++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; }
@@ -14069,39 +13199,12 @@
+{ 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
-- 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
--
--
--
--
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ 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
@@ -14132,7 +13235,7 @@
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
- esac
++esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
@@ -14142,21 +13245,12 @@
+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; }
@@ -14175,72 +13269,27 @@
+ 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
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ i=0
+ teststring="ABCD"
-
--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
@@ -14249,51 +13298,14 @@
+ # 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.
@@ -14304,41 +13316,13 @@
+ # 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
@@ -14352,48 +13336,12 @@
+ 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
@@ -14439,289 +13387,45 @@
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ ;;
+ esac
-
-- 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
++
++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; }
- else
-- RANLIB="$ac_cv_prog_RANLIB"
++else
+ { 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
++fi
+
+
+
++
+# 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
--
--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
-
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
+ # [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]'
+ # Character class describing NM global symbol codes.
+@@ -8566,9 +10381,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
--# 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]*\)'
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # 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'"
--# 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]'
+@@ -8590,14 +10402,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'"
;;
--*)
-- 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]'
@@ -14729,12 +13433,14 @@
+ 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]'
-+ ;;
+ irix* | nonstopux*)
+ symcode='[BCDEGRST]'
+ ;;
+ osf*)
+ symcode='[BCDEGQRST]'
+ ;;
+-solaris* | sysv5*)
+- symcode='[BDT]'
+solaris*)
+ symcode='[BDRT]'
+ ;;
@@ -14746,676 +13452,164 @@
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[ABDT]'
-+ ;;
-+sysv4)
-+ symcode='[DFNSTU]'
;;
+ sysv4)
+ symcode='[DFNSTU]'
+@@ -8615,14 +10443,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
-- 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
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
--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.
++
+ # 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'"
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
--# 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
-
--# 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
-
--# 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
-
--# 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
-
-+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 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.
--#
--lt_prog_cc_shlib=
--if test "$GCC" = no; then
-- case $host_os in
-- sco3.2v5*)
-- lt_prog_cc_shlib='-belf'
-- ;;
-- esac
--fi
--if test -n "$lt_prog_cc_shlib"; then
-- { 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 :
-+ # 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
-+ lt_cv_sys_global_symbol_pipe=
- fi
--fi
-+done
-
-+fi
-
--#
--# Check to make sure the static flag actually works.
--#
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
--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
-+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
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -8740,15 +10571,15 @@
+ 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
+ { 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"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; 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
-- # Append any errors to the config.log.
-- cat conftest.err 1>&5
-- else
-- lt_prog_compiler_static_works=yes
-- fi
-- fi
-- $rm conftest*
-- LDFLAGS="$save_LDFLAGS"
--
+- echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6
+ { 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
+{ 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
+ 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
+@@ -8762,8 +10593,8 @@
fi
-+rmdir .libs 2>/dev/null
-+fi
+ rmdir .libs 2>/dev/null
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-echo "${ECHO_T}$lt_cv_objdir" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6; }
-+objdir=$lt_cv_objdir
+ objdir=$lt_cv_objdir
+@@ -8784,7 +10615,7 @@
-
--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_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.
+ # 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'
+ 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'
+ # Same as above, but do not quote variable references.
+@@ -8804,7 +10635,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
--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 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"
-+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
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -8814,8 +10645,8 @@
+ 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
+{ 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 "${ac_cv_prog_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8828,32 +10659,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_AR="${ac_tool_prefix}ar"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
+ 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
+ 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
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
+ { echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
-+else
+ 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
--#
--# 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
++
+ 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
+{ 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
+ 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
+@@ -8866,27 +10699,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_AR="ar"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
+ 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
+- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
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
+ 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
+ { 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
+ { 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"
-- ;;
+- AR=$ac_ct_AR
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
@@ -15428,157 +13622,96 @@
+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
++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
+ else
+ AR="$ac_cv_prog_AR"
+ fi
+@@ -8894,8 +10741,8 @@
+ 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
+{ 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
+ 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
+@@ -8908,32 +10755,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_RANLIB="${ac_tool_prefix}ranlib"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
+ 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
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
-+else
+ 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
-
--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
++
+ 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
+{ 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 "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8946,27 +10795,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_RANLIB="ranlib"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
+ 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
+ done
+ done
+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
+
+- 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
+ { 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
+ { 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
+- RANLIB=$ac_ct_RANLIB
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
@@ -15594,155 +13727,93 @@
+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
+ else
+ RANLIB="$ac_cv_prog_RANLIB"
+ fi
+@@ -8974,8 +10837,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
-+ 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 "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8988,32 +10851,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
+ 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
+ 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
+ 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
-- 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
++
+ 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
-+ 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 "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9026,27 +10891,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
+ 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
+- 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
+ 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
--EOF
-- fi
-- ;;
+- STRIP=$ac_ct_STRIP
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
@@ -15758,103 +13829,32 @@
+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
+ else
+ STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -9061,6 +10940,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"
-+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*)
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -9080,21 +10960,32 @@
+ 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
+ ;;
+ 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 ) ;;
@@ -15864,421 +13864,175 @@
+ 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
++
++
+ # 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
+ { 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 "*)
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9114,7 +11005,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
-+ :
-+ 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
+ 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
+@@ -9146,17 +11037,17 @@
- 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
+ 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
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
-+else
+ 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 $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
+ 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
+ { 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 "*)
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9176,7 +11067,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
-+ :
-+ else
-+ cat <<EOF 1>&2
+ 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
+@@ -9208,11 +11099,11 @@
-- 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
+ 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
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
-+else
+ 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
+
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
+@@ -9227,21 +11118,21 @@
+ enable_dlopen=yes
+ enable_win32_dll=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
-- # 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 or --disable-libtool-lock was given.
+# Check whether --enable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
+ if test "${enable_libtool_lock+set}" = set; then
+- enableval="$enable_libtool_lock"
+ 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
+-fi;
+ 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 or --without-pic was given.
+# Check whether --with-pic was given.
-+if test "${with_pic+set}" = set; then
+ if test "${with_pic+set}" = set; then
+- withval="$with_pic"
+- pic_mode="$withval"
+ withval=$with_pic; pic_mode="$withval"
-+else
-+ pic_mode=default
+ else
+ pic_mode=default
+-fi;
+fi
++
+ test -z "$pic_mode" && pic_mode=default
--int
--main ()
--{
-+test -z "$pic_mode" && pic_mode=default
+ # Use C for the default configuration in the libtool script
+@@ -9271,68 +11162,25 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
-- ;
-- 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
-+
-+
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+
+
+-#
+-# Check for any special shared library compilation flags.
+-#
+-lt_prog_cc_shlib=
+-if test "$GCC" = no; then
+- case $host_os in
+- sco3.2v5*)
+- lt_prog_cc_shlib='-belf'
+- ;;
+- esac
+-fi
+-if test -n "$lt_prog_cc_shlib"; then
+- { 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
+- { 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
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+-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
+- lt_prog_compiler_static_works=no
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; 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
+- # Append any errors to the config.log.
+- cat conftest.err 1>&5
+- else
+- lt_prog_compiler_static_works=yes
+- fi
+- fi
+- $rm conftest*
+- LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+-
+-if test x"$lt_prog_compiler_static_works" = xyes; then
+- :
+-else
+- lt_prog_compiler_static=
+-fi
+-
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
@@ -16291,321 +14045,92 @@
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
-+
-+
-+## 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'
-+
-+
+
+
+ ## CAVEAT EMPTOR:
+@@ -9346,8 +11194,8 @@
+ 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
+{ 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
+ 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 \
+@@ -9361,26 +11209,28 @@
+ # 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:'`
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9367: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11215: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9371: \$? = $ac_status" >&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
+ 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
-+ $rm conftest*
+ 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
+{ 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=
-+
+ 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"
+@@ -9394,8 +11244,8 @@
+ 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
+{ 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'
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+@@ -9433,6 +11283,11 @@
+ lt_prog_compiler_pic='-fno-common'
;;
-- 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.
- ;;
-
-- # 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.
++ ;;
++
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+@@ -9449,7 +11304,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
+ case $host_cpu in
-+ 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'
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -9475,6 +11330,16 @@
+ 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
@@ -16617,85 +14142,30 @@
+ esac
+ ;;
-- # 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.
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -9486,7 +11351,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
+ 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'
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -9509,13 +11374,20 @@
+ lt_prog_compiler_static='-Bstatic'
;;
- 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*)
+- case $CC in
+ 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)
@@ -16703,48 +14173,22 @@
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
-+ ccc*)
-+ lt_prog_compiler_wl='-Wl,'
-+ # All Alpha code is PIC.
-+ lt_prog_compiler_static='-non_shared'
-+ ;;
-+ esac
+ ccc*)
+ lt_prog_compiler_wl='-Wl,'
+ # All Alpha code is PIC.
+@@ -9530,15 +11402,15 @@
+ lt_prog_compiler_static='-non_shared'
;;
-- 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'
+- 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'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ lt_prog_compiler_wl='-Qoption ld ';;
@@ -16753,264 +14197,109 @@
+ esac
;;
-- 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'
+ sunos4*)
+@@ -9547,7 +11419,7 @@
+ lt_prog_compiler_static='-Bstatic'
;;
-- 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* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
-+ 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'
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+@@ -9560,6 +11432,17 @@
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'
+@@ -9571,16 +11454,16 @@
+ esac
+ 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 $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
+{ 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
+ #
+ # 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
+{ 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 \
+ if test "${lt_prog_compiler_pic_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9594,26 +11477,28 @@
+ # 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:'`
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9600: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11483: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9604: \$? = $ac_status" >&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
+ 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=yes
-+ fi
-+ fi
-+ $rm conftest*
+ lt_prog_compiler_pic_works=yes
+ fi
+ fi
+ $rm conftest*
-- *)
-- ld_shlibs=no
-- ;;
-- esac
-- fi
-+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: $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
+ if test x"$lt_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+@@ -9626,7 +11511,7 @@
+ 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=
-+ ;;
-+ *)
-+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-+ ;;
-+esac
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic=
+@@ -9636,8 +11521,50 @@
+ ;;
+ esac
- #
--# Do we need to explicitly link libc?
+-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
++#
+# 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; }
@@ -17038,263 +14327,117 @@
+ 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; }
-
-- 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 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
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9648,60 +11575,58 @@
+ 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 \
+- # 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:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9667: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11587: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9671: \$? = $ac_status" >&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
+ 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=yes
-+ fi
-+ fi
+ lt_cv_prog_compiler_c_o=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*
+ 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
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
+{ 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
+
+ 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
+ { 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
+ 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
+ { 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
+ 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;}
+@@ -9711,8 +11636,8 @@
+ 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
+{ 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=
+ runpath_var=
+ allow_undefined_flag=
+@@ -9750,6 +11675,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
@@ -17306,60 +14449,23 @@
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--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
-+ ;;
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+@@ -9760,6 +11695,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
-+ ;;
-+ esac
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -9770,6 +11709,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
--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.
@@ -17380,105 +14486,47 @@
+ *\ 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
+
-+*** 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
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -9807,7 +11767,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'
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ ld_shlibs=no
+ ld_shlibs=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}'
-+
-+ 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'
+@@ -9817,13 +11777,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
+ allow_undefined_flag=unsupported
-+ always_export_symbols=no
-+ enable_shared_with_static_runtimes=yes
+ 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'
+ 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
+
+ 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'
+ 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
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ 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='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -9832,23 +11792,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'
+ $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
@@ -17493,25 +14541,7 @@
+ 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=
@@ -17531,15 +14561,7 @@
+ 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~
@@ -17547,144 +14569,48 @@
+ $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
+ ;;
--freebsd1*)
-- dynamic_linker=no
-- ;;
+- netbsd*)
+ netbsd* | netbsdelf*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
+ 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'
+ 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
+ ;;
--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* | sysv5*)
+ solaris*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ ld_shlibs=no
-+ cat <<EOF 1>&2
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ cat <<EOF 1>&2
+@@ -9862,13 +11869,40 @@
--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
+ 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'
+ 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
@@ -17706,149 +14632,56 @@
+ esac
+ ;;
+
-+ sunos4*)
-+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ wlarc=
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ ;;
+ sunos4*)
+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -9878,24 +11912,19 @@
--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;;
-+ 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='$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'
+ 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
-- ;;
--# 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" = 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
+ if test "$ld_shlibs" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
+ export_dynamic_flag_spec=
+ whole_archive_flag_spec=
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
-+ 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
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -9907,7 +11936,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
+ 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
-+ 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.
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+@@ -9929,9 +11958,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
+ 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.
@@ -17862,236 +14695,87 @@
+ ;;
+ esac
--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
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -9948,7 +11989,7 @@
+ link_all_deplibs=yes
--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
+ 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`
-+ 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
+ # 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`
+@@ -9967,8 +12008,12 @@
+ 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
-+ # 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
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -9976,22 +12021,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'
+ 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
--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
-- ;;
+- # Let the compiler handle the export list.
+- always_export_symbols=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=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.
+ 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
+ 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
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10007,24 +12053,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
--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
++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_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;;
@@ -18099,155 +14783,48 @@
+esac
+eval "echo \"\$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'
+ 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_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -10038,19 +12096,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-- # 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
+-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
+
+- 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
-- 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"
+ 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
- /* 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 dlopen ();
- int
- main ()
- {
--dlopen ();
-+
- ;
- return 0;
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -10069,24 +12128,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -18292,105 +14869,85 @@
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
+@@ -10100,8 +12171,10 @@
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
--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
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-- 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
+@@ -10110,13 +12183,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=' '
+ whole_archive_flag_spec='$convenience'
-+ archive_cmds_need_lc=yes
+ 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'
+ # 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
-+ ;;
+ fi
+ fi
+ ;;
+@@ -10129,7 +12200,7 @@
+ ld_shlibs=no
+ ;;
--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
-+ ;;
-
-- ;;
+- bsdi4*)
+ bsdi[45]*)
-+ export_dynamic_flag_spec=-rdynamic
-+ ;;
+ export_dynamic_flag_spec=-rdynamic
+ ;;
-- *)
-- 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=' '
+@@ -10139,13 +12210,13 @@
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec=' '
+- allow_undefined_flag=no
+ allow_undefined_flag=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='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ 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.
-+ old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ fix_srcfile_path='`cygpath -w "$srcfile"`'
-+ enable_shared_with_static_runtimes=yes
-+ ;;
+ # 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.
+@@ -10155,52 +12226,52 @@
+ ;;
--/* 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*)
+ 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
+- ;;
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag='${wl}-undefined ${wl}suppress'
@@ -18409,13 +14966,32 @@
+ esac
+ fi
+ ;;
-+ esac
+ 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}'
+ archive_cmds_need_lc=no
-+ hardcode_direct=no
-+ hardcode_automatic=yes
-+ hardcode_shlibpath_var=unsupported
+ hardcode_direct=no
+ hardcode_automatic=yes
+ hardcode_shlibpath_var=unsupported
+- whole_archive_flag_spec='-all_load $convenience'
+ 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'
@@ -18423,7 +14999,8 @@
+ # 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
+ else
+- ld_shlibs=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
@@ -18437,222 +15014,39 @@
+ ld_shlibs=no
+ ;;
+ esac
-+ fi
-+ ;;
+ fi
+ ;;
--#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
-+ ;;
+@@ -10234,8 +12305,8 @@
+ ;;
--#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 3 and greater uses gcc -shared to do shared libraries.
+- freebsd* | kfreebsd*-gnu)
+- archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ 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
-+ ;;
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+@@ -10243,7 +12314,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 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
+ 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'
+ 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
-+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator=:
-+ hardcode_direct=yes
+ 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
+@@ -10257,47 +12328,62 @@
+ export_dynamic_flag_spec='${wl}-E'
+ ;;
--/* 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* | 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='$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 $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -18660,70 +15054,16 @@
+ 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
@@ -18732,361 +15072,160 @@
+ ;;
+ 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
+ ;;
+ esac
+ else
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 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
+ ;;
+ esac
+ 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='${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_direct=no
-+ hardcode_shlibpath_var=no
-+ ;;
-+ *)
-+ hardcode_direct=yes
-+ export_dynamic_flag_spec='${wl}-E'
+ 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'
--/* 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
-+ ;;
+@@ -10311,7 +12397,7 @@
--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
+ 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'
+ 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'
-+ fi
-+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator=:
-+ 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'
+@@ -10321,7 +12407,7 @@
+ link_all_deplibs=yes
+ ;;
--/* 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*)
+ 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
-+ 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
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -10344,7 +12430,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'
+ 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
-+ 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'
-+ ;;
-+ *)
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+@@ -10354,7 +12441,7 @@
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+- archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
-+ ;;
-
-+ os2*)
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_minus_L=yes
-+ allow_undefined_flag=unsupported
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+@@ -10365,14 +12452,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'
+ 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'
+ ;;
--fi
-+ osf3*)
-+ if test "$GCC" = yes; then
-+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+ 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'
+ 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'
-+ 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}\*'
+ 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'
+@@ -10384,13 +12471,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'
+ 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~
+ 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'
+ $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'
--fi
-+ # Both c and cxx compiler support -rpath directly
-+ hardcode_libdir_flag_spec='-rpath $libdir'
-+ fi
-+ hardcode_libdir_separator=:
-+ ;;
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10398,21 +12485,15 @@
+ hardcode_libdir_separator=:
+ ;;
-+ solaris*)
-+ no_undefined_flag=' -z text'
-+ if test "$GCC" = yes; then
+- 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'
+ 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~
+ 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'
+ $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'
-+ fi
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_shlibpath_var=no
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 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'
+@@ -10421,8 +12502,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' ;;
+ *)
+ # The compiler driver will combine linker options so we
+ # cannot just pass the convience library names through
@@ -19099,87 +15238,58 @@
+ *)
+ 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
-+ ;;
-
--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.
+ esac
+ link_all_deplibs=yes
+ ;;
+@@ -10431,7 +12522,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'
+ 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
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_direct=yes
-+ hardcode_minus_L=yes
-+ hardcode_shlibpath_var=no
-+ ;;
+ else
+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -10479,36 +12570,45 @@
+ fi
+ ;;
-+ 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.2uw2*)
+- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct=yes
+- hardcode_minus_L=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
-+ hardcode_shlibpath_var=no
+ hardcode_shlibpath_var=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
+ runpath_var='LD_RUN_PATH'
-- ;;
-- esac
-+ if test "$GCC" = yes; then
+- 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'
+ 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
+ else
+- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ 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
-+ ;;
+ fi
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var=no
+ ;;
-- if test "x$lt_cv_dlopen" != xno; then
-- enable_dlopen=yes
-- else
-- enable_dlopen=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=
+ 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
@@ -19190,17 +15300,13 @@
+ 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'
-
-- case $lt_cv_dlopen in
-- dlopen)
-- save_CPPFLAGS="$CPPFLAGS"
-- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ runpath_var='LD_RUN_PATH'
++
+ 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'
@@ -19208,203 +15314,77 @@
+ 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
-+ ;;
+ ;;
-- 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
-+ ;;
+ uts4*)
+@@ -10523,15 +12623,10 @@
+ esac
+ fi
-- 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
+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
+ 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.
+-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?
+ #
+@@ -10549,8 +12644,8 @@
+ # 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
+ { 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
+ $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
+@@ -10564,6 +12659,7 @@
+ 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*
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -10586,20 +12682,20 @@
+ 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
+ { 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*
--
--
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+ ;;
-+esac
+ ;;
+ 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
+{ 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=
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
+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"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -10609,7 +12705,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"
+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
@@ -19416,357 +15396,85 @@
+ else
+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
- 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
++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
--#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.
+@@ -10674,7 +12783,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'
+ 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
--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
-+ ;;
+ beos*)
+@@ -10683,7 +12792,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
-- 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
+-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}'
-+ 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
-+ ;;
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10699,7 +12808,7 @@
-- 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
+ 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
-+ 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~
+@@ -10711,7 +12820,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'
+ $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
-
--# 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'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -10741,7 +12851,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}'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ 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
+ ;;
+ esac
+ ;;
+@@ -10764,7 +12874,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)'
+ 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'
+ # 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"`
+@@ -10787,20 +12897,17 @@
+ dynamic_linker=no
;;
--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
+-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`
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
@@ -19777,211 +15485,66 @@
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
- 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
-+ ;;
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -10818,14 +12925,19 @@
+ 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
-+ ;;
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
- ;;
++ ;;
esac
-+ ;;
+ ;;
--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
+@@ -10845,9 +12957,9 @@
+ 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}'
-+ 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*)
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -10862,7 +12974,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ 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
-+ 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
-+ ;;
-+ *)
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -10873,7 +12985,7 @@
+ 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
-+ 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'
-+ ;;
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -10885,6 +12997,18 @@
+ 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
@@ -19993,89 +15556,51 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -10928,29 +13052,26 @@
+ ;;
--# 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.
+ # 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'
-+ 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
+ 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
--# 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,
+@@ -10960,6 +13081,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
@@ -20087,173 +15612,70 @@
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
-
--# 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
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -10969,7 +13102,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}'
+ 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
-+ ;;
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+@@ -10997,8 +13130,13 @@
--# 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
+ openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
-+ need_lib_prefix=no
+ 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
-+ 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
-+ ;;
+ 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
+@@ -11018,7 +13156,7 @@
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
-+os2*)
-+ libname_spec='$name'
+ 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'
-+ shlibpath_var=LIBPATH
-+ ;;
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -11036,13 +13174,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
--# 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
+-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
+- ;;
-
--# 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
-+ ;;
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -11068,7 +13199,7 @@
+ need_version=yes
+ ;;
--# An ERE matcher.
--EGREP=$lt_EGREP
+-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'
-+ 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
-+ ;;
+ 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'
+@@ -11101,6 +13232,29 @@
+ fi
+ ;;
--# 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
@@ -20276,177 +15698,126 @@
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
-
--# 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
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11112,16 +13266,21 @@
+ 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
+ test "$dynamic_linker" = no && can_build_shared=no
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-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
+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
-
--# 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" || \
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" || \
+- test -n "$runpath_var " || \
+- test "X$hardcode_automatic"="Xyes" ; then
+ test -n "$runpath_var" || \
+ test "X$hardcode_automatic" = "Xyes" ; then
--# 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
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct" != no &&
+@@ -11141,8 +13300,8 @@
+ # directories.
+ hardcode_action=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6; }
--# 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
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+@@ -11155,29 +13314,29 @@
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+striplib=
-+old_striplib=
+ 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
+{ 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"
+ 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
+ { 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"
+ 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
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
-+ else
+ 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: result: no" >&5
+-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
-+ ;;
-+ esac
-+fi
+ ;;
+ esac
+ fi
+@@ -11209,8 +13368,8 @@
--# 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=
-
--# 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
-+ ;;
-
--# Object file suffix (normally "o").
--objext="$ac_objext"
-+ mingw* | pw32*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-
--# Old archive suffix (normally "a").
--libext="$libext"
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
-+ ;;
-
--# Shared library suffix (normally ".so").
--shrext='$shrext'
-+ darwin*)
-+ # if libdl is installed we need to link against it
+ 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
+ { 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. */
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11223,40 +13382,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
--# Executable file suffix (normally "").
--exeext="$exeext"
+-/* 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
-+char dlopen ();
-+int
-+main ()
-+{
+ #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
+ ;
+ 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;;
@@ -20454,12 +15825,16 @@
+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_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;;
@@ -20467,148 +15842,92 @@
+esac
+eval "echo \"\$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'
+ 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
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11265,14 +13436,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic
--pic_mode=$pic_mode
+-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
-+fi
-
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+ 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
+ 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
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+@@ -11286,8 +13458,8 @@
+ ;;
--# 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
-
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
-+fi
-
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
-+ ;;
-
--# 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
+ { 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
+ if test "${ac_cv_func_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11314,53 +13486,59 @@
--# 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. */
+ #undef shl_load
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-
--# 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
-
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
+-/* 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
-+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. */
+ #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)
+#if defined __stub_shl_load || defined __stub___shl_load
-+choke me
-+#endif
+ choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
--# 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 ()
-+{
+ int
+ main ()
+ {
+-return f != shl_load;
+return 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
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -20616,12 +15935,16 @@
+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_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;;
@@ -20629,74 +15952,73 @@
+esac
+eval "echo \"\$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'
+ 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_func_shl_load=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11369,18 +13547,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
--# 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
+ ac_cv_func_shl_load=no
-+fi
-
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
+ 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
+{ 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
+ 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
+ { 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. */
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11393,40 +13572,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
--# 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 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
-+char shl_load ();
-+int
-+main ()
-+{
+ #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 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
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -20704,12 +16026,16 @@
+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_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;;
@@ -20717,108 +16043,88 @@
+esac
+eval "echo \"\$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'
+ 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_dld_shl_load=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11435,19 +13626,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
--# 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
+ ac_cv_lib_dld_shl_load=no
-+fi
-
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
+ 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
+ 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
+{ 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
+ 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
+ { 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
+ if test "${ac_cv_func_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11474,53 +13666,59 @@
--# 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. */
+ #undef dlopen
--# 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 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
-+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. */
+ #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)
+#if defined __stub_dlopen || defined __stub___dlopen
-+choke me
-+#endif
+ choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+ #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 ()
-+{
+ int
+ main ()
+ {
+-return f != dlopen;
+return dlopen ();
-+ ;
-+ 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
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -20826,12 +16132,16 @@
+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_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;;
@@ -20839,83 +16149,73 @@
+esac
+eval "echo \"\$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'
+ 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_func_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11529,18 +13727,19 @@
+ 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
+ ac_cv_func_dlopen=no
-+fi
-
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
+ 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
+{ 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
+ 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
+ { 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. */
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11553,40 +13752,52 @@
+ 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 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
-+char dlopen ();
-+int
-+main ()
-+{
+ #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
+ ;
+ 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;;
@@ -20923,12 +16223,16 @@
+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_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;;
@@ -20936,72 +16240,74 @@
+esac
+eval "echo \"\$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'
+ 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
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11595,19 +13806,20 @@
+ 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
+ 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
+ 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
+ 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
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
+ 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
+ { 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. */
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11620,40 +13832,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
+-/* 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
-+char dlopen ();
-+int
-+main ()
-+{
+ #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
+ ;
+ 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;;
@@ -21009,12 +16315,16 @@
+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_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;;
@@ -21022,72 +16332,74 @@
+esac
+eval "echo \"\$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'
+ 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_svld_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11662,19 +13886,20 @@
+ 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
+ ac_cv_lib_svld_dlopen=no
-+fi
-
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 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
+ 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
+{ 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
+ 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
+ { 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. */
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11687,40 +13912,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action
+-/* 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
-+char dld_link ();
-+int
-+main ()
-+{
+ #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 dld_link ();
-+ ;
-+ 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
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21095,12 +16407,16 @@
+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_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;;
@@ -21108,1092 +16424,858 @@
+esac
+eval "echo \"\$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'
+ 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_dld_dld_link=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11729,14 +13966,15 @@
+ 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
+ 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
+ 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
+ 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
+{ 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 test $ac_cv_lib_dld_dld_link = yes; then
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ fi
+@@ -11771,13 +14009,13 @@
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--# 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"
+ save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 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"
+ 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
+ { 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
+ if test "${lt_cv_dlopen_self+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11787,7 +14025,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11790 "configure"
+#line 14028 "configure"
-+#include "confdefs.h"
+ #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); */
-+ }
+ #if HAVE_DLFCN_H
+@@ -11844,6 +14082,8 @@
+ 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"
-+ 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
+ exit (status);
+ }
+@@ -11853,12 +14093,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 ;;
+ 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
-+ lt_cv_dlopen_self=no
-+ fi
- fi
-+rm -fr conftest*
+ esac
+ else :
+ # compilation failed
+@@ -11869,13 +14109,13 @@
--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
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+{ 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
+ 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
+ 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
+ if test "${lt_cv_dlopen_self_static+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11885,7 +14125,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11888 "configure"
+#line 14128 "configure"
-+#include "confdefs.h"
+ #include "confdefs.h"
--# 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); */
-+ }
+ #if HAVE_DLFCN_H
+@@ -11942,6 +14182,8 @@
+ 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
-- 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
+ exit (status);
+ }
+@@ -11951,12 +14193,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 ;;
+ 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
-+ lt_cv_dlopen_self_static=no
-+ fi
-+fi
-+rm -fr conftest*
+ esac
+ else :
+ # compilation failed
+@@ -11967,8 +14209,8 @@
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-+ fi
+ fi
-+ CPPFLAGS="$save_CPPFLAGS"
-+ LDFLAGS="$save_LDFLAGS"
-+ LIBS="$save_LIBS"
-+ ;;
-+ esac
+ CPPFLAGS="$save_CPPFLAGS"
+@@ -11989,19 +14231,19 @@
+ fi
--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
--# 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
-
--# 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 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
+# 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; }
--# 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
+{ 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
+ 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
--fi
--if test -n "${lt_cv_path_LDCXX+set}"; then
-- lt_cv_path_LD=$lt_cv_path_LDCXX
--else
-- unset lt_cv_path_LD
--fi
--test -z "${LDCXX+set}" || LD=$LDCXX
--CC=${CXX-"c++"}
--compiler=$CC
--compiler_CXX=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
+ # 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
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -12010,58 +14252,21 @@
+ 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*)
+aix4* | aix5*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+esac
+ 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
+-echo "${ECHO_T}$enable_shared" >&6
+{ 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
+{ 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
+ # 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
+{ 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.
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -12076,7 +14281,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 \
-+ 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
+ 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 \
+@@ -12190,11 +14396,11 @@
+ SED=$lt_SED
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # 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
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -12224,6 +14430,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
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -12235,6 +14447,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler
+
+@@ -12254,7 +14469,7 @@
+ NM=$lt_NM
+
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -12285,7 +14500,7 @@
+ libext="$libext"
+
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -12300,7 +14515,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -12527,7 +14742,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
+
+
+@@ -12540,11 +14758,11 @@
+ CC="$lt_save_CC"
+
+
+-# Check whether --with-tags or --without-tags was given.
++# Check whether --with-tags was given.
+ if test "${with_tags+set}" = set; then
+- withval="$with_tags"
+- tagnames="$withval"
+-fi;
++ withval=$with_tags; tagnames="$withval"
++fi
++
+
+ if test -f "$ltmain" && test -n "$tagnames"; then
+ if test ! -f "${ofile}"; then
+@@ -12562,6 +14780,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
+
+ # Extract list of available tagged configurations in $ofile.
+ # Note that this assumes the entire list is on one line.
+@@ -12592,8 +14813,10 @@
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
+- ac_ext=cc
++ 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'
+@@ -12612,6 +14835,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=
+@@ -12629,7 +14853,7 @@
+ compiler_lib_search_path_CXX=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -12639,17 +14863,34 @@
+ 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'
++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
+@@ -12660,18 +14901,27 @@
+ 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
+- 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
+-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-%%"`
++
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -12685,18 +14935,18 @@
+ # Set up default GNU C++ configuration
+
+
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
++# 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
++ 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.
++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"/'`
++ { 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
+@@ -12725,11 +14975,11 @@
;;
esac
--elif test "$with_gnu_ld" = yes; then
+ 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 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,
++ { 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
+@@ -12742,7 +14992,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.
-- # 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
++ # 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'*)
+@@ -12762,21 +15012,21 @@
--LD="$lt_cv_path_LD"
--if test -n "$LD"; then
+ 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: $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: 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
++{ 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.
--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
++ # 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
+@@ -12786,8 +15036,8 @@
+ ;;
+ 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;}
++{ 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
-+ 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
+@@ -12795,8 +15045,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
- 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'
-+# A sed program that does not truncate output.
-+SED=$lt_SED
++ 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'
-+# 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.
+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -12822,7 +15072,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.
- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
-- fi
-+# ### BEGIN LIBTOOL CONFIG
++ 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"'
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ # Commands to make compiler produce verbose output that lists
+@@ -12837,8 +15087,8 @@
+ fi
--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
+ # 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
++{ 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*)
+@@ -12853,8 +15103,23 @@
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
- # KDE requires run time linking. Make it the default.
- aix_use_runtimelinking=yes
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-- fi
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++ 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
+@@ -12871,7 +15136,7 @@
+ link_all_deplibs_CXX=yes
-- # 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
+ 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'
-- 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
++ 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`
+@@ -12890,8 +15155,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
+@@ -12900,15 +15169,16 @@
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
-- else
++ shared_flag='${wl}-G'
+ else
- shared_flag='-qmkshrobj'
-- 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
++ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
- # Let the compiler handle the export list.
- always_export_symbols_CXX=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_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
-
--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
++ # 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.
+@@ -12930,24 +15200,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
-- 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); } &&
++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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { 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
-- 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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$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
+@@ -12961,20 +15243,21 @@
+ 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
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-
--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
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++
++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"
-+# A C compiler.
-+LTCC=$lt_LTCC
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- 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"
-- 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"' -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 $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. */
-+# 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
++ 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
+@@ -12993,24 +15276,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
-- 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); } &&
++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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { 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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$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
+@@ -13024,8 +15319,10 @@
+ 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
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-
--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
-+# The linker used to build libraries.
-+LD=$lt_LD
++
++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'
+@@ -13034,16 +15331,26 @@
+ # -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=' '
-- archive_cmds_need_lc_CXX=yes
++ whole_archive_flag_spec_CXX='$convenience'
+ 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'
-- 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'
++ # 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
+ *)
+@@ -13057,12 +15364,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'
- allow_undefined_flag_CXX=no
-- always_export_symbols_CXX=no
-- enable_shared_with_static_runtimes_CXX=yes
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++ allow_undefined_flag_CXX=unsupported
+ always_export_symbols_CXX=no
+ enable_shared_with_static_runtimes_CXX=yes
-- 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'
-- # 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~
++ 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
+@@ -13071,70 +15378,81 @@
+ 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'
-- else
-- ld_shlibs_CXX=no
-- fi
-- ;;
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++ $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
- darwin* | rhapsody*)
- if test "$GXX" = yes; then
@@ -22214,7 +17296,12 @@
- allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-- fi
++ 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
- ;;
- esac
- lt_int_apple_cc_single_mod=no
@@ -22228,9 +17315,7 @@
- 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}'
@@ -22247,451 +17332,425 @@
- ld_shlibs_CXX=no
- fi
- ;;
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++ 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
++ ;;
-- dgux*)
-- case $cc_basename in
+ dgux*)
+ case $cc_basename in
- ec++)
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- ;;
++ 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
-- ;;
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13145,14 +15463,14 @@
+ ;;
+ esac
+ ;;
- freebsd12*)
-- # 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[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* | kfreebsd*-gnu)
-- # 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"
++ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ ld_shlibs_CXX=yes
+@@ -13169,12 +15487,12 @@
+ # location of the library.
-- case $cc_basename in
+ case $cc_basename in
- CC)
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- ;;
++ CC*)
+ # 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'
-- # 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.
++ 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.
+@@ -13183,11 +15501,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.
- 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'
-- ;;
-- *)
-- if test "$GXX" = yes; then
++ 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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-- else
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- fi
-- ;;
-- esac
-- ;;
-- hpux10*|hpux11*)
-- if test $with_gnu_ld = no; 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
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13197,33 +15515,22 @@
+ ;;
+ 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_ld_CXX='+b $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_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*)
-- hardcode_direct_CXX=no
-- hardcode_shlibpath_var_CXX=no
++ case $host_cpu in
++ hppa*64*|ia64*)
+ 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
-- 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"
+ ;;
+ *)
+ hardcode_direct_CXX=yes
+@@ -13234,17 +15541,20 @@
+ esac
-- case $cc_basename in
+ case $cc_basename in
- CC)
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- ;;
++ CC*)
+ # 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'
-- ;;
-- 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
++ 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
+@@ -13260,12 +15570,15 @@
+ *)
+ 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'
-- ;;
-- esac
-- fi
-- else
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- fi
-- ;;
-- esac
-- ;;
-- irix5* | irix6*)
-- case $cc_basename in
++ 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
+@@ -13276,11 +15589,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
- CC)
-- # SGI C++
++ CC*)
+ # 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'
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
++ 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'
-- # 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
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -13291,9 +15618,9 @@
+ *)
+ 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'
-- 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` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 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'
-- fi
-- fi
-- link_all_deplibs_CXX=yes
-- ;;
-- esac
-- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-- hardcode_libdir_separator_CXX=:
-- ;;
++ 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
+@@ -13302,16 +15629,16 @@
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+ ;;
- linux*)
-- case $cc_basename in
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
- KCC)
-- # Kuck and Associates, Inc. (KAI) C++ Compiler
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-- # 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'
-- # 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'
-- ;;
++ 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.
+@@ -13329,20 +15656,44 @@
+ # "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
-- archive_cmds_need_lc_CXX=no
++ 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
- 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)
-- # Compaq C++
++ 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++
- 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'
-+# Old archive suffix (normally "a").
-+libext="$libext"
++ 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'
-- 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
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -13370,7 +15721,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
- cxx)
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- ;;
-- *)
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- ;;
-- esac
-- ;;
++ cxx*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+@@ -13380,7 +15731,7 @@
+ ;;
+ esac
+ ;;
- netbsd*)
-- 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
++ 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=
+@@ -13391,15 +15742,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
- KCC)
-- # Kuck and Associates, Inc. (KAI) C++ Compiler
-+# Executable file suffix (normally "").
-+exeext="$exeext"
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-- # 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'
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic
-+pic_mode=$pic_mode
++ 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'
-- 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
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ hardcode_libdir_separator_CXX=:
+@@ -13409,14 +15776,14 @@
+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-- # 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)
-- # Rational C++ 2.4.1
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- ;;
++ 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}\*'
++ cxx*)
+ 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'
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++ 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'
-- 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}\*'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+@@ -13434,7 +15801,7 @@
+ *)
+ 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'
-+# Do we need a version for libraries?
-+need_version=$need_version
++ 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'
-- 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
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+@@ -13453,13 +15820,13 @@
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
- KCC)
-- # Kuck and Associates, Inc. (KAI) C++ Compiler
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-- # 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'
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static
++ 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'
-- 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'
-- ;;
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ hardcode_libdir_separator_CXX=:
+@@ -13468,17 +15835,17 @@
+ # 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
-- ;;
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
- cxx)
-- allow_undefined_flag_CXX=' -expect_unresolved \*'
++ cxx*)
+ 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_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_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 $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~
-- $rm $lib.exp'
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++ $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'
-- 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}\*'
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -13497,7 +15864,7 @@
+ *)
+ 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'
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
++ 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'
-- 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
-- ;;
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+@@ -13518,27 +15885,14 @@
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
- sco*)
- archive_cmds_need_lc_CXX=no
- case $cc_basename in
@@ -22705,51 +17764,54 @@
- ;;
- esac
- ;;
-- sunos4*)
-- case $cc_basename in
+ sunos4*)
+ case $cc_basename in
- CC)
-- # Sun C++ 4.x
-- # FIXME: insert proper C++ library support
-- ld_shlibs_CXX=no
-- ;;
++ 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
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13551,36 +15905,33 @@
+ ;;
+ solaris*)
+ case $cc_basename in
- CC)
-- # Sun C++ 4.2, 5.x and Centerline C++
-- no_undefined_flag_CXX=' -zdefs'
++ 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} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++ 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} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$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
++ $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'
-- 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.*) ;;
-- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
++ 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.
-- # Supported since Solaris 2.6 (maybe 2.5.1?)
++ # 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$convenience ${wl}-z ${wl}defaultextract'
-- ;;
-- esac
-- link_all_deplibs_CXX=yes
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++ 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
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
@@ -22760,794 +17822,356 @@
- # 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'
-+# 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
++ output_verbose_link_cmd='echo'
-- # 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'
-- ;;
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -13588,9 +15939,9 @@
+ # in the archive.
+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+ ;;
- gcx)
-- # Green Hills C++ Compiler
++ gcx*)
+ # Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${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
++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-- # 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
+ # The C++ compiler must be used to create the archive.
+ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -13600,9 +15951,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
- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${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_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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$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
++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-- # 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.
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+@@ -13611,9 +15962,9 @@
+ 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_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++ 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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$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
++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-- # 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
-- ;;
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+@@ -13626,18 +15977,69 @@
+ ;;
+ esac
+ ;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-- archive_cmds_need_lc_CXX=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++ no_undefined_flag_CXX='${wl}-z,text'
+ archive_cmds_need_lc_CXX=no
- ;;
- tandem*)
-- case $cc_basename in
++ hardcode_shlibpath_var_CXX=no
++ runpath_var='LD_RUN_PATH'
++
+ case $cc_basename in
- NCC)
- # NonStop-UX NCC 3.20
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
-- ;;
-- *)
++ 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'
+ ;;
+ *)
- # 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
++ 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
++ 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
+@@ -13651,8 +16053,8 @@
+ 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
++{ 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
--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.
+ GCC_CXX="$GXX"
+@@ -13688,7 +16090,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.
- 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
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-- 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
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -13728,7 +16130,7 @@
+ fi
+ ;;
-- -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)
-- # 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
++ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+ if test "$p" = "conftest.$objext"; then
+@@ -13764,6 +16166,29 @@
-- 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
+ $rm -f confest.$objext
-- *) ;; # 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
++# 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=
++ ;;
+
-+# 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
++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
+
-+ # 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)
+
-+ mv -f "$cfgfile" "$ofile" || \
-+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+ chmod +x "$ofile"
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13772,8 +16197,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
-- # 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
++{ 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"
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+@@ -13811,6 +16236,10 @@
+ # DJGPP does not support shared libraries at all
+ lt_prog_compiler_pic_CXX=
;;
-- hpux*)
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
++ 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
+@@ -13819,7 +16248,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
-- 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
++ case $host_cpu in
+ hppa*64*|ia64*)
;;
*)
-- lt_prog_compiler_pic_CXX='-fPIC'
-+ test "$with_gnu_ld" != yes && break
+@@ -13844,18 +16273,28 @@
;;
- 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
+ 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
-- ;;
-- dgux*)
-- 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'
-- ;;
++ ec++*)
+ lt_prog_compiler_pic_CXX='-KPIC'
+ ;;
- ghcx)
-- # Green Hills C++ Compiler
-- lt_prog_compiler_pic_CXX='-pic'
-- ;;
-- *)
-- ;;
-- esac
-- ;;
++ ghcx*)
+ # Green Hills C++ Compiler
+ lt_prog_compiler_pic_CXX='-pic'
+ ;;
+@@ -13863,22 +16302,22 @@
+ ;;
+ esac
+ ;;
- freebsd* | kfreebsd*-gnu)
-- # FreeBSD uses GNU C++
-- ;;
-- hpux9* | hpux10* | hpux11*)
-- case $cc_basename in
++ freebsd* | dragonfly*)
+ # FreeBSD uses GNU C++
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ case $cc_basename in
- CC)
-- lt_prog_compiler_wl_CXX='-Wl,'
++ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-- if test "$host_cpu" != ia64; then
-- lt_prog_compiler_pic_CXX='+Z'
-- fi
-- ;;
++ 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,'
++ aCC*)
+ 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
-- hppa*64*|ia64*)
-- # +Z the default
-- ;;
-- *)
-- lt_prog_compiler_pic_CXX='+Z'
-- ;;
-- esac
-- ;;
-- *)
-- ;;
-- esac
-- ;;
-- irix5* | irix6* | nonstopux*)
-- case $cc_basename in
++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -13891,9 +16330,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
- CC)
-- lt_prog_compiler_wl_CXX='-Wl,'
-- lt_prog_compiler_static_CXX='-non_shared'
-- # CC pic flag -KPIC is the default.
-- ;;
-- *)
-- ;;
-- esac
-- ;;
++ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_static_CXX='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -13902,20 +16345,26 @@
+ ;;
+ esac
+ ;;
- linux*)
-- case $cc_basename in
++ 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'
-- ;;
++ KCC*)
+ # KAI C++ Compiler
+ lt_prog_compiler_wl_CXX='--backend -Wl,'
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
- icpc)
-- # Intel C++
-- lt_prog_compiler_wl_CXX='-Wl,'
-- lt_prog_compiler_pic_CXX='-KPIC'
-- lt_prog_compiler_static_CXX='-static'
-- ;;
++ icpc* | ecpc*)
+ # Intel C++
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-static'
+ ;;
- 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
++ 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.
+@@ -13932,25 +16381,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
- cxx)
-- lt_prog_compiler_pic_CXX='-W c,exportall'
-- ;;
-- *)
-- ;;
-- esac
-- ;;
++ cxx*)
+ lt_prog_compiler_pic_CXX='-W c,exportall'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
- netbsd*)
-- ;;
-- osf3* | osf4* | osf5*)
-- case $cc_basename in
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
- KCC)
-- lt_prog_compiler_wl_CXX='--backend -Wl,'
-- ;;
++ KCC*)
+ lt_prog_compiler_wl_CXX='--backend -Wl,'
+ ;;
- RCC)
-- # Rational C++ 2.4.1
-- lt_prog_compiler_pic_CXX='-pic'
-- ;;
++ 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*)
-- ;;
++ cxx*)
+ # Digital/Compaq C++
+ lt_prog_compiler_wl_CXX='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -13964,24 +16413,15 @@
+ ;;
+ psos*)
+ ;;
- sco*)
- case $cc_basename in
- CC)
@@ -23557,163 +18181,182 @@
- ;;
- esac
- ;;
-- solaris*)
-- case $cc_basename in
+ 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 '
-- ;;
++ 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
++ gcx*)
+ # Green Hills C++ Compiler
+ lt_prog_compiler_pic_CXX='-PIC'
+ ;;
+@@ -13991,12 +16431,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
- CC)
-- # Sun C++ 4.x
-- lt_prog_compiler_pic_CXX='-pic'
-- lt_prog_compiler_static_CXX='-Bstatic'
-- ;;
++ 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
++ lcc*)
+ # Lucid
+ lt_prog_compiler_pic_CXX='-pic'
+ ;;
+@@ -14006,7 +16446,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
- NCC)
-- # NonStop-UX NCC 3.20
-- lt_prog_compiler_pic_CXX='-KPIC'
-- ;;
-- *)
-- ;;
-- esac
-- ;;
++ NCC*)
+ # NonStop-UX NCC 3.20
+ lt_prog_compiler_pic_CXX='-KPIC'
+ ;;
+@@ -14014,7 +16454,14 @@
+ ;;
+ esac
+ ;;
- unixware*)
-- ;;
-- vxworks*)
-- ;;
-- *)
-- lt_prog_compiler_can_build_shared_CXX=no
-- ;;
-- esac
-- fi
--
++ 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*)
+ ;;
+@@ -14024,16 +16471,16 @@
+ 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: 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"
++{ 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 \
+@@ -14047,26 +16494,28 @@
+ # 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: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
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14053: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16500: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14057: \$? = $ac_status" >&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
- if test ! -s conftest.err; then
-- 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.
++ # 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*
+
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
++{ 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
+@@ -14079,7 +16528,7 @@
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
-- # 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
--
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_CXX=
+@@ -14089,8 +16538,50 @@
+ ;;
+ 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
++#
++# 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"
++
++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
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_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-+with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -14101,60 +16592,58 @@
+ 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
@@ -23721,786 +18364,241 @@
- # 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: [^ ]*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
++ -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:14120: $lt_compile\"" >&5)
++ (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:14124: \$? = $ac_status" >&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
- if test ! -s out/conftest.err; then
-- lt_cv_prog_compiler_c_o_CXX=yes
-- fi
-- fi
++ $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 .
- $rm conftest* out/*
- rmdir out
-- cd ..
-- rmdir conftest
-- $rm conftest*
++ 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
+ 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'
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
-+ 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
+ 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: 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=
++ { 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;}
+@@ -14164,8 +16653,8 @@
+ need_locks=no
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 '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -14182,22 +16671,20 @@
+ 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 '\''s/.* //'\'' | sort | uniq > $export_symbols'
-- ;;
-- esac
++ 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
-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.
++{ 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
-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
-+ 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.
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -14215,8 +16702,8 @@
+ # 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. */
++ { 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
-+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*
+@@ -14230,6 +16717,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=
+@@ -14252,20 +16740,20 @@
+ 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;;
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+ ;;
+ esac
+ fi
+ ;;
esac
-+eval "echo \"\$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=
++{ 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"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -14275,7 +16763,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"
--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
++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
-+ 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
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
-- # 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.
+@@ -14340,7 +16841,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'
-- ;;
-+ chorus*)
-+ case $cc_basename in
-+ *)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ esac
-+ ;;
++ 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
-- ;;
-+ 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
+ beos*)
+@@ -14349,7 +16850,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
-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
-+ 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
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14365,7 +16866,7 @@
--cygwin* | mingw* | pw32*)
-- version_type=windows
+ cygwin* | mingw* | pw32*)
+ version_type=windows
- shrext=".dll"
-- 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
-+ ;;
++ 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~
+@@ -14377,7 +16878,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'
-- 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
++ $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'
+@@ -14407,7 +16909,7 @@
;;
-- 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'
+ 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
;;
-+ 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
+@@ -14430,7 +16932,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)'
-- # 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
-- ;;
--
++ 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"`
+@@ -14453,20 +16955,17 @@
+ dynamic_linker=no
+ ;;
+
-kfreebsd*-gnu*)
- version_type=linux
- need_lib_prefix=no
@@ -24515,261 +18613,103 @@
-
-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
-+ 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
-- ;;
++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*)
+@@ -14484,14 +16983,19 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
- freebsd3.01* | freebsdelf3.01*)
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=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
-- ;;
-+ esac
++ 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
+ ;;
--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
+@@ -14511,9 +17015,9 @@
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
- case "$host_cpu" in
-- ia64*)
++ 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
-+ 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
++ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -14528,7 +17032,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
-- hppa*64*)
+ 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_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -14539,7 +17043,7 @@
+ 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'
-+ 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'
++ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -14551,6 +17055,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
--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
++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 ;;
+@@ -14594,29 +17110,26 @@
+ ;;
--# 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.
+ # 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'
++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
@@ -24777,205 +18717,79 @@
- 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
--
-- # 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'
+ # 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
--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
++ # 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,
+@@ -14626,6 +17139,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
+@@ -14635,7 +17160,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}'
-- 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'
++ 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
+@@ -14663,8 +17188,13 @@
--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
+ openbsd*)
+ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ 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=LD_RUN_PATH
-+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+ hardcode_libdir_separator_CXX=:
++ # 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
+@@ -14684,7 +17214,7 @@
--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'
+ 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"
-- ;;
-+ 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
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -14702,13 +17232,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
-sco3.2v5*)
- version_type=osf
@@ -24983,157 +18797,92 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-+ # 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
+@@ -14734,7 +17257,7 @@
+ need_version=yes
+ ;;
--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*)
-- 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'
++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'
+@@ -14767,6 +17290,29 @@
+ fi
+ ;;
--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'
++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"
+ ;;
-+ *)
-+ 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'
-
--*)
-- dynamic_linker=no
-- ;;
--esac
++ 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}'
+@@ -14778,16 +17324,21 @@
+ 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: 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_CXX=
--if test -n "$hardcode_libdir_flag_spec_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
++
++{ 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
-+ # 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"'
++ test -n "$runpath_var_CXX" || \
++ test "X$hardcode_automatic_CXX" = "Xyes" ; then
-- # 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
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_CXX" != no &&
+@@ -14807,8 +17358,8 @@
+ # 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
--
++{ 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
+@@ -14819,1289 +17370,467 @@
+ enable_fast_install=needless
+ fi
+
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
@@ -25159,20 +18908,10 @@
- *)
- 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
@@ -25180,48 +18919,81 @@
-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'
++# 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
- 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
@@ -25237,20 +19009,27 @@
-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'
++ 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
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -25293,8 +19072,11 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_CXX=:
++ case $lt_echo in
++ *'\$0 --fallback-echo"')
++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++ ;;
++ esac
-ac_cv_lib_dl_dlopen=no
-fi
@@ -25307,74 +19089,20 @@
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-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"'
++cfgfile="$ofile"
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-+ else
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ fi
-+ ;;
-+ 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'
++ cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-fi
-+ 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
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- ;;
-+ output_verbose_link_cmd='echo'
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -25391,54 +19119,27 @@
-/* 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
-+ # 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'
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
-/* 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. */
-+ # 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'
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ # 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'
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
-#undef shl_load
-+ # 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
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -25459,16 +19160,8 @@
-#ifdef __cplusplus
-}
-#endif
-+ 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'
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
-int
-main ()
@@ -25504,42 +19197,10 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ 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'
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
-ac_cv_func_shl_load=no
-fi
@@ -25564,42 +19225,10 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ 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
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -25610,17 +19239,7 @@
-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;
@@ -25645,25 +19264,15 @@
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
+- 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
-+ (exit $ac_status); }; then
-+ # Parse the compiler output and extract the necessary
-+ # objects, libraries and library flags.
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
-ac_cv_lib_dld_shl_load=no
-fi
@@ -25690,38 +19299,28 @@
-/* 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
-+ # Sentinel used to keep track of whether or not we are before
-+ # the conftest object file.
-+ pre_test_object_deps_done=no
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
-/* 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. */
-+ # 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"`
++# A C compiler.
++LTCC=$lt_LTCC
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ for p in `eval $output_verbose_link_cmd`; do
-+ case $p in
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
-#undef dlopen
-+ -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
++# A language-specific compiler.
++CC=$lt_compiler_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -25742,29 +19341,8 @@
-#ifdef __cplusplus
-}
-#endif
-+ 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
-+ ;;
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
-int
-main ()
@@ -25800,7 +19378,9 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++# An ERE matcher.
++EGREP=$lt_EGREP
+
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -25824,7 +19404,9 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++# The linker used to build libraries.
++LD=$lt_LD_CXX
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -25866,13 +19448,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ *.$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
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
-ac_cv_lib_dl_dlopen=no
-fi
@@ -25898,20 +19475,8 @@
-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
-+ ;;
++# A BSD-compatible nm program.
++NM=$lt_NM
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -25954,7 +19519,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ *) ;; # Ignore the rest.
++# A symbol stripping program
++STRIP=$lt_STRIP
-ac_cv_lib_svld_dlopen=no
-fi
@@ -25980,8 +19546,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ esac
-+ done
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -26021,12 +19587,12 @@
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_dld_link=yes
-+ # Clean up.
-+ rm -f a.out a.exe
- else
+-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
+
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -26038,61 +19604,75 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
--
--
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
+
++# Used on cygwin: assembler.
++AS="$AS"
+
-fi
--
--
++# 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
+
-fi
--
--
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
+
++# Object file suffix (normally "o").
++objext="$ac_objext"
+
-fi
--
--
-+ echo "libtool.m4: error: problem compiling CXX test program"
- fi
++# Old archive suffix (normally "a").
++libext="$libext"
-+$rm -f confest.$objext
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
-fi
-+# 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=
-+ ;;
++# Executable file suffix (normally "").
++exeext="$exeext"
-+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
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+-fi
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+
+- ;;
+- esac
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
--
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
+
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
++# Do we need a version for libraries?
++need_version=$need_version
+
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
- 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
@@ -26105,22 +19685,20 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15398 "configure"
+-#line 15456 "configure"
-#include "confdefs.h"
-+case " $postdeps_CXX " in
-+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-+esac
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+lt_prog_compiler_wl_CXX=
-+lt_prog_compiler_pic_CXX=
-+lt_prog_compiler_static_CXX=
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
-#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; }
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -26131,10 +19709,8 @@
-# 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'
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -26157,24 +19733,32 @@
-# endif
-# endif
-#endif
--
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++# Library versioning type.
++version_type=$version_type
+
- exit (status);
-}
-EOF
@@ -26189,73 +19773,26 @@
- 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 ;;
-+ 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
+- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
- fi
-fi
-rm -fr conftest*
--
--
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+
++# 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
+
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
--
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+
- 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
@@ -26269,15 +19806,24 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15496 "configure"
+-#line 15554 "configure"
-#include "confdefs.h"
--
++# 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 HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
--
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
-#include <stdio.h>
--
++# 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
+
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -26287,7 +19833,12 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
--
++# 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
+
-/* 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
@@ -26309,24 +19860,36 @@
-# endif
-# endif
-#endif
--
++# 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
+
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
+
- exit (status);
-}
-EOF
@@ -26341,295 +19904,54 @@
- 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 ;;
-+ 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
+- esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
+- fi
-fi
-rm -fr conftest*
--
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
+
-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; }
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
- 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
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
- 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*
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
- 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
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+-fi
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
-+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
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -26687,7 +20009,9 @@
- lt_cv_prog_compiler_c_o_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
--
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+
- case $var in
- old_archive_cmds_CXX | \
- old_archive_from_new_cmds_CXX | \
@@ -26709,1200 +20033,443 @@
- ;;
- esac
- done
--
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
--
++# 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
+
-cfgfile="$ofile"
--
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
--
++# 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
+
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
+
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
--
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
+
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
--
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
--
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
+
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
--
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
+
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
--
++# 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
+
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
--
++# 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
+
-# The host system.
-host_alias=$host_alias
-host=$host
--
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
--
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_CXX
+
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
--
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_CXX
+
-# A C compiler.
-LTCC=$lt_LTCC
--
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
-# A language-specific compiler.
-CC=$lt_compiler_CXX
--
++# 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
+
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
--
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
+
-# An ERE matcher.
-EGREP=$lt_EGREP
--
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_CXX
+
-# The linker used to build libraries.
-LD=$lt_LD_CXX
--
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
--
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
-# A BSD-compatible nm program.
-NM=$lt_NM
--
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_CXX"
+
-# A symbol stripping program
-STRIP=$STRIP
--
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
+
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
--
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
--
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
--
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
+
-# Used on cygwin: assembler.
-AS="$AS"
--
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
+
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
--
++# ### END LIBTOOL TAG CONFIG: $tagname
+
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
--
++__EOF__
+
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
--
+
-# Object file suffix (normally "o").
-objext="$ac_objext"
--
++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
+
-# Old archive suffix (normally "a").
-libext="$libext"
--
+
-# Shared library suffix (normally ".so").
-shrext='$shrext'
--
++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
+
-# Executable file suffix (normally "").
-exeext="$exeext"
--
++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
+
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
--
++ else
++ tagname=""
++ fi
++ ;;
+
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
--
++ F77)
++ if test -n "$F77" && test "X$F77" != "Xno"; then
+
-# 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
++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
-# 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; }
++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
-# 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
@@ -27913,30 +20480,21 @@
-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
@@ -27955,1306 +20513,25 @@
-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
-
--# 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
-
--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
-
--GCC_F77="$G77"
--LD_F77="$LD"
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-
--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'
-
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- lt_prog_compiler_pic_F77=-Kconform_pic
-- fi
-- ;;
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-
-- 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
-
-- 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
-
-- 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
-- ;;
-
-- 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
+ # Object file extension for compiled f77 test sources.
+ objext=o
+@@ -16118,29 +17847,55 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
-- 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
@@ -29267,34 +20544,14 @@
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
-
-- 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
++
++
+ # 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%^.*/%%'`
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -29304,396 +20561,98 @@
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
-- # 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
-- ;;
+-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
+{ 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
+{ 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
+ 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.
+ # 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
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -16148,21 +17903,21 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4*)
+- test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
-+ ;;
-+esac
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
-- 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
+{ 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
+ # 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
+-
+-test "$ld_shlibs_F77" = no && can_build_shared=no
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
-- 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"
+ GCC_F77="$G77"
+ LD_F77="$LD"
+@@ -16171,8 +17926,8 @@
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
-- 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
+{ 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
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_F77='-Wl,'
+@@ -16210,6 +17965,11 @@
+ lt_prog_compiler_pic_F77='-fno-common'
;;
-- 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.
+ ;;
-
-- 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.
++
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+@@ -16226,7 +17986,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
+ case $host_cpu in
-+ 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'
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -16252,6 +18012,16 @@
+ 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
@@ -29705,97 +20664,30 @@
+ esac
+ ;;
--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.
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -16263,7 +18033,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
+ 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'
-+ ;;
-
-- 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'
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -16286,13 +18056,20 @@
+ lt_prog_compiler_static_F77='-Bstatic'
;;
-- 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*)
+- case $CC in
+ 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)
@@ -29803,310 +20695,130 @@
+ lt_prog_compiler_pic_F77='-fpic'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
-+ ccc*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ # All Alpha code is PIC.
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-+ esac
+ ccc*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ # All Alpha code is PIC.
+@@ -16307,15 +18084,15 @@
+ lt_prog_compiler_static_F77='-non_shared'
;;
-- 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
-- ;;
-- *)
-- 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'
+- 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'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ lt_prog_compiler_wl_F77='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl_F77='-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)'
-- # 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'
-+ ;;
+ sunos4*)
+@@ -16324,7 +18101,7 @@
+ lt_prog_compiler_static_F77='-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* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -16337,6 +18114,17 @@
+ fi
+ ;;
--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
-- ;;
+ uts4*)
+ lt_prog_compiler_pic_F77='-pic'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -16348,16 +18136,16 @@
+ esac
+ fi
--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
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
-+
-+#
-+# 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=
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_F77"; then
+
+-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
+{ 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 \
+ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16371,26 +18159,28 @@
+ # 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:'`
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16377: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18165: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16381: \$? = $ac_status" >&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
+ 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_F77=yes
-+ fi
-+ fi
-+ $rm conftest*
-+
-+fi
+ 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
+{ 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
+
+ if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+@@ -16403,7 +18193,7 @@
+ fi
+
+ fi
+-case "$host_os" in
+case $host_os in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ lt_prog_compiler_pic_F77=
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_F77=
+@@ -16413,8 +18203,50 @@
;;
- *)
-- 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
+ esac
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
-- dynamic_linker=no
-- ;;
+-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
+#
+# Check to make sure the static flag actually works.
+#
@@ -30137,192 +20849,117 @@
+ 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; }
-
-- # 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; }
-+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
-+
-+ 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 \
+ if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16425,60 +18257,58 @@
+ 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:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16444: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18269: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16448: \$? = $ac_status" >&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
+ 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_F77=yes
-+ fi
-+ fi
+ lt_cv_prog_compiler_c_o_F77=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*
-+
-+fi
+ 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
+{ 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
+
+
+ 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
+ { 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
+ 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
+ { 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
+ 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;}
+@@ -16488,8 +18318,8 @@
+ 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
+{ 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=
+ runpath_var=
+ allow_undefined_flag_F77=
+@@ -16527,6 +18357,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
@@ -30333,58 +20970,24 @@
+ 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
-+ ;;
+
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+@@ -16537,6 +18377,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
-+ ;;
-+ esac
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -16547,6 +18391,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
--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.
@@ -30405,142 +21008,48 @@
+ *\ 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
+
-+ 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
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -16584,7 +18449,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'
+ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ 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'
+ else
+ ld_shlibs_F77=no
+ fi
+@@ -16594,13 +18459,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
+ allow_undefined_flag_F77=unsupported
-+ always_export_symbols_F77=no
-+ enable_shared_with_static_runtimes_F77=yes
+ 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'
+ 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
+
+ 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'
+ 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
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ 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_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -16609,23 +18474,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'
+ $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_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
@@ -30555,13 +21064,7 @@
+ 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=
@@ -30581,14 +21084,7 @@
+ 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~
@@ -30598,171 +21094,53 @@
+ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
-+ fi
-+ ;;
+ 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
+- netbsd*)
+ netbsd* | netbsdelf*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
+ 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'
+ 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
+ ;;
-- # 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* | sysv5*)
+ solaris*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ ld_shlibs_F77=no
-+ cat <<EOF 1>&2
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs_F77=no
+ cat <<EOF 1>&2
+@@ -16639,13 +18551,40 @@
--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
+ 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'
+ 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
+ ;;
+ *)
@@ -30776,89 +21154,57 @@
+ ;;
+ 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=
+@@ -16655,24 +18594,19 @@
+
*)
-- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ 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_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'
+ 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
-- 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" = 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
+ 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)
-+ 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
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -16684,7 +18618,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
+ 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
-+ 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.
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct_F77=unsupported
+@@ -16706,9 +18640,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
+ 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.
@@ -30872,79 +21218,68 @@
+ ;;
+ esac
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -16725,7 +18671,7 @@
+ link_all_deplibs_F77=yes
--# 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
+ 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`
-+ 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
+ # 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`
+@@ -16744,8 +18690,12 @@
+ 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
-+ # 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
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -16753,45 +18703,58 @@
+ # 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
+
+- # Let the compiler handle the export list.
+- always_export_symbols_F77=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_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.
+ 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
+ cat >conftest.$ac_ext <<_ACEOF
-+ program main
-+
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ program main
+
+ 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
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -30952,12 +21287,16 @@
+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_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_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -30965,51 +21304,53 @@
+esac
+eval "echo \"\$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'
+ 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_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -16805,19 +18768,20 @@
+ 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
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+
-+
-+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
-+
+ 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"
+ 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"
+ 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"
+ 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
-+ program main
-+
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -16826,24 +18790,36 @@
+ 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
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -31017,12 +21358,16 @@
+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_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_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -31030,104 +21375,103 @@
+esac
+eval "echo \"\$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'
+ 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_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -16857,8 +18833,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
--# 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
++
+ 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
+ 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
+@@ -16867,13 +18845,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=' '
+ whole_archive_flag_spec_F77='$convenience'
-+ archive_cmds_need_lc_F77=yes
+ 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'
+ # 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
-+ ;;
+ fi
+ fi
+ ;;
+@@ -16886,7 +18862,7 @@
+ ld_shlibs_F77=no
+ ;;
--# 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
+- bsdi4*)
+ bsdi[45]*)
-+ export_dynamic_flag_spec_F77=-rdynamic
-+ ;;
+ export_dynamic_flag_spec_F77=-rdynamic
+ ;;
--# 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=' '
+@@ -16896,68 +18872,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
+ 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.
+ # 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_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ 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'
+ # 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"`'
+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-+ enable_shared_with_static_runtimes_F77=yes
-+ ;;
+ enable_shared_with_static_runtimes_F77=yes
+ ;;
--# A C compiler.
--LTCC=$lt_LTCC
-+ darwin* | rhapsody*)
+ 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
+- ;;
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
@@ -31146,13 +21490,32 @@
+ esac
+ fi
+ ;;
-+ esac
+ 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}'
+ archive_cmds_need_lc_F77=no
-+ hardcode_direct_F77=no
-+ hardcode_automatic_F77=yes
-+ hardcode_shlibpath_var_F77=unsupported
+ hardcode_direct_F77=no
+ hardcode_automatic_F77=yes
+ hardcode_shlibpath_var_F77=unsupported
+- whole_archive_flag_spec_F77='-all_load $convenience'
+ 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'
@@ -31160,7 +21523,8 @@
+ # 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
+ else
+- ld_shlibs_F77=no
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
@@ -31174,80 +21538,39 @@
+ ld_shlibs_F77=no
+ ;;
+ esac
-+ fi
-+ ;;
+ fi
+ ;;
--# 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
-+ ;;
+@@ -16991,8 +18967,8 @@
+ ;;
--# 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 3 and greater uses gcc -shared to do shared libraries.
+- freebsd* | kfreebsd*-gnu)
+- archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ 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
-+ ;;
+ hardcode_libdir_flag_spec_F77='-R$libdir'
+ hardcode_direct_F77=yes
+ hardcode_shlibpath_var_F77=no
+@@ -17000,7 +18976,7 @@
--# A BSD-compatible nm program.
--NM=$lt_NM
-+ hpux9*)
-+ if test "$GCC" = yes; then
+ 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'
+ 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
-+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ hardcode_direct_F77=yes
+ 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
+@@ -17014,47 +18990,62 @@
+ export_dynamic_flag_spec_F77='${wl}-E'
+ ;;
--# 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* | 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_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 $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -31255,22 +21578,16 @@
+ 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
@@ -31279,177 +21596,160 @@
+ ;;
+ 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
+ ;;
+ esac
+ else
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 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
+ ;;
+ 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_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_direct_F77=no
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+ *)
-+ hardcode_direct_F77=yes
-+ export_dynamic_flag_spec_F77='${wl}-E'
+ 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'
--# 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
-+ ;;
+@@ -17068,7 +19059,7 @@
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_F77
-+ irix5* | irix6* | nonstopux*)
-+ if test "$GCC" = yes; then
+ 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'
+ 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'
-+ fi
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ 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'
+@@ -17078,7 +19069,7 @@
+ link_all_deplibs_F77=yes
+ ;;
--# Object file suffix (normally "o").
--objext="$ac_objext"
+- netbsd*)
+ netbsd* | netbsdelf*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ 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
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -17101,7 +19092,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'
+ 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
-+ 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'
-+ ;;
-+ *)
+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_F77='${wl}-E'
+ else
+@@ -17111,7 +19103,7 @@
+ hardcode_libdir_flag_spec_F77='-R$libdir'
+ ;;
+ *)
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ 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
+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+ ;;
+ esac
+@@ -17122,14 +19114,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'
+ 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'
+ ;;
--# 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}\*'
+ 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'
+ 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'
-+ 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}\*'
+ 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'
+@@ -17141,13 +19133,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'
+ 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~
+ 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'
+ $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'
--# 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=:
-+ ;;
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec_F77='-rpath $libdir'
+@@ -17155,21 +19147,15 @@
+ hardcode_libdir_separator_F77=:
+ ;;
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
-+ solaris*)
-+ no_undefined_flag_F77=' -z text'
-+ if test "$GCC" = yes; then
+- 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'
+ 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~
+ 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'
+ $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'
-+ fi
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ hardcode_shlibpath_var_F77=no
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 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'
+@@ -17178,8 +19164,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' ;;
+ *)
+ # The compiler driver will combine linker options so we
+ # cannot just pass the convience library names through
@@ -31462,91 +21762,58 @@
+ *)
+ 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
-+ ;;
-
--# 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.
+ esac
+ link_all_deplibs_F77=yes
+ ;;
+@@ -17188,7 +19184,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'
+ 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
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_direct_F77=yes
-+ hardcode_minus_L_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ ;;
+ else
+ archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -17236,36 +19232,45 @@
+ fi
+ ;;
--# 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.2uw2*)
+- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct_F77=yes
+- hardcode_minus_L_F77=no
+ 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_shlibpath_var_F77=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
+ runpath_var='LD_RUN_PATH'
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_F77
-+ if test "$GCC" = yes; then
+- 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'
+ 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
+ else
+- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ 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
-+ ;;
+ fi
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var_F77=no
+ ;;
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
+- 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=
+ 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
@@ -31557,15 +21824,13 @@
+ 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'
-
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
+ runpath_var='LD_RUN_PATH'
++
+ 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'
@@ -31573,120 +21838,77 @@
+ 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
-+ ;;
+ ;;
--# 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
-+ ;;
+ uts4*)
+@@ -17280,15 +19285,10 @@
+ esac
+ fi
--# 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
+{ 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
+ 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.
+-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?
+ #
+@@ -17306,8 +19306,8 @@
+ # 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
+ { 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
+ $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
+@@ -17321,6 +19321,7 @@
+ 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=
-+ 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*
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -17343,20 +19344,20 @@
+ 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
+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
+ ;;
+ 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
+{ 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=
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
+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"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -17366,7 +19367,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"
+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
@@ -31701,224 +21923,82 @@
+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
--# 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.
+@@ -17431,7 +19445,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'
+ 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_F77
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
+ beos*)
+@@ -17440,7 +19454,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_F77
+-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}'
-+ 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
-+ ;;
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17456,7 +19470,7 @@
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_F77
-+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
--# 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~
+@@ -17468,7 +19482,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'
+ $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_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'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -17498,7 +19513,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}'
+ 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
+ ;;
+ esac
+ ;;
+@@ -17521,7 +19536,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)'
+ 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'
-+ ;;
+ # 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"`
+@@ -17544,20 +19559,17 @@
+ dynamic_linker=no
+ ;;
--# 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
+-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`
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
@@ -31930,101 +22010,65 @@
+ *) 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
-+ ;;
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -17575,14 +19587,19 @@
+ 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
-+ ;;
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
-+ esac
-+ ;;
+ 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
+@@ -17602,9 +19619,9 @@
+ 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}'
-+ 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*)
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -17619,7 +19636,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ 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
-+ 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
-+ ;;
-+ *)
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -17630,7 +19647,7 @@
+ 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
-+ 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'
-+ ;;
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -17642,6 +19659,18 @@
+ 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
@@ -32036,91 +22080,51 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -17685,29 +19714,26 @@
+ ;;
--# 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.
+ # 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'
-+ 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
+ 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
--# 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,
+@@ -17717,6 +19743,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
@@ -32132,176 +22136,70 @@
+ 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_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
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -17726,7 +19764,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}'
+ 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
-+ ;;
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+@@ -17754,8 +19792,13 @@
--# 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
+ openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
-+ need_lib_prefix=no
+ 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
-+ 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
-+ ;;
+ 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
+@@ -17775,7 +19818,7 @@
--# 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'
+ 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'
-+ shlibpath_var=LIBPATH
-+ ;;
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -17793,13 +19836,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
--# 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"
-+ ;;
+-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
+@@ -17825,7 +19861,7 @@
+ need_version=yes
+ ;;
--# 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.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'
-+ 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
-+ ;;
+ 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'
+@@ -17858,6 +19894,29 @@
+ fi
+ ;;
--# 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
@@ -32324,657 +22222,522 @@
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
-
--# 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
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17869,16 +19928,21 @@
+ 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
+ test "$dynamic_linker" = no && can_build_shared=no
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_F77
+-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
+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_F77=
-+if test -n "$hardcode_libdir_flag_spec_F77" || \
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+- test -n "$runpath_var F77" || \
+- test "X$hardcode_automatic_F77"="Xyes" ; then
+ test -n "$runpath_var_F77" || \
+ test "X$hardcode_automatic_F77" = "Xyes" ; then
--# 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
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_F77" != no &&
+@@ -17898,8 +19962,8 @@
+ # directories.
+ hardcode_action_F77=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&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
+ if test "$hardcode_action_F77" = relink; then
+ # Fast installation is not supported
+@@ -17910,36 +19974,6 @@
+ enable_fast_install=needless
+ fi
--# ### END LIBTOOL TAG CONFIG: $tagname
+-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__
-+# 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.
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -17954,7 +19988,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 \
-+ 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
+ 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 \
+@@ -18054,6 +20089,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
-+ 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
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -18065,6 +20106,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
--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
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_F77
-+cfgfile="$ofile"
+@@ -18084,7 +20128,7 @@
+ NM=$lt_NM
--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
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
--CC="$lt_save_CC"
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -18115,7 +20159,7 @@
+ libext="$libext"
-- else
-- tagname=""
-- fi
-- ;;
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
-- GCJ)
-- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -18130,7 +20174,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_F77
+ # Do we need the lib prefix for modules?
+@@ -18332,7 +20376,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
--# 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
+@@ -18353,7 +20400,6 @@
+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
--# 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
+-
+ # Source file extension for Java test sources.
+ ac_ext=java
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
+@@ -18365,26 +20411,55 @@
+ lt_simple_compile_test_code="class foo {}\n"
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
+ # 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'
--# Allow CC to be a program name with arguments.
--compiler=$CC
-+# A C compiler.
-+LTCC=$lt_LTCC
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
--# 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
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
--# 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
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# 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-%%"`
++
--lt_prog_compiler_no_builtin_flag_GCJ=
-+# The linker used to build libraries.
-+LD=$lt_LD_F77
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ archive_cmds_need_lc_GCJ=no
--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
++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
+@@ -18396,8 +20471,8 @@
+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-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 \
++{ 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
+@@ -18411,26 +20486,28 @@
+ # 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
++ -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:18417: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20492: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18421: \$? = $ac_status" >&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
- if test ! -s conftest.err; then
-- lt_cv_prog_compiler_rtti_exceptions=yes
-- fi
-- fi
-- $rm conftest*
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++ # 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
+ 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
++{ 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
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
+ 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"
+@@ -18444,8 +20521,8 @@
+ lt_prog_compiler_pic_GCJ=
+ lt_prog_compiler_static_GCJ=
--fi
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-
--lt_prog_compiler_wl_GCJ=
--lt_prog_compiler_pic_GCJ=
--lt_prog_compiler_static_GCJ=
-+# Used on cygwin: assembler.
-+AS="$AS"
-
-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
++{ 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_GCJ='-Wl,'
-- lt_prog_compiler_static_GCJ='-static'
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -18483,6 +20560,11 @@
+ lt_prog_compiler_pic_GCJ='-fno-common'
+ ;;
-- 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
-
-- 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"
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
-- ;;
-+# Old archive suffix (normally "a").
-+libext="$libext"
-
-- 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'
-
-- 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.
++ 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.
+@@ -18499,7 +20581,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
-- 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
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -18525,6 +20607,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
++ ;;
-- *)
-- 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.
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -18536,7 +20628,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.
- 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'
-- ;;
-+# Do we need a version for libraries?
-+need_version=$need_version
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -18559,13 +20651,20 @@
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
-- 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
-- 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
++ 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.
+@@ -18580,15 +20679,15 @@
+ lt_prog_compiler_static_GCJ='-non_shared'
+ ;;
-- 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'
- ;;
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-- solaris*)
+-
+ solaris*)
- lt_prog_compiler_wl_GCJ='-Wl,'
-- 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
+ 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
+ ;;
-- 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
+ sunos4*)
+@@ -18597,7 +20696,7 @@
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-- 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
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -18610,6 +20709,17 @@
+ fi
+ ;;
-- 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
++ 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'
+@@ -18621,16 +20731,16 @@
+ esac
+ fi
-- 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
++{ 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
-+# 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
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_GCJ"; then
-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 \
++{ 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
+@@ -18644,26 +20754,28 @@
+ # 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: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
++ -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:18650: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20760: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18654: \$? = $ac_status" >&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
- if test ! -s conftest.err; then
-- 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
++ # 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
+ 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
++{ 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
-+# 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
+ if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+@@ -18676,7 +20788,7 @@
+ fi
--fi
+ fi
-case "$host_os" in
-- # 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
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_GCJ=
+@@ -18686,8 +20798,50 @@
+ ;;
+ 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_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
++#
++# 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
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18698,60 +20852,58 @@
+ 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
@@ -32982,300 +22745,301 @@
- # to fail, enabling locking or at least warning the user not to do parallel
- # builds.
- chmod -w .
-+# 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 \
+-
+ 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: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
++ -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:18717: $lt_compile\"" >&5)
++ (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:18721: \$? = $ac_status" >&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
- if test ! -s out/conftest.err; then
-- lt_cv_prog_compiler_c_o_GCJ=yes
-- fi
-- fi
++ $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 .
- $rm conftest* out/*
- rmdir out
-- cd ..
-- rmdir conftest
-- $rm conftest*
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_F77
++ 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
+ 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
++{ 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 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
+ 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: 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: 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;}
+@@ -18761,8 +20913,8 @@
+ need_locks=no
+ 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
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
++{ 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; }
-- 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
+ runpath_var=
+ allow_undefined_flag_GCJ=
+@@ -18800,6 +20952,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-%%"`
-- 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
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+@@ -18810,6 +20972,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
+ ;;
+@@ -18820,6 +20986,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
-- 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
++ # 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*)
+@@ -18857,7 +21044,7 @@
+ 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'
-- 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'
++ archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs_GCJ=no
+ fi
+@@ -18867,13 +21054,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'
- allow_undefined_flag_GCJ=no
-- always_export_symbols_GCJ=no
-- enable_shared_with_static_runtimes_GCJ=yes
++ 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 '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
++ 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
+ 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'
-- # 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~
++ 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
+@@ -18882,23 +21069,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'
-- else
++ $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
-- ;;
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++ 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
+ ;;
- netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-- wlarc=
-- else
++ 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 $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'
-- fi
-- ;;
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_F77
++ 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
+ ;;
- solaris* | sysv5*)
-- 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
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs_GCJ=no
+ cat <<EOF 1>&2
+@@ -18912,13 +21146,40 @@
--*** 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
+ 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'
-- 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
++ 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
+ ;;
-- 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
++ 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
+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_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 the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_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=
+@@ -18928,24 +21189,19 @@
-- *)
-- 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'
-- 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
++ 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
- if test "$ld_shlibs_GCJ" = yes; then
- runpath_var=LD_RUN_PATH
@@ -33287,304 +23051,278 @@
- else
- whole_archive_flag_spec_GCJ=
- fi
-- 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 "$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)
+@@ -18957,7 +21213,7 @@
+ # 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
-- # 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
++ 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
+@@ -18979,9 +21235,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
-- 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
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_F77
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -18998,7 +21266,7 @@
+ link_all_deplibs_GCJ=yes
-- # 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
+ 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'
-- 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
++ 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`
+@@ -19017,8 +21285,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
+@@ -19026,22 +21298,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
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
- shared_flag='-qmkshrobj'
- fi
-- fi
-- fi
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_F77"
++ shared_flag='${wl}-bM:SRE'
++ fi
+ fi
+ fi
- # Let the compiler handle the export list.
- always_export_symbols_GCJ=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_GCJ='-berok'
-- # Determine the default libpath from the value encoded in an empty executable.
++ # 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. */
-+# 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
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -19057,24 +21330,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
-- 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); } &&
++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
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$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
+@@ -19088,19 +21373,20 @@
+ 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
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_F77
-
--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
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_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
- 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"
-- else
-- if test "$host_cpu" = ia64; then
-- hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-- allow_undefined_flag_GCJ="-z nodefs"
++ 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 $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. */
-+# ### END LIBTOOL TAG CONFIG: $tagname
-
--int
--main ()
--{
-+__EOF__
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++ 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
+@@ -19119,24 +21405,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
-- 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); } &&
++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
+@@ -19150,8 +21448,10 @@
+ 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
--
-+ # 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'
++
++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
+
+@@ -19160,13 +21460,11 @@
+ # -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=' '
-- archive_cmds_need_lc_GCJ=yes
++ whole_archive_flag_spec_GCJ='$convenience'
+ 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'
-- fi
-- fi
-- ;;
++ # 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
+ ;;
+@@ -19179,7 +21477,7 @@
+ ld_shlibs_GCJ=no
+ ;;
-- 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*)
-- 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
++ 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=' '
+@@ -19189,68 +21487,68 @@
+ # 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
-- # Tell ltmain to make .lib files, not .a files.
-- libext=lib
-- # Tell ltmain to make .dll files, not .so files.
++ 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=".dll"
-- # FIXME: Setting linknames here is a bad hack.
++ shrext_cmds=".dll"
+ # 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='
-- # 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'
++ 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='`cygpath -w "$srcfile"`'
-- enable_shared_with_static_runtimes_GCJ=yes
-- ;;
-+CC="$lt_save_CC"
++ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_GCJ=yes
+ ;;
-- darwin* | rhapsody*)
+ darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- archive_cmds_need_lc_GCJ=no
- case "$host_os" in
@@ -33594,7 +23332,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'
@@ -33603,10 +23341,27 @@
- allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ tagname=""
- fi
- ;;
-- 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
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -33625,260 +23380,218 @@
- 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}'
-- hardcode_direct_GCJ=no
-- hardcode_automatic_GCJ=yes
-- hardcode_shlibpath_var_GCJ=unsupported
++ archive_cmds_need_lc_GCJ=no
+ hardcode_direct_GCJ=no
+ hardcode_automatic_GCJ=yes
+ hardcode_shlibpath_var_GCJ=unsupported
- whole_archive_flag_spec_GCJ='-all_load $convenience'
-- link_all_deplibs_GCJ=yes
-- else
++ 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
- ld_shlibs_GCJ=no
-- fi
-- ;;
++ 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
-- ;;
-+ GCJ)
-+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+@@ -19284,8 +21582,8 @@
+ ;;
-- 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 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-- 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"
++ 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
+@@ -19293,7 +21591,7 @@
-- 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'
-- 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'
++ 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
+@@ -19307,47 +21605,62 @@
+ 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
-- export_dynamic_flag_spec_GCJ='${wl}-E'
-- ;;
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
- hpux10* | hpux11*)
-- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++ hpux10*)
+ 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'
-- ;;
-- esac
-- else
++ 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*|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'
-- ;;
-- esac
-- fi
-- if test "$with_gnu_ld" = no; then
++ 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
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-- hardcode_libdir_flag_spec_ld_GCJ='+b $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_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
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+-
- # 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'
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 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
-- ;;
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
+@@ -19361,7 +21674,7 @@
-- 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'
-- 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
-- ;;
++ 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'
+@@ -19371,7 +21684,7 @@
+ link_all_deplibs_GCJ=yes
+ ;;
- netbsd*)
-- 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
++ 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
+@@ -19394,7 +21707,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
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-- 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'
++ 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
+@@ -19404,7 +21718,7 @@
+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
+ ;;
+ *)
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-- 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='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ ;;
+ esac
+@@ -19415,14 +21729,14 @@
+ 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'
-- old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $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'
+ ;;
-- 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'
-- 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} $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'
+@@ -19434,13 +21748,13 @@
+ 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'
-- 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~
++ 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 ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+old_archive_cmds_GCJ=$old_archive_cmds
++ $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=:
-- ;;
-+## 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...
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+@@ -19448,21 +21762,15 @@
+ hardcode_libdir_separator_GCJ=:
+ ;;
- sco3.2v5*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -33887,157 +23600,78 @@
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-+lt_prog_compiler_no_builtin_flag_GCJ=
-
-- solaris*)
-- no_undefined_flag_GCJ=' -z text'
-- if test "$GCC" = yes; then
+-
+ 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'
-- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++ 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 $compiler_flags $libobjs $deplibs~$rm $lib.exp'
-- 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].*) ;;
++ $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'
+@@ -19471,8 +21779,18 @@
+ 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' ;;
-- 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.
++ *)
++ # 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
+ ;;
+@@ -19481,7 +21799,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_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
-- 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
-- ;;
++ 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
+@@ -19529,36 +21847,45 @@
+ fi
+ ;;
-- 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
-- hardcode_shlibpath_var_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_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
-+ if test "$GCC" = yes; then
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ lt_prog_compiler_static_GCJ='-static'
++ runpath_var='LD_RUN_PATH'
- 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'
-- else
++ 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 ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ 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'
++ 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
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_GCJ=no
@@ -34051,427 +23685,177 @@
- 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=
-- 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'
++ 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
;;
-- 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.
- ;;
+ uts4*)
+@@ -19573,15 +21900,10 @@
+ esac
+ fi
-- *)
-- 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
--
++{ 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.
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -19599,8 +21921,8 @@
+ # 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
++ { 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
+@@ -19614,6 +21936,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=
+@@ -19636,20 +21959,20 @@
+ cat conftest.err 1>&5
fi
-- $rm conftest*
+ $rm conftest*
- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
;;
-- esac
-- fi
-- ;;
--esac
--
+ 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=
++{ 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"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -19659,7 +21982,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"
--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
++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
-- # 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.
+@@ -19724,7 +22060,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'
-- ;;
--
--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
-+ ;;
++ 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*)
+@@ -19733,7 +22069,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
-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_GCJ='-DDLL_EXPORT'
-+ ;;
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -19749,7 +22085,7 @@
--cygwin* | mingw* | pw32*)
-- version_type=windows
+ cygwin* | mingw* | pw32*)
+ version_type=windows
- shrext=".dll"
-- 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'
-+ ;;
++ 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~
+@@ -19761,7 +22097,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'
-- 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'
++ $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'
+@@ -19791,7 +22128,7 @@
;;
-- 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'
+ 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_GCJ='-Wl,'
-+ # All OSF/1 code is PIC.
-+ lt_prog_compiler_static_GCJ='-non_shared'
++ 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
-- ;;
-+ 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
+ esac
+ ;;
+@@ -19814,7 +22151,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)'
-- # 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'
-+ ;;
++ 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"`
+@@ -19837,20 +22174,17 @@
+ dynamic_linker=no
+ ;;
--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
@@ -34483,252 +23867,106 @@
- 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`
-- 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
-- ;;
++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*)
+@@ -19868,14 +22202,19 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
- freebsd3.01* | freebsdelf3.01*)
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=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
-- ;;
++ 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
+ ;;
--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
+@@ -19895,9 +22234,9 @@
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
- case "$host_cpu" in
-- ia64*)
++ 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_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -19912,7 +22251,7 @@
+ 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_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -19923,7 +22262,7 @@
+ 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_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
++ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -19935,6 +22274,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
--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_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*
++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
++ ;;
+
-+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;;
-- *-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_GCJ="$lt_prog_compiler_pic_GCJ"
- ;;
-- 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
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -19978,29 +22329,26 @@
+ ;;
--# 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.
+ # 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'
++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
@@ -34736,435 +23974,113 @@
- 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
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+ # 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'
-- ;;
-+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-+ :
-+else
-+ lt_prog_compiler_static_GCJ=
-+fi
++ # 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,
+@@ -20010,6 +22358,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
--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'
++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'
++ ;;
+
-+{ 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
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -20019,7 +22379,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}'
++ 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
-- ;;
-+else
-+ need_locks=no
-+fi
+@@ -20047,8 +22407,13 @@
--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
+ openbsd*)
+ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ 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_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-%%"`
-+
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ 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
-+ ;;
++ 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
+@@ -20068,7 +22433,7 @@
--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_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'
+ 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.
-+ 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
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -20086,13 +22451,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
--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_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
+@@ -20118,7 +22476,7 @@
+ need_version=yes
+ ;;
--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_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}'
-- 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_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
-- 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
++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'
+@@ -20148,894 +22506,87 @@
+ 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_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
- ;;
@@ -35172,34 +24088,14 @@
-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
@@ -35220,11 +24116,7 @@
-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
@@ -35233,13 +24125,7 @@
- # 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
@@ -35268,15 +24154,7 @@
- ;;
- 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
@@ -35284,54 +24162,24 @@
-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
@@ -35347,16 +24195,7 @@
-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"
@@ -35398,29 +24237,7 @@
-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 \
@@ -35432,51 +24249,15 @@
-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
@@ -35484,66 +24265,11 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-+ 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. */
+-/* 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
@@ -35580,63 +24306,42 @@
-#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
-+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_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'
+- 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_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 \
@@ -35651,41 +24356,16 @@
-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
-+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
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-+ 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. */
-
+-/* 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"
@@ -35693,68 +24373,41 @@
-/* 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
-+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_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'
+- 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_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
- ac_cv_lib_dld_shl_load=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
-
+-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 \
@@ -35780,377 +24433,20 @@
-/* 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"
@@ -36170,28 +24466,7 @@
-#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 ()
-{
@@ -36226,12 +24501,7 @@
-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 \
@@ -36255,16 +24525,7 @@
-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"
@@ -36306,12 +24567,7 @@
-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 \
@@ -36336,15 +24592,7 @@
-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"
@@ -36386,23 +24634,7 @@
-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 \
@@ -36427,15 +24659,7 @@
-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"
@@ -36464,94 +24688,20 @@
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
+- 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
-+ (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
+- 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 \
@@ -36562,273 +24712,43 @@
-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
-+ ;;
-
+-
+-
+-fi
+-
+- ;;
+- esac
+-
- 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
+- 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'
-+ ;;
-
+- fi
+-
- 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
@@ -36840,80 +24760,15 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20778 "configure"
+-#line 20840 "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"
-+ 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'
-+ ;;
-
+-
-#include <stdio.h>
-+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
-+ ;;
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -36923,43 +24778,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+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
-+ ;;
-
+-
-/* 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
@@ -36981,67 +24800,24 @@
-# endif
-# endif
-#endif
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-
+-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# 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
-
+-
-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
-+
-+ # 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 (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
-+ 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'
-+ ;;
-
+-
- exit (status);
-}
-EOF
@@ -37060,37 +24836,15 @@
- else :
- # compilation failed
- lt_cv_dlopen_self=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}${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}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-
+-
- 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
@@ -37104,57 +24858,15 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20876 "configure"
+-#line 20938 "configure"
-#include "confdefs.h"
-+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
-+ ;;
-
+-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+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
-+ ;;
-
+-
-#include <stdio.h>
-+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
-+ ;;
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -37164,17 +24876,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+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"
-+ ;;
-
+-
-/* 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
@@ -37196,75 +24898,23 @@
-# endif
-# endif
-#endif
-+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'
-+ ;;
-
+-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+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
-+ ;;
-
+-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+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
-+ ;;
-
+-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+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
+ ;;
@@ -37384,7 +25034,7 @@
fi
-@@ -20990,7 +22603,8 @@
+@@ -21052,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.
@@ -37394,7 +25044,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 \
-@@ -21090,6 +22704,12 @@
+@@ -21152,6 +22704,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -37407,7 +25057,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21101,6 +22721,9 @@
+@@ -21163,6 +22721,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -37417,7 +25067,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21120,7 +22743,7 @@
+@@ -21182,7 +22743,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -37426,7 +25076,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21151,7 +22774,7 @@
+@@ -21213,7 +22774,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -37435,7 +25085,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21166,7 +22789,7 @@
+@@ -21228,7 +22789,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -37444,7 +25094,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21368,7 +22991,10 @@
+@@ -21430,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.
@@ -37456,7 +25106,7 @@
fi
-@@ -21388,7 +23014,6 @@
+@@ -21450,7 +23014,6 @@
RC)
@@ -37464,7 +25114,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21407,15 +23032,42 @@
+@@ -21469,15 +23032,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -37507,7 +25157,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21431,7 +23083,8 @@
+@@ -21493,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.
@@ -37517,7 +25167,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 \
-@@ -21531,6 +23184,12 @@
+@@ -21593,6 +23184,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -37530,7 +25180,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21542,6 +23201,9 @@
+@@ -21604,6 +23201,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -37540,7 +25190,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21561,7 +23223,7 @@
+@@ -21623,7 +23223,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -37549,7 +25199,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21592,7 +23254,7 @@
+@@ -21654,7 +23254,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -37558,7 +25208,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21607,7 +23269,7 @@
+@@ -21669,7 +23269,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -37567,7 +25217,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21809,7 +23471,10 @@
+@@ -21871,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.
@@ -37579,7 +25229,7 @@
fi
-@@ -21856,7 +23521,7 @@
+@@ -21918,7 +23521,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -37588,7 +25238,7 @@
# Prevent multiple expansion
-@@ -21911,8 +23576,8 @@
+@@ -21973,8 +23576,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -37599,7 +25249,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21938,17 +23603,17 @@
+@@ -22000,17 +23603,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -37623,7 +25273,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21963,32 +23628,33 @@
+@@ -22025,32 +23628,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -37665,7 +25315,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -21997,8 +23663,8 @@
+@@ -22059,8 +23663,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -37676,7 +25326,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22024,11 +23690,11 @@
+@@ -22086,11 +23690,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -37692,7 +25342,7 @@
fi
-@@ -22036,8 +23702,8 @@
+@@ -22098,8 +23702,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -37703,7 +25353,7 @@
XGETTEXT=":"
fi
fi
-@@ -22131,8 +23797,7 @@
+@@ -22193,8 +23797,7 @@
@@ -37713,7 +25363,7 @@
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 @@
+@@ -22206,8 +23809,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -37724,7 +25374,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22173,24 +23838,36 @@
+@@ -22235,24 +23838,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37769,7 +25419,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22199,15 +23876,16 @@
+@@ -22261,15 +23876,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37790,7 +25440,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22236,15 +23914,14 @@
+@@ -22298,15 +23914,14 @@
@@ -37809,7 +25459,7 @@
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 @@
+@@ -22318,9 +23933,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -37819,7 +25469,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22284,24 +23958,36 @@
+@@ -22346,24 +23958,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37864,7 +25514,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22310,9 +23996,10 @@
+@@ -22372,9 +23996,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37877,7 +25527,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22325,11 +24012,11 @@
+@@ -22387,11 +24012,11 @@
fi
@@ -37893,7 +25543,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22350,8 +24037,7 @@
+@@ -22412,8 +24037,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -37903,7 +25553,7 @@
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 @@
+@@ -22451,24 +24075,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37948,7 +25598,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22416,10 +24114,11 @@
+@@ -22478,10 +24114,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37962,7 +25612,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22432,8 +24131,8 @@
+@@ -22494,8 +24131,8 @@
fi
@@ -37973,7 +25623,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22457,15 +24156,14 @@
+@@ -22519,15 +24156,14 @@
@@ -37992,7 +25642,7 @@
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 @@
+@@ -22539,9 +24175,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -38002,7 +25652,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22504,24 +24199,36 @@
+@@ -22566,24 +24199,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38047,7 +25697,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22530,9 +24237,10 @@
+@@ -22592,9 +24237,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38060,7 +25710,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22545,11 +24253,11 @@
+@@ -22607,11 +24253,11 @@
fi
@@ -38076,7 +25726,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22570,8 +24278,7 @@
+@@ -22632,8 +24278,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -38086,7 +25736,7 @@
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 @@
+@@ -22670,24 +24315,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38131,7 +25781,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22635,10 +24354,11 @@
+@@ -22697,10 +24354,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38145,7 +25795,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22651,8 +24371,8 @@
+@@ -22713,8 +24371,8 @@
fi
@@ -38156,7 +25806,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22675,8 +24395,8 @@
+@@ -22737,8 +24395,8 @@
@@ -38167,7 +25817,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22693,30 +24413,42 @@
+@@ -22755,30 +24413,42 @@
int
main ()
{
@@ -38219,7 +25869,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22725,20 +24457,21 @@
+@@ -22787,20 +24457,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38247,7 +25897,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22755,30 +24488,42 @@
+@@ -22817,30 +24488,42 @@
int
main ()
{
@@ -38299,7 +25949,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22787,21 +24532,22 @@
+@@ -22849,21 +24532,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38328,7 +25978,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22814,40 +24560,52 @@
+@@ -22876,40 +24560,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38393,7 +26043,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22856,19 +24614,20 @@
+@@ -22918,19 +24614,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38420,7 +26070,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22881,40 +24640,52 @@
+@@ -22943,40 +24640,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38485,7 +26135,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22923,14 +24694,15 @@
+@@ -22985,14 +24694,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38505,7 +26155,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22956,13 +24728,13 @@
+@@ -23018,13 +24728,13 @@
fi
@@ -38522,7 +26172,7 @@
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 @@
+@@ -23053,24 +24763,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38567,7 +26217,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23020,8 +24804,10 @@
+@@ -23082,8 +24804,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38579,7 +26229,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23031,17 +24817,17 @@
+@@ -23093,17 +24817,17 @@
fi
@@ -38602,7 +26252,7 @@
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 @@
+@@ -23132,24 +24856,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38647,7 +26297,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23099,8 +24897,10 @@
+@@ -23161,8 +24897,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38659,7 +26309,7 @@
done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23111,8 +24911,8 @@
+@@ -23173,8 +24911,8 @@
fi
@@ -38670,7 +26320,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23125,8 +24925,8 @@
+@@ -23187,8 +24925,8 @@
_ACEOF
@@ -38681,7 +26331,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23139,40 +24939,52 @@
+@@ -23201,40 +24939,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38746,7 +26396,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23181,21 +24993,22 @@
+@@ -23243,21 +24993,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38775,7 +26425,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23208,40 +25021,52 @@
+@@ -23270,40 +25021,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38840,7 +26490,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23250,21 +25075,22 @@
+@@ -23312,21 +25075,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38869,7 +26519,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23291,53 +25117,59 @@
+@@ -23353,53 +25117,59 @@
#undef inet_ntoa
@@ -38948,7 +26598,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23346,17 +25178,18 @@
+@@ -23408,17 +25178,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38973,7 +26623,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23369,40 +25202,52 @@
+@@ -23431,40 +25202,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39038,7 +26688,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23411,21 +25256,22 @@
+@@ -23473,21 +25256,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39067,7 +26717,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23452,53 +25298,59 @@
+@@ -23514,53 +25298,59 @@
#undef connect
@@ -39146,7 +26796,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23507,17 +25359,18 @@
+@@ -23569,17 +25359,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39171,7 +26821,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23530,40 +25383,52 @@
+@@ -23592,40 +25383,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39236,7 +26886,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23572,22 +25437,23 @@
+@@ -23634,22 +25437,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39266,7 +26916,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23614,53 +25480,59 @@
+@@ -23676,53 +25480,59 @@
#undef remove
@@ -39345,7 +26995,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23669,17 +25541,18 @@
+@@ -23731,17 +25541,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39370,7 +27020,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23692,40 +25565,52 @@
+@@ -23754,40 +25565,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39435,7 +27085,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23734,14 +25619,15 @@
+@@ -23796,14 +25619,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39455,7 +27105,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23749,8 +25635,8 @@
+@@ -23811,8 +25635,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -39466,7 +27116,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23777,53 +25663,59 @@
+@@ -23839,53 +25663,59 @@
#undef shmat
@@ -39545,7 +27195,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23832,18 +25724,19 @@
+@@ -23894,18 +25724,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39571,7 +27221,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23856,40 +25749,52 @@
+@@ -23918,40 +25749,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39636,7 +27286,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23898,14 +25803,15 @@
+@@ -23960,14 +25803,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39656,7 +27306,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23919,18 +25825,19 @@
+@@ -23981,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`
@@ -39684,7 +27334,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23941,24 +25848,36 @@
+@@ -24003,24 +25848,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -39729,7 +27379,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23967,15 +25886,16 @@
+@@ -24029,15 +25886,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39752,7 +27402,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23984,8 +25904,13 @@
+@@ -24046,8 +25904,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -39768,7 +27418,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24009,9 +25934,10 @@
+@@ -24071,9 +25934,10 @@
ac_header_preproc=no
fi
@@ -39781,7 +27431,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24035,25 +25961,19 @@
+@@ -24097,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;}
@@ -39814,7 +27464,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24071,18 +25991,19 @@
+@@ -24133,18 +25991,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39842,7 +27492,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24093,24 +26014,36 @@
+@@ -24155,24 +26014,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -39887,7 +27537,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24119,15 +26052,16 @@
+@@ -24181,15 +26052,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39910,7 +27560,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24136,8 +26070,13 @@
+@@ -24198,8 +26070,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -39926,7 +27576,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24161,9 +26100,10 @@
+@@ -24223,9 +26100,10 @@
ac_header_preproc=no
fi
@@ -39939,7 +27589,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24187,25 +26127,19 @@
+@@ -24249,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;}
@@ -39972,7 +27622,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24219,8 +26153,8 @@
+@@ -24281,8 +26153,8 @@
# darwin requires a poll emulation library
@@ -39983,7 +27633,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24233,40 +26167,52 @@
+@@ -24295,40 +26167,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40048,7 +27698,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24275,14 +26221,15 @@
+@@ -24337,14 +26221,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40068,7 +27718,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24293,18 +26240,19 @@
+@@ -24355,18 +26240,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40096,7 +27746,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24315,24 +26263,36 @@
+@@ -24377,24 +26263,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -40141,7 +27791,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24341,15 +26301,16 @@
+@@ -24403,15 +26301,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40164,7 +27814,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24358,8 +26319,13 @@
+@@ -24420,8 +26319,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -40180,7 +27830,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24383,9 +26349,10 @@
+@@ -24445,9 +26349,10 @@
ac_header_preproc=no
fi
@@ -40193,7 +27843,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24409,25 +26376,19 @@
+@@ -24471,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;}
@@ -40226,7 +27876,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24442,17 +26403,17 @@
+@@ -24504,17 +26403,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -40250,7 +27900,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24463,24 +26424,36 @@
+@@ -24525,24 +26424,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40295,7 +27945,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24489,15 +26462,16 @@
+@@ -24551,15 +26462,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40318,7 +27968,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24506,8 +26480,13 @@
+@@ -24568,8 +26480,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -40334,7 +27984,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24531,9 +26510,10 @@
+@@ -24593,9 +26510,10 @@
ac_header_preproc=no
fi
@@ -40347,7 +27997,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24557,25 +26537,18 @@
+@@ -24619,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;}
@@ -40378,7 +28028,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24592,8 +26565,8 @@
+@@ -24654,8 +26565,8 @@
@@ -40389,7 +28039,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24619,31 +26592,43 @@
+@@ -24681,31 +26592,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -40443,7 +28093,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24654,25 +26639,25 @@
+@@ -24716,25 +26639,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40476,7 +28126,7 @@
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 @@
+@@ -24746,9 +26669,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -40486,7 +28136,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24712,24 +26694,36 @@
+@@ -24774,24 +26694,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40531,7 +28181,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24738,9 +26732,10 @@
+@@ -24800,9 +26732,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40544,7 +28194,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -24753,11 +26748,11 @@
+@@ -24815,11 +26748,11 @@
fi
@@ -40560,7 +28210,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24778,8 +26773,7 @@
+@@ -24840,8 +26773,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -40570,7 +28220,7 @@
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 @@
+@@ -24879,24 +26811,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -40615,7 +28265,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24844,10 +26850,11 @@
+@@ -24906,10 +26850,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40629,7 +28279,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -24860,8 +26867,8 @@
+@@ -24922,8 +26867,8 @@
fi
@@ -40640,7 +28290,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24888,8 +26895,8 @@
+@@ -24950,8 +26895,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -40651,7 +28301,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24902,40 +26909,52 @@
+@@ -24964,40 +26909,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40716,7 +28366,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24944,27 +26963,28 @@
+@@ -25006,27 +26963,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40755,7 +28405,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24977,40 +26997,52 @@
+@@ -25039,40 +26997,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40820,7 +28470,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25019,22 +27051,23 @@
+@@ -25081,22 +27051,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40850,7 +28500,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25045,36 +27078,49 @@
+@@ -25107,36 +27078,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40910,7 +28560,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25083,20 +27129,21 @@
+@@ -25145,20 +27129,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40939,7 +28589,7 @@
# 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 @@
+@@ -25171,10 +27156,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40952,7 +28602,7 @@
test_array [0] = 0
;
-@@ -25120,24 +27168,36 @@
+@@ -25182,24 +27168,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40997,7 +28647,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25150,10 +27210,11 @@
+@@ -25212,10 +27210,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41010,7 +28660,7 @@
test_array [0] = 0
;
-@@ -25161,24 +27222,36 @@
+@@ -25223,24 +27222,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41055,7 +28705,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25187,30 +27260,32 @@
+@@ -25249,30 +27260,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41097,7 +28747,7 @@
test_array [0] = 0
;
-@@ -25218,24 +27293,36 @@
+@@ -25280,24 +27293,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41142,7 +28792,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25248,10 +27335,11 @@
+@@ -25310,10 +27335,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41155,7 +28805,7 @@
test_array [0] = 0
;
-@@ -25259,24 +27347,36 @@
+@@ -25321,24 +27347,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41200,7 +28850,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25285,24 +27385,27 @@
+@@ -25347,24 +27385,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41238,7 +28888,7 @@
# 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 @@
+@@ -25375,10 +27416,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41251,7 +28901,7 @@
test_array [0] = 0
;
-@@ -25324,24 +27428,36 @@
+@@ -25386,24 +27428,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41296,7 +28946,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25350,26 +27466,20 @@
+@@ -25412,26 +27466,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41329,7 +28979,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25377,8 +27487,9 @@
+@@ -25439,8 +27487,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41341,7 +28991,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25387,35 +27498,44 @@
+@@ -25449,35 +27498,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -41399,7 +29049,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25426,28 +27546,27 @@
+@@ -25488,28 +27546,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -41436,7 +29086,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25458,36 +27577,49 @@
+@@ -25520,36 +27577,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41496,7 +29146,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25496,20 +27628,21 @@
+@@ -25558,20 +27628,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41525,7 +29175,7 @@
# 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 @@
+@@ -25584,10 +27655,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41538,7 +29188,7 @@
test_array [0] = 0
;
-@@ -25533,24 +27667,36 @@
+@@ -25595,24 +27667,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41583,7 +29233,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25563,10 +27709,11 @@
+@@ -25625,10 +27709,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41596,7 +29246,7 @@
test_array [0] = 0
;
-@@ -25574,24 +27721,36 @@
+@@ -25636,24 +27721,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41641,7 +29291,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25600,30 +27759,32 @@
+@@ -25662,30 +27759,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41683,7 +29333,7 @@
test_array [0] = 0
;
-@@ -25631,24 +27792,36 @@
+@@ -25693,24 +27792,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41728,7 +29378,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25661,10 +27834,11 @@
+@@ -25723,10 +27834,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41741,7 +29391,7 @@
test_array [0] = 0
;
-@@ -25672,24 +27846,36 @@
+@@ -25734,24 +27846,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41786,7 +29436,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25698,24 +27884,27 @@
+@@ -25760,24 +27884,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41824,7 +29474,7 @@
# 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 @@
+@@ -25788,10 +27915,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41837,7 +29487,7 @@
test_array [0] = 0
;
-@@ -25737,24 +27927,36 @@
+@@ -25799,24 +27927,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41882,7 +29532,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25763,26 +27965,20 @@
+@@ -25825,26 +27965,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41915,7 +29565,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25790,8 +27986,9 @@
+@@ -25852,8 +27986,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41927,7 +29577,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25800,35 +27997,44 @@
+@@ -25862,35 +27997,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -41985,7 +29635,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25839,28 +28045,27 @@
+@@ -25901,28 +28045,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -42022,7 +29672,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25871,36 +28076,49 @@
+@@ -25933,36 +28076,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42082,7 +29732,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25909,20 +28127,21 @@
+@@ -25971,20 +28127,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42111,7 +29761,7 @@
# 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 @@
+@@ -25997,10 +28154,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42124,7 +29774,7 @@
test_array [0] = 0
;
-@@ -25946,24 +28166,36 @@
+@@ -26008,24 +28166,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42169,7 +29819,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25976,10 +28208,11 @@
+@@ -26038,10 +28208,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42182,7 +29832,7 @@
test_array [0] = 0
;
-@@ -25987,24 +28220,36 @@
+@@ -26049,24 +28220,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42227,7 +29877,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26013,30 +28258,32 @@
+@@ -26075,30 +28258,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42269,7 +29919,7 @@
test_array [0] = 0
;
-@@ -26044,24 +28291,36 @@
+@@ -26106,24 +28291,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42314,7 +29964,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26074,10 +28333,11 @@
+@@ -26136,10 +28333,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42327,7 +29977,7 @@
test_array [0] = 0
;
-@@ -26085,24 +28345,36 @@
+@@ -26147,24 +28345,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42372,7 +30022,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26111,24 +28383,27 @@
+@@ -26173,24 +28383,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42410,7 +30060,7 @@
# 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 @@
+@@ -26201,10 +28414,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42423,7 +30073,7 @@
test_array [0] = 0
;
-@@ -26150,24 +28426,36 @@
+@@ -26212,24 +28426,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42468,7 +30118,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26176,26 +28464,20 @@
+@@ -26238,26 +28464,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42501,7 +30151,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26203,8 +28485,9 @@
+@@ -26265,8 +28485,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42513,7 +30163,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26213,35 +28496,44 @@
+@@ -26275,35 +28496,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -42571,7 +30221,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26252,28 +28544,27 @@
+@@ -26314,28 +28544,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -42608,7 +30258,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26284,36 +28575,49 @@
+@@ -26346,36 +28575,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42668,7 +30318,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26322,20 +28626,21 @@
+@@ -26384,20 +28626,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42697,7 +30347,7 @@
# 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 @@
+@@ -26410,10 +28653,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42710,7 +30360,7 @@
test_array [0] = 0
;
-@@ -26359,24 +28665,36 @@
+@@ -26421,24 +28665,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42755,7 +30405,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26389,10 +28707,11 @@
+@@ -26451,10 +28707,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42768,7 +30418,7 @@
test_array [0] = 0
;
-@@ -26400,24 +28719,36 @@
+@@ -26462,24 +28719,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42813,7 +30463,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26426,30 +28757,32 @@
+@@ -26488,30 +28757,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42855,7 +30505,7 @@
test_array [0] = 0
;
-@@ -26457,24 +28790,36 @@
+@@ -26519,24 +28790,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42900,7 +30550,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26487,10 +28832,11 @@
+@@ -26549,10 +28832,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -42913,7 +30563,7 @@
test_array [0] = 0
;
-@@ -26498,24 +28844,36 @@
+@@ -26560,24 +28844,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42958,7 +30608,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26524,24 +28882,27 @@
+@@ -26586,24 +28882,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42996,7 +30646,7 @@
# 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 @@
+@@ -26614,10 +28913,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43009,7 +30659,7 @@
test_array [0] = 0
;
-@@ -26563,24 +28925,36 @@
+@@ -26625,24 +28925,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43054,7 +30704,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26589,26 +28963,20 @@
+@@ -26651,26 +28963,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43087,7 +30737,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26616,8 +28984,9 @@
+@@ -26678,8 +28984,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43099,7 +30749,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26626,35 +28995,44 @@
+@@ -26688,35 +28995,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -43157,7 +30807,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26665,30 +29043,29 @@
+@@ -26727,30 +29043,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -43196,7 +30846,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26701,40 +29078,52 @@
+@@ -26763,40 +29078,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43261,7 +30911,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26743,14 +29132,15 @@
+@@ -26805,14 +29132,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43281,7 +30931,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26759,8 +29149,8 @@
+@@ -26821,8 +29149,8 @@
fi
@@ -43292,7 +30942,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26773,40 +29163,52 @@
+@@ -26835,40 +29163,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43357,7 +31007,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26815,14 +29217,15 @@
+@@ -26877,14 +29217,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43377,7 +31027,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26836,8 +29239,8 @@
+@@ -26898,8 +29239,8 @@
@@ -43388,7 +31038,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26848,36 +29251,49 @@
+@@ -26910,36 +29251,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43448,7 +31098,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26886,20 +29302,21 @@
+@@ -26948,20 +29302,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43477,7 +31127,7 @@
# 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 @@
+@@ -26974,10 +29329,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43490,7 +31140,7 @@
test_array [0] = 0
;
-@@ -26923,24 +29341,36 @@
+@@ -26985,24 +29341,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43535,7 +31185,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26953,10 +29383,11 @@
+@@ -27015,10 +29383,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43548,7 +31198,7 @@
test_array [0] = 0
;
-@@ -26964,24 +29395,36 @@
+@@ -27026,24 +29395,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43593,7 +31243,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26990,30 +29433,32 @@
+@@ -27052,30 +29433,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43635,7 +31285,7 @@
test_array [0] = 0
;
-@@ -27021,24 +29466,36 @@
+@@ -27083,24 +29466,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43680,7 +31330,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27051,10 +29508,11 @@
+@@ -27113,10 +29508,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43693,7 +31343,7 @@
test_array [0] = 0
;
-@@ -27062,24 +29520,36 @@
+@@ -27124,24 +29520,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43738,7 +31388,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27088,24 +29558,27 @@
+@@ -27150,24 +29558,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43776,7 +31426,7 @@
# 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 @@
+@@ -27178,10 +29589,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43789,7 +31439,7 @@
test_array [0] = 0
;
-@@ -27127,24 +29601,36 @@
+@@ -27189,24 +29601,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43834,7 +31484,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27153,26 +29639,20 @@
+@@ -27215,26 +29639,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43867,7 +31517,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27180,8 +29660,9 @@
+@@ -27242,8 +29660,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43879,7 +31529,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27190,35 +29671,44 @@
+@@ -27252,35 +29671,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -43937,7 +31587,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27229,29 +29719,28 @@
+@@ -27291,29 +29719,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -43975,7 +31625,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27262,36 +29751,49 @@
+@@ -27324,36 +29751,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44035,7 +31685,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27300,20 +29802,21 @@
+@@ -27362,20 +29802,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44064,7 +31714,7 @@
# 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 @@
+@@ -27388,10 +29829,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44077,7 +31727,7 @@
test_array [0] = 0
;
-@@ -27337,24 +29841,36 @@
+@@ -27399,24 +29841,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44122,7 +31772,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27367,10 +29883,11 @@
+@@ -27429,10 +29883,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44135,7 +31785,7 @@
test_array [0] = 0
;
-@@ -27378,24 +29895,36 @@
+@@ -27440,24 +29895,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44180,7 +31830,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27404,30 +29933,32 @@
+@@ -27466,30 +29933,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44222,7 +31872,7 @@
test_array [0] = 0
;
-@@ -27435,24 +29966,36 @@
+@@ -27497,24 +29966,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44267,7 +31917,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27465,10 +30008,11 @@
+@@ -27527,10 +30008,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44280,7 +31930,7 @@
test_array [0] = 0
;
-@@ -27476,24 +30020,36 @@
+@@ -27538,24 +30020,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44325,7 +31975,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27502,24 +30058,27 @@
+@@ -27564,24 +30058,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44363,7 +32013,7 @@
# 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 @@
+@@ -27592,10 +30089,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44376,7 +32026,7 @@
test_array [0] = 0
;
-@@ -27541,24 +30101,36 @@
+@@ -27603,24 +30101,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44421,7 +32071,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27567,26 +30139,20 @@
+@@ -27629,26 +30139,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44454,7 +32104,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27594,8 +30160,9 @@
+@@ -27656,8 +30160,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44466,7 +32116,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27604,35 +30171,44 @@
+@@ -27666,35 +30171,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -44524,7 +32174,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27643,30 +30219,29 @@
+@@ -27705,30 +30219,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -44563,7 +32213,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27687,36 +30262,48 @@
+@@ -27749,36 +30262,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44624,17 +32274,17 @@
{ { 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 @@
+@@ -27790,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
@@ -44648,7 +32298,7 @@
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 @@
+@@ -27831,24 +30356,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44693,7 +32343,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27795,9 +30394,10 @@
+@@ -27857,9 +30394,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44706,7 +32356,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -27810,26 +30410,26 @@
+@@ -27872,26 +30410,26 @@
fi
@@ -44743,7 +32393,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27848,18 +30448,19 @@
+@@ -27910,18 +30448,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44771,7 +32421,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27870,24 +30471,36 @@
+@@ -27932,24 +30471,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44816,7 +32466,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27896,15 +30509,16 @@
+@@ -27958,15 +30509,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44839,7 +32489,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27913,8 +30527,13 @@
+@@ -27975,8 +30527,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -44855,7 +32505,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27938,9 +30557,10 @@
+@@ -28000,9 +30557,10 @@
ac_header_preproc=no
fi
@@ -44868,7 +32518,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27964,25 +30584,19 @@
+@@ -28026,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;}
@@ -44901,7 +32551,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27994,8 +30608,8 @@
+@@ -28056,8 +30608,8 @@
done
@@ -44912,7 +32562,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28022,53 +30636,59 @@
+@@ -28084,53 +30636,59 @@
#undef _NSGetEnviron
@@ -44991,7 +32641,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28077,13 +30697,14 @@
+@@ -28139,13 +30697,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45010,7 +32660,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28104,9 +30725,9 @@
+@@ -28166,9 +30725,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -45023,7 +32673,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28132,53 +30753,59 @@
+@@ -28194,53 +30753,59 @@
#undef $ac_func
@@ -45102,7 +32752,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28187,13 +30814,15 @@
+@@ -28249,13 +30814,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45122,7 +32772,7 @@
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 @@
+@@ -28272,32 +30839,32 @@
@@ -45167,7 +32817,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28251,8 +30880,8 @@
+@@ -28313,8 +30880,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -45178,7 +32828,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28289,8 +30918,13 @@
+@@ -28351,8 +30918,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -45194,7 +32844,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28357,6 +30991,7 @@
+@@ -28419,6 +30991,7 @@
fi
done
fi
@@ -45202,7 +32852,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28386,24 +31021,36 @@
+@@ -28448,24 +31021,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45247,7 +32897,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28414,7 +31061,7 @@
+@@ -28476,7 +31061,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45256,7 +32906,7 @@
# 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 @@
+@@ -28524,7 +31109,8 @@
done
done
fi
@@ -45266,7 +32916,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28472,21 +31120,26 @@
+@@ -28534,21 +31120,26 @@
*-*-solaris*)
;;
*)
@@ -45301,7 +32951,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28494,7 +31147,7 @@
+@@ -28556,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
@@ -45310,7 +32960,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28503,7 +31156,7 @@
+@@ -28565,7 +31156,7 @@
esac
fi
cd ..
@@ -45319,7 +32969,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28547,12 +31200,12 @@
+@@ -28609,12 +31200,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -45336,7 +32986,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28580,8 +31233,8 @@
+@@ -28642,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.
@@ -45347,7 +32997,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28594,40 +31247,52 @@
+@@ -28656,40 +31247,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45412,7 +33062,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28636,14 +31301,15 @@
+@@ -28698,14 +31301,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45432,7 +33082,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28652,8 +31318,8 @@
+@@ -28714,8 +31318,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -45443,7 +33093,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28687,24 +31353,36 @@
+@@ -28749,24 +31353,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45488,7 +33138,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28713,10 +31391,11 @@
+@@ -28775,10 +31391,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45502,7 +33152,7 @@
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$kde_ldflags_safe
-@@ -28725,8 +31404,8 @@
+@@ -28787,8 +31404,8 @@
fi
@@ -45513,7 +33163,7 @@
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 @@
+@@ -28850,8 +31467,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -45524,7 +33174,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28800,9 +31479,9 @@
+@@ -28862,9 +31479,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -45537,7 +33187,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28814,40 +31493,52 @@
+@@ -28876,40 +31493,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45602,7 +33252,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28856,14 +31547,16 @@
+@@ -28918,14 +31547,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45623,7 +33273,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28876,8 +31569,8 @@
+@@ -28938,8 +31569,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -45634,7 +33284,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28890,40 +31583,52 @@
+@@ -28952,40 +31583,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45699,7 +33349,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28932,14 +31637,15 @@
+@@ -28994,14 +31637,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45719,7 +33369,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -28947,8 +31653,8 @@
+@@ -29009,8 +31653,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -45730,7 +33380,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -28967,40 +31673,53 @@
+@@ -29029,40 +31673,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45797,7 +33447,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
fi
-@@ -29015,16 +31734,15 @@
+@@ -29077,16 +31734,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -45818,7 +33468,7 @@
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 @@
+@@ -29113,24 +31769,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45863,7 +33513,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29077,8 +31807,10 @@
+@@ -29139,8 +31807,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45875,7 +33525,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29091,13 +31823,13 @@
+@@ -29153,13 +31823,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -45893,7 +33543,7 @@
:
fi
-@@ -29109,16 +31841,15 @@
+@@ -29171,16 +31841,15 @@
case $host_os in
solaris*)
@@ -45914,7 +33564,7 @@
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 @@
+@@ -29207,24 +31876,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45959,7 +33609,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29171,8 +31914,10 @@
+@@ -29233,8 +31914,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45971,7 +33621,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29185,13 +31930,13 @@
+@@ -29247,13 +31930,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -45989,7 +33639,7 @@
:
fi
-@@ -29218,17 +31963,17 @@
+@@ -29280,17 +31963,17 @@
@@ -46013,7 +33663,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29246,21 +31991,21 @@
+@@ -29308,21 +31991,21 @@
fi
@@ -46043,7 +33693,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29279,14 +32024,14 @@
+@@ -29341,14 +32024,14 @@
@@ -46062,7 +33712,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29320,24 +32065,36 @@
+@@ -29382,24 +32065,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46107,7 +33757,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29346,9 +32103,10 @@
+@@ -29408,9 +32103,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46120,7 +33770,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29361,8 +32119,8 @@
+@@ -29423,8 +32119,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -46131,7 +33781,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29382,8 +32140,8 @@
+@@ -29444,8 +32140,8 @@
@@ -46142,7 +33792,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29419,24 +32177,36 @@
+@@ -29481,24 +32177,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46187,7 +33837,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29445,10 +32215,11 @@
+@@ -29507,10 +32215,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46201,7 +33851,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29462,19 +32233,19 @@
+@@ -29524,19 +32233,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -46227,7 +33877,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29507,24 +32278,36 @@
+@@ -29569,24 +32278,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46272,7 +33922,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29533,9 +32316,10 @@
+@@ -29595,9 +32316,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46285,7 +33935,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29545,14 +32329,14 @@
+@@ -29607,14 +32329,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -46306,7 +33956,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29585,24 +32369,36 @@
+@@ -29647,24 +32369,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46351,7 +34001,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29611,9 +32407,10 @@
+@@ -29673,9 +32407,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46364,7 +34014,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29623,11 +32420,11 @@
+@@ -29685,11 +32420,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -46380,16 +34030,16 @@
LIBJPEG=
-@@ -29647,7 +32444,7 @@
+@@ -29709,7 +32444,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29650: $i/$j" >&5
+- echo "configure: 29712: $i/$j" >&5
+ echo "configure: 32447: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29694,14 +32491,14 @@
+@@ -29756,14 +32491,14 @@
@@ -46407,7 +34057,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29744,8 +32541,8 @@
+@@ -29806,8 +32541,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -46418,7 +34068,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29754,8 +32551,8 @@
+@@ -29816,8 +32551,8 @@
{ (exit 1); exit 1; }; }
else
@@ -46429,7 +34079,7 @@
PERL=$kde_cv_path
fi
-@@ -29769,10 +32566,9 @@
+@@ -29831,10 +32566,9 @@
@@ -46442,7 +34092,7 @@
else
if test $kde_qtver = 3; then
-@@ -29782,7 +32578,8 @@
+@@ -29844,7 +32578,8 @@
fi
@@ -46452,7 +34102,7 @@
USING_QT_MT=""
-@@ -29802,13 +32599,13 @@
+@@ -29864,13 +32599,13 @@
else
kde_check_threading_default=yes
fi
@@ -46470,7 +34120,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29880,8 +32677,8 @@
+@@ -29942,8 +32677,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -46481,7 +34131,7 @@
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 @@
+@@ -29952,34 +32687,34 @@
qt_libraries=""
qt_includes=""
@@ -46496,14 +34146,14 @@
-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
+-if test "${with_qt_includes+set}" = set; then
- withval="$with_qt_includes"
--
+
++# Check whether --with-qt-includes was given.
++if test "${with_qt_includes+set}" = set; then
+ withval=$with_qt_includes;
ac_qt_includes="$withval"
@@ -46528,16 +34178,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -29945,7 +32742,7 @@
+@@ -30007,7 +32742,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29948: $i/$j" >&5
+- echo "configure: 30010: $i/$j" >&5
+ echo "configure: 32745: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -29982,8 +32779,7 @@
+@@ -30044,8 +32779,7 @@
ac_qt_libraries="$qt_libdir"
@@ -46547,7 +34197,7 @@
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 @@
+@@ -30182,13 +32916,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -46565,7 +34215,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30135,15 +32931,14 @@
+@@ -30197,15 +32931,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -46584,7 +34234,7 @@
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 @@
+@@ -30326,12 +33059,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -46601,7 +34251,7 @@
fi
-@@ -30307,14 +33102,14 @@
+@@ -30369,14 +33102,14 @@
fi
@@ -46619,7 +34269,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30357,8 +33152,8 @@
+@@ -30419,8 +33152,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -46630,7 +34280,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30379,22 +33174,22 @@
+@@ -30441,22 +33174,22 @@
{ (exit 1); exit 1; }; }
else
@@ -46658,7 +34308,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30437,12 +33232,12 @@
+@@ -30499,12 +33232,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -46675,7 +34325,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30472,10 +33267,10 @@
+@@ -30534,10 +33267,10 @@
if test $kde_qtver = 3; then
@@ -46689,7 +34339,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30498,22 +33293,22 @@
+@@ -30560,22 +33293,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -46719,7 +34369,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30536,13 +33331,13 @@
+@@ -30598,13 +33331,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -46737,7 +34387,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30573,15 +33368,14 @@
+@@ -30635,15 +33368,14 @@
if test -n "$LIBJPEG"; then
@@ -46756,7 +34406,7 @@
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 @@
+@@ -30676,24 +33408,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46801,7 +34451,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30640,9 +33446,10 @@
+@@ -30702,9 +33446,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46814,7 +34464,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30658,12 +33465,12 @@
+@@ -30720,12 +33465,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -46831,7 +34481,7 @@
LIBJPEG_QT=
fi
-@@ -30694,15 +33501,15 @@
+@@ -30756,15 +33501,15 @@
@@ -46853,7 +34503,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30726,11 +33533,11 @@
+@@ -30788,11 +33533,11 @@
@@ -46869,34 +34519,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30782,7 +33589,7 @@
+@@ -30844,7 +33589,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30785: $i/$j" >&5
+- echo "configure: 30847: $i/$j" >&5
+ echo "configure: 33592: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30812,7 +33619,7 @@
+@@ -30874,7 +33619,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30815: $i/$j" >&5
+- echo "configure: 30877: $i/$j" >&5
+ echo "configure: 33622: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30830,7 +33637,7 @@
+@@ -30892,7 +33637,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30833: $i/$j" >&5
+- echo "configure: 30895: $i/$j" >&5
+ echo "configure: 33640: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30889,12 +33696,12 @@
+@@ -30951,12 +33696,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -46913,7 +34563,7 @@
fi
kde_libraries="${libdir}"
-@@ -30903,8 +33710,8 @@
+@@ -30965,8 +33710,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -46924,7 +34574,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -30942,8 +33749,8 @@
+@@ -31004,8 +33749,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -46935,7 +34585,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30986,8 +33793,8 @@
+@@ -31048,8 +33793,8 @@
fi
@@ -46946,7 +34596,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31019,10 +33826,9 @@
+@@ -31081,10 +33826,9 @@
@@ -46959,7 +34609,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31036,13 +33842,14 @@
+@@ -31098,13 +33842,14 @@
fi
@@ -46977,28 +34627,28 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31153,15 +33960,14 @@
+@@ -31215,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 @@
+@@ -31275,8 +34019,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -47009,7 +34659,7 @@
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 @@
+@@ -31315,8 +34059,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -47020,7 +34670,7 @@
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 @@
+@@ -31324,8 +34068,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -47031,28 +34681,28 @@
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 @@
+@@ -31518,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 @@
+@@ -31578,8 +34321,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -47063,7 +34713,7 @@
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 @@
+@@ -31618,8 +34361,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -47074,7 +34724,7 @@
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 @@
+@@ -31627,8 +34370,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -47085,7 +34735,7 @@
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 @@
+@@ -31720,22 +34463,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -47114,7 +34764,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31706,14 +34511,14 @@
+@@ -31768,14 +34511,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -47132,7 +34782,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31756,8 +34561,8 @@
+@@ -31818,8 +34561,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47143,7 +34793,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31768,21 +34573,21 @@
+@@ -31830,21 +34573,21 @@
{ (exit 1); exit 1; }; }
else
@@ -47170,7 +34820,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31825,8 +34630,8 @@
+@@ -31887,8 +34630,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47181,7 +34831,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31837,22 +34642,22 @@
+@@ -31899,22 +34642,22 @@
{ (exit 1); exit 1; }; }
else
@@ -47209,7 +34859,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31895,8 +34700,8 @@
+@@ -31957,8 +34700,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47220,7 +34870,7 @@
{ { 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 @@
+@@ -31971,21 +34714,21 @@
{ (exit 1); exit 1; }; }
else
@@ -47247,7 +34897,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31966,8 +34771,8 @@
+@@ -32028,8 +34771,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47258,7 +34908,7 @@
{ { 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 @@
+@@ -32042,22 +34785,22 @@
{ (exit 1); exit 1; }; }
else
@@ -47286,7 +34936,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32038,12 +34843,12 @@
+@@ -32100,12 +34843,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47303,7 +34953,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32072,14 +34877,14 @@
+@@ -32134,14 +34877,14 @@
if test -n "$kde32ornewer"; then
@@ -47321,7 +34971,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32122,8 +34927,8 @@
+@@ -32184,8 +34927,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47332,7 +34982,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32134,21 +34939,21 @@
+@@ -32196,21 +34939,21 @@
{ (exit 1); exit 1; }; }
else
@@ -47359,7 +35009,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32191,8 +34996,8 @@
+@@ -32253,8 +34996,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47370,7 +35020,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32203,8 +35008,8 @@
+@@ -32265,8 +35008,8 @@
{ (exit 1); exit 1; }; }
else
@@ -47381,7 +35031,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32212,14 +35017,14 @@
+@@ -32274,14 +35017,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -47399,7 +35049,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32262,8 +35067,8 @@
+@@ -32324,8 +35067,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47410,7 +35060,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32274,8 +35079,8 @@
+@@ -32336,8 +35079,8 @@
{ (exit 1); exit 1; }; }
else
@@ -47421,7 +35071,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32283,14 +35088,14 @@
+@@ -32345,14 +35088,14 @@
fi
@@ -47439,7 +35089,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32333,12 +35138,12 @@
+@@ -32395,12 +35138,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47456,16 +35106,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32353,7 +35158,7 @@
+@@ -32415,7 +35158,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32356: $i/$j" >&5
+- echo "configure: 32418: $i/$j" >&5
+ echo "configure: 35161: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32516,13 +35321,12 @@
+@@ -32578,13 +35321,12 @@
@@ -47482,7 +35132,7 @@
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 @@
+@@ -32605,13 +35347,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -47500,7 +35150,7 @@
{ 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 @@
+@@ -32631,16 +35373,15 @@
kde_have_gcc_visibility=no
@@ -47521,7 +35171,7 @@
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 @@
+@@ -32667,24 +35408,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47566,7 +35216,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32631,8 +35446,10 @@
+@@ -32693,8 +35446,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47578,7 +35228,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -32645,28 +35462,27 @@
+@@ -32707,28 +35462,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -47599,10 +35249,10 @@
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
@@ -47616,7 +35266,7 @@
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 @@
+@@ -32763,24 +35517,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -47661,7 +35311,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32727,9 +35555,10 @@
+@@ -32789,9 +35555,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47674,7 +35324,7 @@
CXXFLAGS=$safe_CXXFLAGS
ac_ext=c
-@@ -32741,21 +35570,20 @@
+@@ -32803,21 +35570,20 @@
fi
@@ -47701,7 +35351,7 @@
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 @@
+@@ -32857,24 +35623,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47746,7 +35396,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32821,9 +35661,10 @@
+@@ -32883,9 +35661,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47759,7 +35409,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -32837,8 +35678,8 @@
+@@ -32899,8 +35678,8 @@
fi
@@ -47770,7 +35420,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32854,8 +35695,8 @@
+@@ -32916,8 +35695,8 @@
fi
else
@@ -47781,7 +35431,7 @@
:
fi
-@@ -32864,8 +35705,8 @@
+@@ -32926,8 +35705,8 @@
@@ -47792,16 +35442,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -32877,7 +35718,7 @@
+@@ -32939,7 +35718,7 @@
do
for j in qsql.html;
do
-- echo "configure: 32880: $i/$j" >&5
+- echo "configure: 32942: $i/$j" >&5
+ echo "configure: 35721: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -32886,20 +35727,20 @@
+@@ -32948,20 +35727,20 @@
done
done
@@ -47827,7 +35477,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32942,12 +35783,12 @@
+@@ -33004,12 +35783,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47844,7 +35494,7 @@
DOT=$kde_cv_path
fi
-@@ -32959,14 +35800,14 @@
+@@ -33021,14 +35800,14 @@
fi
@@ -47862,7 +35512,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33009,12 +35850,12 @@
+@@ -33071,12 +35850,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -47879,7 +35529,7 @@
DOXYGEN=$kde_cv_path
fi
-@@ -33038,8 +35879,8 @@
+@@ -33100,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
@@ -47890,7 +35540,7 @@
if test "${ac_cv_prog_PKGCONFIGFOUND+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33052,26 +35893,28 @@
+@@ -33114,26 +35893,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -47924,7 +35574,7 @@
###############################################################################
# END PKG-CONFIG CHECK
###############################################################################
-@@ -33087,13 +35930,12 @@
+@@ -33149,13 +35930,12 @@
@@ -47941,7 +35591,7 @@
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 @@
+@@ -33176,13 +35956,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -47959,7 +35609,7 @@
{ 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 @@
+@@ -33202,16 +35982,15 @@
kde_have_gcc_visibility=no
@@ -47980,7 +35630,7 @@
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 @@
+@@ -33238,24 +36017,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48025,7 +35675,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33202,8 +36055,10 @@
+@@ -33264,8 +36055,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48037,7 +35687,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -33216,28 +36071,27 @@
+@@ -33278,28 +36071,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -48058,10 +35708,10 @@
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
@@ -48075,7 +35725,7 @@
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 @@
+@@ -33334,24 +36126,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -48120,7 +35770,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33298,9 +36164,10 @@
+@@ -33360,9 +36164,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48133,7 +35783,7 @@
CXXFLAGS=$safe_CXXFLAGS
ac_ext=c
-@@ -33312,21 +36179,20 @@
+@@ -33374,21 +36179,20 @@
fi
@@ -48160,7 +35810,7 @@
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 @@
+@@ -33428,24 +36232,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48205,7 +35855,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33392,9 +36270,10 @@
+@@ -33454,9 +36270,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48218,7 +35868,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -33408,8 +36287,8 @@
+@@ -33470,8 +36287,8 @@
fi
@@ -48229,7 +35879,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -33425,8 +36304,8 @@
+@@ -33487,8 +36304,8 @@
fi
else
@@ -48240,7 +35890,7 @@
:
fi
-@@ -33442,13 +36321,13 @@
+@@ -33504,13 +36321,13 @@
if test -d $srcdir/libkipi; then
have_libkipi=yes
@@ -48258,7 +35908,7 @@
-@@ -33471,8 +36350,8 @@
+@@ -33533,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
@@ -48269,7 +35919,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33487,28 +36366,29 @@
+@@ -33549,28 +36366,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -48305,7 +35955,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -33519,25 +36399,25 @@
+@@ -33581,25 +36399,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -48343,7 +35993,7 @@
else
LIBKIPI_CFLAGS=""
LIBKIPI_LIBS=""
-@@ -33566,17 +36446,17 @@
+@@ -33628,17 +36446,17 @@
if test "x$have_libkipi" = "xno"; then
LIBKIPI_CFLAGS=""
LIBKIPI_LIBS=""
@@ -48367,7 +36017,7 @@
fi
-@@ -33591,8 +36471,8 @@
+@@ -33653,8 +36471,8 @@
#------------------------------------------------------------------
have_tiff=no
@@ -48378,7 +36028,7 @@
if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33605,40 +36485,52 @@
+@@ -33667,40 +36485,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -48443,7 +36093,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33647,14 +36539,15 @@
+@@ -33709,14 +36539,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48463,7 +36113,7 @@
if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then
have_tiff=yes
else
-@@ -33668,8 +36561,7 @@
+@@ -33730,8 +36561,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -48473,7 +36123,7 @@
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 @@
+@@ -33741,17 +36571,17 @@
if test "${ac_cv_header_tiffio_h+set}" = set; then
@@ -48497,7 +36147,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33700,24 +36592,36 @@
+@@ -33762,24 +36592,36 @@
#include <tiffio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -48542,7 +36192,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33726,15 +36630,16 @@
+@@ -33788,15 +36630,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48565,7 +36215,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33743,8 +36648,13 @@
+@@ -33805,8 +36648,13 @@
/* end confdefs.h. */
#include <tiffio.h>
_ACEOF
@@ -48581,7 +36231,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33768,9 +36678,10 @@
+@@ -33830,9 +36678,10 @@
ac_header_preproc=no
fi
@@ -48594,7 +36244,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -33794,25 +36705,18 @@
+@@ -33856,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;}
@@ -48625,7 +36275,7 @@
fi
if test $ac_cv_header_tiffio_h = yes; then
-@@ -33869,8 +36773,8 @@
+@@ -33931,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
@@ -48636,7 +36286,7 @@
if test "${ac_cv_path_GPHOTO_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33885,31 +36789,32 @@
+@@ -33947,31 +36789,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -48677,7 +36327,7 @@
if test "${ac_cv_path_GPHOTO_PORT_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33924,27 +36829,28 @@
+@@ -33986,27 +36829,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -48712,7 +36362,7 @@
if test -n "${GPHOTO_CONFIG}"; then
GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`"
-@@ -33981,8 +36887,8 @@
+@@ -34043,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
@@ -48723,7 +36373,7 @@
if test "${ac_cv_path_XSLT_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33997,27 +36903,28 @@
+@@ -34059,27 +36903,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -48758,7 +36408,7 @@
if test -n "${XSLT_CONFIG}"; then
LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
-@@ -34062,8 +36969,8 @@
+@@ -34124,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
@@ -48769,7 +36419,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34078,28 +36985,29 @@
+@@ -34140,28 +36985,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -48805,7 +36455,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -34110,25 +37018,25 @@
+@@ -34172,25 +37018,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -48843,7 +36493,7 @@
else
EXIV2_CFLAGS=""
EXIV2_LIBS=""
-@@ -34187,8 +37095,8 @@
+@@ -34248,8 +37094,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
@@ -48854,7 +36504,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34203,28 +37111,29 @@
+@@ -34264,28 +37110,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -48890,16 +36540,16 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -34235,25 +37144,25 @@
+@@ -34296,25 +37143,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; }
+- echo "$as_me:$LINENO: checking for libgpod-1.0 = 0.4.2" >&5
+-echo $ECHO_N "checking for libgpod-1.0 = 0.4.2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for libgpod-1.0 = 0.4.2" >&5
++echo $ECHO_N "checking for libgpod-1.0 = 0.4.2... $ECHO_C" >&6; }
- if $PKG_CONFIG --exists "libgpod-1.0 > 0.4.0" ; then
+ if $PKG_CONFIG --exists "libgpod-1.0 = 0.4.2" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -48910,7 +36560,7 @@
-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"`
+ LIBGPOD_CFLAGS=`$PKG_CONFIG --cflags "libgpod-1.0 = 0.4.2"`
- echo "$as_me:$LINENO: result: $LIBGPOD_CFLAGS" >&5
-echo "${ECHO_T}$LIBGPOD_CFLAGS" >&6
+ { echo "$as_me:$LINENO: result: $LIBGPOD_CFLAGS" >&5
@@ -48920,7 +36570,7 @@
-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"`
+ LIBGPOD_LIBS=`$PKG_CONFIG --libs "libgpod-1.0 = 0.4.2"`
- echo "$as_me:$LINENO: result: $LIBGPOD_LIBS" >&5
-echo "${ECHO_T}$LIBGPOD_LIBS" >&6
+ { echo "$as_me:$LINENO: result: $LIBGPOD_LIBS" >&5
@@ -48928,354 +36578,7 @@
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 @@
+@@ -34382,25 +37229,24 @@
###############################################################################
@@ -49308,7 +36611,7 @@
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 @@
+@@ -34438,24 +37284,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49353,7 +36656,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34725,9 +37669,10 @@
+@@ -34464,9 +37322,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49366,7 +36669,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -34742,8 +37687,8 @@
+@@ -34481,8 +37340,8 @@
fi
@@ -49377,7 +36680,7 @@
if test x$ac_cv_kde_qt_has_opengl = xyes; then
have_GL="yes"
-@@ -34767,58 +37712,58 @@
+@@ -34506,58 +37365,58 @@
@@ -49454,7 +36757,7 @@
fi
fi
fi
-@@ -34864,8 +37809,8 @@
+@@ -34603,8 +37462,8 @@
fi
for i in $ac_topsubdirs; do
@@ -49465,7 +36768,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -34876,8 +37821,8 @@
+@@ -34615,8 +37474,8 @@
else
install_it="no"
fi
@@ -49476,7 +36779,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -34929,179 +37874,179 @@
+@@ -34668,181 +37527,181 @@
po_SUBDIR_included_FALSE=
fi
@@ -49618,6 +36921,9 @@
- 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/sync/Makefile"
++ac_config_files="$ac_config_files kipi-plugins/sync/Makefile"
+
- ac_config_files="$ac_config_files kipi-plugins/timeadjust/Makefile"
+ac_config_files="$ac_config_files kipi-plugins/timeadjust/Makefile"
@@ -49743,7 +37049,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -35121,39 +38066,58 @@
+@@ -34862,39 +37721,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -49818,7 +37124,7 @@
fi
fi
rm -f confcache
-@@ -35162,38 +38126,31 @@
+@@ -34903,38 +37781,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -49870,7 +37176,7 @@
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
-@@ -35337,11 +38294,35 @@
+@@ -35078,11 +37949,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -49908,7 +37214,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -35350,8 +38331,43 @@
+@@ -35091,8 +37986,43 @@
fi
@@ -49953,7 +37259,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -35365,18 +38381,19 @@
+@@ -35106,18 +38036,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -49976,7 +37282,7 @@
as_basename=basename
else
as_basename=false
-@@ -35384,159 +38401,120 @@
+@@ -35125,159 +38056,120 @@
# Name of the executable.
@@ -50207,7 +37513,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -35545,7 +38523,19 @@
+@@ -35286,7 +38178,19 @@
as_mkdir_p=false
fi
@@ -50228,7 +37534,7 @@
# 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 @@
+@@ -35295,31 +38199,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -50264,7 +37570,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -35586,30 +38559,20 @@
+@@ -35327,30 +38214,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -50303,7 +37609,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -35636,19 +38599,21 @@
+@@ -35377,19 +38254,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -50331,7 +37637,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -35659,39 +38624,24 @@
+@@ -35400,39 +38279,24 @@
do
case $1 in
--*=*)
@@ -50377,7 +37683,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -35701,18 +38651,24 @@
+@@ -35442,18 +38306,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -50407,7 +37713,7 @@
esac
shift
-@@ -35728,123 +38684,135 @@
+@@ -35469,124 +38339,136 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -50420,7 +37726,6 @@
fi
_ACEOF
--
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
@@ -50430,7 +37735,7 @@
+_ASBOX
+ echo "$ac_log"
+} >&5
-+
+
+_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
#
@@ -50497,6 +37802,7 @@
- "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/sync/Makefile" ) CONFIG_FILES="$CONFIG_FILES kipi-plugins/sync/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" ;;
@@ -50589,6 +37895,7 @@
+ "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/sync/Makefile") CONFIG_FILES="$CONFIG_FILES kipi-plugins/sync/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" ;;
@@ -50641,7 +37948,7 @@
# 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 @@
+@@ -35598,541 +38480,733 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -50748,14 +38055,17 @@
-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 mkdir_p@,$mkdir_p,;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 AMTAR@,$AMTAR,;t t
+-s, at am__tar@,$am__tar,;t t
+-s, at am__untar@,$am__untar,;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
@@ -51301,7 +38611,7 @@
+CEOF$ac_eof
+_ACEOF
+
-+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
@@ -51402,8 +38712,8 @@
+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
-
+ _ACEOF
++
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
@@ -51485,7 +38795,7 @@
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
- _ACEOF
++_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -51852,7 +39162,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -36395,248 +39558,130 @@
+@@ -36140,248 +39214,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -51878,24 +39188,6 @@
-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
@@ -51917,6 +39209,24 @@
+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;}
+-#
+-# 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'
+-
-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"
@@ -52201,7 +39511,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -36647,135 +39692,39 @@
+@@ -36392,135 +39348,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -52363,7 +39673,7 @@
# 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 @@
+@@ -36530,18 +39390,29 @@
# 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
@@ -52401,40 +39711,7 @@
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" | \
+@@ -36563,53 +39434,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -52547,7 +39824,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kipi-plugins-0.1.3-rc1, "3.5.5") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kipi-plugins-0.1.3, "3.5.6") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -52556,74 +39833,7 @@
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 @@
+@@ -116,6 +116,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -52631,7 +39841,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +205,9 @@
+@@ -204,6 +205,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52641,7 +39851,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +246,7 @@
+@@ -242,6 +246,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52649,7 +39859,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +254,9 @@
+@@ -249,12 +254,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -52662,16 +39872,7 @@
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 @@
+@@ -285,14 +287,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -52690,14 +39891,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +335,17 @@
+@@ -329,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -52708,383 +39909,66 @@
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
+@@ -364,7 +373,7 @@
all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -373,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
--#>+ 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -385,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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -402,9 +411,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -706,9 +715,9 @@
+ exit 1;; \
+ esac; \
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) --gnu doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/Makefile
+ $(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
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -53092,7 +39976,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53102,7 +39986,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53110,7 +39994,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -53123,16 +40007,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -53151,14 +40026,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -53169,222 +40044,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -587,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- doc/de_kipi-plugins/Makefile.in
+++ doc/de_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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -53392,7 +40111,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53402,7 +40121,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53410,7 +40129,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -53423,16 +40142,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -53451,14 +40161,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -53469,222 +40179,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -587,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- doc/es_kipi-plugins/Makefile.in
+++ doc/es_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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -53692,7 +40246,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53702,7 +40256,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53710,7 +40264,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -53723,16 +40277,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -53751,14 +40296,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -53769,222 +40314,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -587,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- doc/et_kipi-plugins/Makefile.in
+++ doc/et_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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -53992,7 +40381,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54002,7 +40391,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54010,7 +40399,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -54023,16 +40412,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -54051,14 +40431,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -54069,222 +40449,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -587,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- doc/it_kipi-plugins/Makefile.in
+++ doc/it_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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -54292,7 +40516,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54302,7 +40526,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54310,7 +40534,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -54323,16 +40547,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -54351,14 +40566,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -54369,222 +40584,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -587,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- doc/kipi-plugins/Makefile.in
+++ doc/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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -54592,7 +40651,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54602,7 +40661,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54610,7 +40669,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -54623,16 +40682,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -54651,14 +40701,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -54669,225 +40719,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,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
--#>+ 3
+#>- $(AUTOMAKE) --foreign 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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)
-
- #>- 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:
-
- 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"
-@@ -445,6 +488,8 @@
-
- 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; \
+@@ -587,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) && \
+ 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
--- doc/nl_kipi-plugins/Makefile.in
+++ doc/nl_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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -54895,7 +40786,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54905,7 +40796,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54913,7 +40804,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -54926,16 +40817,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -54954,14 +40836,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -54972,222 +40854,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -587,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- doc/pt_BR_kipi-plugins/Makefile.in
+++ doc/pt_BR_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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -55195,7 +40921,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55205,7 +40931,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55213,7 +40939,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -55226,16 +40952,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -55254,14 +40971,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -55272,222 +40989,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -587,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- doc/pt_kipi-plugins/Makefile.in
+++ doc/pt_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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -55495,7 +41056,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55505,7 +41066,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55513,7 +41074,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -55526,16 +41087,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -55554,14 +41106,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -55572,222 +41124,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -587,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- doc/ru_kipi-plugins/Makefile.in
+++ doc/ru_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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -55795,7 +41191,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55805,7 +41201,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55813,7 +41209,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -55826,16 +41222,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -55854,14 +41241,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -55872,222 +41259,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -565,9 +574,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- doc/sv_kipi-plugins/Makefile.in
+++ doc/sv_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.
-@@ -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 @@
+@@ -100,6 +100,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -56095,7 +41326,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +189,9 @@
+@@ -188,6 +189,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56105,7 +41336,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +230,7 @@
+@@ -226,6 +230,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56113,7 +41344,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +238,9 @@
+@@ -233,12 +238,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -56126,16 +41357,7 @@
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 @@
+@@ -269,14 +271,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -56154,14 +41376,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +319,17 @@
+@@ -313,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -56172,243 +41394,66 @@
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
+@@ -345,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -354,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -366,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -383,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -587,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -130,6 +130,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -56416,7 +41461,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +219,9 @@
+@@ -218,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56426,7 +41471,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +260,7 @@
+@@ -256,6 +260,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56434,7 +41479,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +268,9 @@
+@@ -263,12 +268,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -56447,16 +41492,7 @@
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 @@
+@@ -299,14 +301,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -56475,14 +41511,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +349,17 @@
+@@ -343,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -56493,482 +41529,66 @@
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
+@@ -390,7 +399,7 @@
all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -399,9 +408,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
--#>+ 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -411,9 +420,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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -428,9 +437,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -762,9 +771,9 @@
+ exit 1;; \
+ esac; \
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) --gnu kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/Makefile
+ $(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
-@@ -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 @@
+@@ -148,6 +148,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -56976,7 +41596,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +237,9 @@
+@@ -236,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56986,7 +41606,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +278,7 @@
+@@ -274,6 +278,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56994,7 +41614,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +286,9 @@
+@@ -281,12 +286,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -57007,16 +41627,7 @@
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 @@
+@@ -317,14 +319,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -57035,14 +41646,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +367,17 @@
+@@ -361,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -57053,521 +41664,66 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -339,101 +412,78 @@
+@@ -409,7 +418,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -418,9 +427,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -430,9 +439,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -447,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -787,9 +796,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -181,6 +181,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -57575,7 +41731,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +270,9 @@
+@@ -269,6 +270,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57585,7 +41741,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +311,7 @@
+@@ -307,6 +311,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57593,7 +41749,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +319,9 @@
+@@ -314,12 +319,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -57606,16 +41762,7 @@
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 @@
+@@ -350,14 +352,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -57634,14 +41781,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +400,17 @@
+@@ -394,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -57652,662 +41799,66 @@
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
+@@ -470,7 +479,7 @@
-@@ -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: $(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -479,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'; \
#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -491,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'; \
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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -508,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -1128,9 +1137,9 @@
+ exit 1;; \
+ esac; \
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) --gnu kipi-plugins/batchprocessimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/batchprocessimages/data/Makefile.in
+++ kipi-plugins/batchprocessimages/data/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/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 @@
+@@ -110,6 +110,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -58315,7 +41866,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +199,9 @@
+@@ -198,6 +199,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58325,7 +41876,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +240,7 @@
+@@ -236,6 +240,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58333,7 +41884,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +248,9 @@
+@@ -243,12 +248,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -58346,16 +41897,7 @@
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 @@
+@@ -279,14 +281,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -58374,14 +41916,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +329,17 @@
+@@ -323,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -58392,317 +41934,66 @@
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
+@@ -355,7 +364,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -364,9 +373,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -376,9 +385,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -393,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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:
--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; \
+@@ -572,9 +581,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -149,6 +149,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -58710,7 +42001,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +238,9 @@
+@@ -237,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58720,7 +42011,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +279,7 @@
+@@ -275,6 +279,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58728,7 +42019,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +287,9 @@
+@@ -282,12 +287,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -58741,16 +42032,7 @@
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 @@
+@@ -318,14 +320,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -58769,14 +42051,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +368,17 @@
+@@ -362,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -58787,534 +42069,66 @@
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
+@@ -407,7 +416,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -416,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'; \
#>- cd $(top_srcdir) && \
-#>- $(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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -428,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'; \
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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -445,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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 +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; \
+@@ -810,9 +819,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'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -167,6 +167,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -59322,7 +42136,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +256,9 @@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59332,7 +42146,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +297,7 @@
+@@ -293,6 +297,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59340,7 +42154,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +305,9 @@
+@@ -300,12 +305,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -59353,16 +42167,7 @@
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 @@
+@@ -336,14 +338,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -59381,14 +42186,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +386,17 @@
+@@ -380,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -59399,649 +42204,66 @@
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
+@@ -434,7 +443,7 @@
-@@ -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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -443,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'; \
#>- cd $(top_srcdir) && \
-#>- $(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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -455,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'; \
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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -472,9 +481,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -956,9 +965,9 @@
+ exit 1;; \
+ esac; \
done; \
- 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) --gnu kipi-plugins/cdarchiving/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/cdarchiving/autorun/Makefile.in
+++ kipi-plugins/cdarchiving/autorun/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,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 @@
+@@ -112,6 +112,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -60049,7 +42271,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +201,9 @@
+@@ -200,6 +201,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60059,7 +42281,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +242,7 @@
+@@ -238,6 +242,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60067,7 +42289,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +250,9 @@
+@@ -245,12 +250,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -60080,16 +42302,7 @@
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 @@
+@@ -281,14 +283,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -60108,14 +42321,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +331,17 @@
+@@ -325,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -60126,309 +42339,66 @@
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
+@@ -359,7 +368,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -368,9 +377,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -380,9 +389,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -397,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -593,9 +602,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -116,6 +116,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -60436,7 +42406,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +205,9 @@
+@@ -204,6 +205,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60446,7 +42416,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +246,7 @@
+@@ -242,6 +246,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60454,7 +42424,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +254,9 @@
+@@ -249,12 +254,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -60467,16 +42437,7 @@
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 @@
+@@ -285,14 +287,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -60495,14 +42456,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +335,17 @@
+@@ -329,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -60513,400 +42474,66 @@
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
+@@ -360,7 +369,7 @@
all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -369,9 +378,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/common/Makefile'; \
+#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -381,9 +390,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/common/Makefile'; \
+ 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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -398,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -702,9 +711,9 @@
+ exit 1;; \
+ esac; \
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) --gnu kipi-plugins/common/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/common/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -132,6 +132,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -60914,7 +42541,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +221,9 @@
+@@ -220,6 +221,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60924,7 +42551,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +262,7 @@
+@@ -258,6 +262,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60932,7 +42559,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +270,9 @@
+@@ -265,12 +270,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -60945,16 +42572,7 @@
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 @@
+@@ -301,14 +303,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -60973,14 +42591,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +351,17 @@
+@@ -345,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -60991,405 +42609,66 @@
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
+@@ -383,7 +392,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -392,9 +401,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/common/exiv2iface/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/common/exiv2iface/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -404,9 +413,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/common/exiv2iface/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/common/exiv2iface/Makefile'; \
cd $(top_srcdir) && \
- $(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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -421,9 +430,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
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; \
+@@ -667,9 +676,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/common/exiv2iface/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/common/exiv2iface/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(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
--- 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 @@
+@@ -140,6 +140,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -61397,7 +42676,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +229,9 @@
+@@ -228,6 +229,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61407,7 +42686,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +270,7 @@
+@@ -266,6 +270,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61415,7 +42694,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +278,9 @@
+@@ -273,12 +278,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -61428,16 +42707,7 @@
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 @@
+@@ -309,14 +311,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -61456,14 +42726,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +359,17 @@
+@@ -353,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -61474,454 +42744,66 @@
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
+@@ -393,7 +402,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -402,9 +411,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/common/libkipiplugins/Makefile'; \
+#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -414,9 +423,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/common/libkipiplugins/Makefile'; \
+ 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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -431,9 +440,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(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; \
+@@ -715,9 +724,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/common/libkipiplugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/common/libkipiplugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/findimages/Makefile.in
+++ kipi-plugins/findimages/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,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 @@
+@@ -152,6 +152,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -61929,7 +42811,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +241,9 @@
+@@ -240,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61939,7 +42821,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +282,7 @@
+@@ -278,6 +282,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61947,7 +42829,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +290,9 @@
+@@ -285,12 +290,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -61960,16 +42842,7 @@
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 @@
+@@ -321,14 +323,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -61988,14 +42861,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +371,17 @@
+@@ -365,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -62006,523 +42879,66 @@
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
+@@ -419,7 +428,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -428,9 +437,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -440,9 +449,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -457,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -819,9 +828,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/findimages/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/flickrexport/Makefile.in
+++ kipi-plugins/flickrexport/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,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 @@
+@@ -151,6 +151,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -62530,7 +42946,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +240,9 @@
+@@ -239,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62540,7 +42956,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +281,7 @@
+@@ -277,6 +281,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62548,7 +42964,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +289,9 @@
+@@ -284,12 +289,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -62561,16 +42977,7 @@
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 @@
+@@ -320,14 +322,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -62589,14 +42996,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +370,17 @@
+@@ -364,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -62607,529 +43014,66 @@
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)
+@@ -414,7 +423,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -423,9 +432,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -435,9 +444,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -452,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -811,9 +820,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/flickrexport/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/galleryexport/Makefile.in
+++ kipi-plugins/galleryexport/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,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 @@
+@@ -154,6 +154,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -63137,7 +43081,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +243,9 @@
+@@ -242,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63147,7 +43091,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +284,7 @@
+@@ -280,6 +284,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63155,7 +43099,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +292,9 @@
+@@ -287,12 +292,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -63168,16 +43112,7 @@
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 @@
+@@ -323,14 +325,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -63196,14 +43131,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +373,17 @@
+@@ -367,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -63214,577 +43149,66 @@
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
+@@ -425,7 +434,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -434,9 +443,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -446,9 +455,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -463,9 +472,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -859,9 +868,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/galleryexport/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -149,6 +149,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -63792,7 +43216,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +238,9 @@
+@@ -237,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63802,7 +43226,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +279,7 @@
+@@ -275,6 +279,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63810,7 +43234,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +287,9 @@
+@@ -282,12 +287,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -63823,16 +43247,7 @@
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 @@
+@@ -318,14 +320,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -63851,14 +43266,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +368,17 @@
+@@ -362,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -63869,523 +43284,66 @@
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
+@@ -422,7 +431,7 @@
- # 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: $(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -431,9 +440,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/gpssync/Makefile'; \
+#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/gpssync/Makefile'; \
+ 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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -460,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -839,9 +848,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/gpssync/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/gpssync/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/helloworld/Makefile.in
+++ kipi-plugins/helloworld/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,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 @@
+@@ -143,6 +143,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -64393,7 +43351,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +232,9 @@
+@@ -231,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64403,7 +43361,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +273,7 @@
+@@ -269,6 +273,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64411,7 +43369,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +281,9 @@
+@@ -276,12 +281,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -64424,16 +43382,7 @@
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 @@
+@@ -312,14 +314,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -64452,14 +43401,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +362,17 @@
+@@ -356,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -64470,491 +43419,66 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -339,89 +407,78 @@
+@@ -404,7 +413,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -413,9 +422,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -425,9 +434,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -442,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -767,9 +776,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/helloworld/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/htmlexport/Makefile.in
+++ kipi-plugins/htmlexport/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,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 @@
+@@ -163,6 +163,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -64962,7 +43486,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +252,9 @@
+@@ -251,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64972,7 +43496,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +293,7 @@
+@@ -289,6 +293,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64980,7 +43504,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +301,9 @@
+@@ -296,12 +301,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -64993,16 +43517,7 @@
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 @@
+@@ -332,14 +334,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -65021,14 +43536,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +382,17 @@
+@@ -376,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -65039,626 +43554,66 @@
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
+@@ -442,7 +451,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -451,9 +460,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -463,9 +472,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -480,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -956,9 +965,9 @@
+ exit 1;; \
+ esac; \
done; \
- 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) --gnu kipi-plugins/htmlexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/htmlexport/themes/Makefile.in
+++ kipi-plugins/htmlexport/themes/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/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 @@
+@@ -116,6 +116,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -65666,7 +43621,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +205,9 @@
+@@ -204,6 +205,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -65676,7 +43631,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +246,7 @@
+@@ -242,6 +246,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -65684,7 +43639,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +254,9 @@
+@@ -249,12 +254,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -65697,16 +43652,7 @@
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 @@
+@@ -285,14 +287,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -65725,14 +43671,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +335,17 @@
+@@ -329,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -65743,378 +43689,66 @@
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
+@@ -360,7 +369,7 @@
all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -369,9 +378,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -381,9 +390,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -398,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -702,9 +711,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu kipi-plugins/htmlexport/themes/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/htmlexport/themes/matrix/Makefile.in
+++ kipi-plugins/htmlexport/themes/matrix/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/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 @@
+@@ -110,6 +110,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -66122,7 +43756,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +199,9 @@
+@@ -198,6 +199,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66132,7 +43766,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +240,7 @@
+@@ -236,6 +240,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66140,7 +43774,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +248,9 @@
+@@ -243,12 +248,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -66153,16 +43787,7 @@
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 @@
+@@ -279,14 +281,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -66181,14 +43806,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +329,17 @@
+@@ -323,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -66199,263 +43824,66 @@
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
+@@ -360,7 +369,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -369,9 +378,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -381,9 +390,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -398,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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=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; \
+@@ -574,9 +583,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/matrix/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -110,6 +110,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -66463,7 +43891,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +199,9 @@
+@@ -198,6 +199,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66473,7 +43901,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +240,7 @@
+@@ -236,6 +240,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66481,7 +43909,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +248,9 @@
+@@ -243,12 +248,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -66494,16 +43922,7 @@
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 @@
+@@ -279,14 +281,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -66522,14 +43941,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +329,17 @@
+@@ -323,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -66540,263 +43959,66 @@
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
+@@ -360,7 +369,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -369,9 +378,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/s0/Makefile'; \
+#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -381,9 +390,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/s0/Makefile'; \
+ 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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -398,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -574,9 +583,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/s0/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/s0/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/htmlexport/themes/simple/Makefile.in
+++ kipi-plugins/htmlexport/themes/simple/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/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 @@
+@@ -110,6 +110,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -66804,7 +44026,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +199,9 @@
+@@ -198,6 +199,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66814,7 +44036,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +240,7 @@
+@@ -236,6 +240,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66822,7 +44044,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +248,9 @@
+@@ -243,12 +248,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -66835,16 +44057,7 @@
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 @@
+@@ -279,14 +281,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -66863,14 +44076,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +329,17 @@
+@@ -323,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -66881,263 +44094,66 @@
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
+@@ -359,7 +368,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -368,9 +377,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -380,9 +389,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -397,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -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; \
+@@ -573,9 +582,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/simple/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/htmlexport/themes/snow/Makefile.in
+++ kipi-plugins/htmlexport/themes/snow/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/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 @@
+@@ -110,6 +110,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -67145,7 +44161,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +199,9 @@
+@@ -198,6 +199,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -67155,7 +44171,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +240,7 @@
+@@ -236,6 +240,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -67163,7 +44179,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +248,9 @@
+@@ -243,12 +248,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -67176,16 +44192,7 @@
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 @@
+@@ -279,14 +281,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -67204,14 +44211,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +329,17 @@
+@@ -323,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -67222,308 +44229,66 @@
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
+@@ -360,7 +369,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -369,9 +378,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -381,9 +390,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -398,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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=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; \
+@@ -574,9 +583,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/snow/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/imagesgallery/Makefile.in
+++ kipi-plugins/imagesgallery/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,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 @@
+@@ -148,6 +148,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -67531,7 +44296,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +237,9 @@
+@@ -236,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -67541,7 +44306,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +278,7 @@
+@@ -274,6 +278,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -67549,7 +44314,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +286,9 @@
+@@ -281,12 +286,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -67562,16 +44327,7 @@
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 @@
+@@ -317,14 +319,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -67590,14 +44346,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +367,17 @@
+@@ -361,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -67608,500 +44364,66 @@
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
+@@ -411,7 +420,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -420,9 +429,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -432,9 +441,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -449,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -790,9 +799,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/imagesgallery/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -149,6 +149,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -68109,7 +44431,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +238,9 @@
+@@ -237,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68119,7 +44441,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +279,7 @@
+@@ -275,6 +279,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68127,7 +44449,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +287,9 @@
+@@ -282,12 +287,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -68140,16 +44462,7 @@
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 @@
+@@ -318,14 +320,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -68168,14 +44481,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +368,17 @@
+@@ -362,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -68186,519 +44499,75 @@
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 \
+@@ -401,7 +410,7 @@
ipodlistitem.cpp \
imagelist.cpp
--
-kipiplugin_ipodexport_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
--
+kipiplugin_ipodexport_la_LIBADD = -lgobject-2.0 $(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
+@@ -410,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -419,9 +428,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/ipodexport/Makefile'; \
+#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -431,9 +440,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/ipodexport/Makefile'; \
+ 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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -448,9 +457,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -793,9 +802,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/ipodexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/ipodexport/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/jpeglossless/Makefile.in
+++ kipi-plugins/jpeglossless/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,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 @@
+@@ -147,6 +147,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -68706,7 +44575,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +236,9 @@
+@@ -235,6 +236,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68716,7 +44585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +277,7 @@
+@@ -273,6 +277,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68724,7 +44593,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +285,9 @@
+@@ -280,12 +285,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -68737,16 +44606,7 @@
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 @@
+@@ -316,14 +318,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -68765,14 +44625,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +366,17 @@
+@@ -360,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -68783,524 +44643,66 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -332,125 +404,92 @@
+@@ -415,7 +424,7 @@
- # 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: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -424,9 +433,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -436,9 +445,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -453,9 +462,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -817,9 +826,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/jpeglossless/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/kameraklient/Makefile.in
+++ kipi-plugins/kameraklient/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,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 @@
+@@ -160,6 +160,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -69308,7 +44710,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +249,9 @@
+@@ -248,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69318,7 +44720,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +290,7 @@
+@@ -286,6 +290,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -69326,7 +44728,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +298,9 @@
+@@ -293,12 +298,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -69339,16 +44741,7 @@
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 @@
+@@ -329,14 +331,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -69367,14 +44760,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +379,17 @@
+@@ -373,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -69385,580 +44778,66 @@
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
+@@ -423,7 +432,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -432,9 +441,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -444,9 +453,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -461,9 +470,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -905,9 +914,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/kameraklient/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -158,6 +158,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -69966,7 +44845,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +247,9 @@
+@@ -246,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69976,7 +44855,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +288,7 @@
+@@ -284,6 +288,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -69984,7 +44863,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +296,9 @@
+@@ -291,12 +296,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -69997,16 +44876,7 @@
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 @@
+@@ -327,14 +329,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -70025,14 +44895,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +377,17 @@
+@@ -371,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -70043,581 +44913,66 @@
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
+@@ -436,7 +445,7 @@
- # 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:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -445,9 +454,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/metadataedit/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/metadataedit/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -457,9 +466,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/metadataedit/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/metadataedit/Makefile'; \
cd $(top_srcdir) && \
- $(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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -474,9 +483,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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:
- -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; \
+@@ -950,9 +959,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/metadataedit/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/metadataedit/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/metadataedit/Makefile
+ $(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
-@@ -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 @@
+@@ -156,6 +156,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -70625,7 +44980,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +245,9 @@
+@@ -244,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70635,7 +44990,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +286,7 @@
+@@ -282,6 +286,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -70643,7 +44998,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +294,9 @@
+@@ -289,12 +294,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -70656,16 +45011,7 @@
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 @@
+@@ -325,14 +327,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -70684,14 +45030,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +375,17 @@
+@@ -369,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -70702,583 +45048,66 @@
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
+@@ -428,7 +437,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -437,9 +446,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -449,9 +458,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -466,9 +475,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -896,9 +905,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/mpegencoder/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/printwizard/Makefile.in
+++ kipi-plugins/printwizard/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,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 @@
+@@ -148,6 +148,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -71286,7 +45115,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +237,9 @@
+@@ -236,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71296,7 +45125,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +278,7 @@
+@@ -274,6 +278,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71304,7 +45133,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +286,9 @@
+@@ -281,12 +286,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -71317,16 +45146,7 @@
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 @@
+@@ -317,14 +319,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -71345,14 +45165,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +367,17 @@
+@@ -361,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -71363,536 +45183,66 @@
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
+@@ -406,7 +415,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -415,9 +424,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -427,9 +436,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -444,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -790,9 +799,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/printwizard/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/rawconverter/Makefile.in
+++ kipi-plugins/rawconverter/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,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 @@
+@@ -181,6 +181,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -71900,7 +45250,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +270,9 @@
+@@ -269,6 +270,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71910,7 +45260,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +311,7 @@
+@@ -307,6 +311,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71918,7 +45268,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +319,9 @@
+@@ -314,12 +319,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -71931,16 +45281,7 @@
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 @@
+@@ -350,14 +352,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -71959,14 +45300,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +400,17 @@
+@@ -394,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -71977,767 +45318,66 @@
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)
+@@ -464,7 +473,7 @@
- # 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: .c .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -473,9 +482,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/rawconverter/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -485,9 +494,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/rawconverter/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -502,9 +511,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -1069,9 +1078,9 @@
+ exit 1;; \
+ esac; \
done; \
- 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) --gnu kipi-plugins/rawconverter/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/rawconverter/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -110,6 +110,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -72745,7 +45385,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +199,9 @@
+@@ -198,6 +199,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72755,7 +45395,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +240,7 @@
+@@ -236,6 +240,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72763,7 +45403,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +248,9 @@
+@@ -243,12 +248,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -72776,16 +45416,7 @@
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 @@
+@@ -279,14 +281,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -72804,14 +45435,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +329,17 @@
+@@ -323,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -72822,310 +45453,66 @@
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
+@@ -355,7 +364,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -364,9 +373,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/rawconverter/profiles/Makefile'; \
+#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -376,9 +385,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/rawconverter/profiles/Makefile'; \
+ 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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -393,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -570,9 +579,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/rawconverter/profiles/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/rawconverter/profiles/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/sendimages/Makefile.in
+++ kipi-plugins/sendimages/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,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 @@
+@@ -148,6 +148,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -73133,7 +45520,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +237,9 @@
+@@ -236,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73143,7 +45530,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +278,7 @@
+@@ -274,6 +278,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73151,7 +45538,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +286,9 @@
+@@ -281,12 +286,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -73164,16 +45551,7 @@
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 @@
+@@ -317,14 +319,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -73192,14 +45570,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +367,17 @@
+@@ -361,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -73210,504 +45588,66 @@
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)
+@@ -418,7 +427,7 @@
--
- #>- 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -427,9 +436,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -439,9 +448,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -456,9 +465,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -804,9 +813,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/sendimages/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/simpleviewerexport/Makefile.in
+++ kipi-plugins/simpleviewerexport/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,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 @@
+@@ -153,6 +153,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -73715,7 +45655,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +242,9 @@
+@@ -241,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73725,7 +45665,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +283,7 @@
+@@ -279,6 +283,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73733,7 +45673,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +291,9 @@
+@@ -286,12 +291,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -73746,16 +45686,7 @@
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 @@
+@@ -322,14 +324,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -73774,14 +45705,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +372,17 @@
+@@ -366,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -73792,568 +45723,66 @@
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
+@@ -422,7 +431,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -431,9 +440,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -460,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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 +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; \
+@@ -853,9 +862,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/simpleviewerexport/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/slideshow/Makefile.in
+++ kipi-plugins/slideshow/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,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 @@
+@@ -148,6 +148,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -74361,7 +45790,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +237,9 @@
+@@ -236,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74371,7 +45800,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +278,7 @@
+@@ -274,6 +278,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74379,7 +45808,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +286,9 @@
+@@ -281,12 +286,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -74392,16 +45821,7 @@
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 @@
+@@ -317,14 +319,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -74420,14 +45840,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +367,17 @@
+@@ -361,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -74438,510 +45858,201 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -327,9 +400,7 @@
+@@ -411,7 +420,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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -420,9 +429,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -432,9 +441,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -449,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
+@@ -821,9 +830,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile'; \
++ 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
- 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)
+--- kipi-plugins/sync/Makefile.in
++++ kipi-plugins/sync/Makefile.in
+@@ -147,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@
+@@ -235,6 +236,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@
+@@ -273,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@
+@@ -280,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@
+@@ -316,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@
+@@ -360,14 +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@
+@@ -412,7 +421,7 @@
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(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*) \
+@@ -421,9 +430,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/sync/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/sync/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu kipi-plugins/sync/Makefile
++#>- $(AUTOMAKE) --foreign kipi-plugins/sync/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -433,9 +442,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/sync/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/sync/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/sync/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/sync/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/sync/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -450,9 +459,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 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)
+-$(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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(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
+@@ -823,9 +832,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/sync/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/sync/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/sync/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/sync/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/sync/Makefile.in
- 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) --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
-@@ -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 @@
+@@ -148,6 +148,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -74949,7 +46060,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +237,9 @@
+@@ -236,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74959,7 +46070,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +278,7 @@
+@@ -274,6 +278,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74967,7 +46078,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +286,9 @@
+@@ -281,12 +286,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -74980,16 +46091,7 @@
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 @@
+@@ -317,14 +319,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -75008,14 +46110,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +367,17 @@
+@@ -361,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -75026,493 +46128,66 @@
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
+@@ -414,7 +423,7 @@
- # 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -423,9 +432,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -435,9 +444,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -452,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -784,9 +793,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/timeadjust/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- kipi-plugins/wallpaper/Makefile.in
+++ kipi-plugins/wallpaper/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,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 @@
+@@ -143,6 +143,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -75520,7 +46195,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +232,9 @@
+@@ -231,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75530,7 +46205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +273,7 @@
+@@ -269,6 +273,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -75538,7 +46213,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +281,9 @@
+@@ -276,12 +281,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -75551,16 +46226,7 @@
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 @@
+@@ -312,14 +314,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -75579,14 +46245,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +362,17 @@
+@@ -356,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -75597,457 +46263,66 @@
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
+@@ -396,7 +405,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -405,9 +414,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -434,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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
-@@ -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; \
+@@ -757,9 +766,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/wallpaper/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -116,6 +116,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -76055,7 +46330,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +205,9 @@
+@@ -204,6 +205,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76065,7 +46340,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +246,7 @@
+@@ -242,6 +246,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76073,7 +46348,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +254,9 @@
+@@ -249,12 +254,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -76086,16 +46361,7 @@
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 @@
+@@ -285,14 +287,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -76114,14 +46380,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +335,17 @@
+@@ -329,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -76132,395 +46398,66 @@
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
+@@ -362,7 +371,7 @@
all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -371,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
--#>+ 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -383,9 +392,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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -400,9 +409,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
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; \
+@@ -704,9 +713,9 @@
+ exit 1;; \
+ esac; \
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) --gnu po/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/Makefile
+ $(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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -76528,7 +46465,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76538,7 +46475,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76546,7 +46483,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -76559,16 +46496,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -76587,14 +46515,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -76605,400 +46533,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ar/Makefile'; \
+#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ar/Makefile'; \
+ 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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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) --gnu po/ar/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ar/Makefile
+ $(AUTOMAKE) --foreign po/ar/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ar/Makefile.in
--- po/br/Makefile.in
+++ po/br/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -77006,7 +46600,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77016,7 +46610,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77024,7 +46618,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -77037,16 +46631,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -77065,14 +46650,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -77083,400 +46668,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/br/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/br/Makefile
+ $(AUTOMAKE) --foreign po/br/Makefile
cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in
--- po/ca/Makefile.in
+++ po/ca/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -77484,7 +46735,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77494,7 +46745,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77502,7 +46753,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -77515,16 +46766,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -77543,14 +46785,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -77561,400 +46803,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -815,9 +824,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/ca/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ca/Makefile
+ $(AUTOMAKE) --foreign po/ca/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in
--- po/cs/Makefile.in
+++ po/cs/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -77962,7 +46870,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77972,7 +46880,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77980,7 +46888,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -77993,16 +46901,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -78021,14 +46920,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -78039,400 +46938,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -827,9 +836,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/cs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/cs/Makefile
+ $(AUTOMAKE) --foreign po/cs/Makefile
cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in
--- po/cy/Makefile.in
+++ po/cy/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -78440,7 +47005,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78450,7 +47015,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78458,7 +47023,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -78471,16 +47036,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -78499,14 +47055,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -78517,400 +47073,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -819,9 +828,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/cy/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/cy/Makefile
+ $(AUTOMAKE) --foreign po/cy/Makefile
cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in
--- po/da/Makefile.in
+++ po/da/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -78918,7 +47140,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78928,7 +47150,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78936,7 +47158,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -78949,16 +47171,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -78977,14 +47190,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -78995,400 +47208,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/da/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/da/Makefile
+ $(AUTOMAKE) --foreign po/da/Makefile
cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in
--- po/de/Makefile.in
+++ po/de/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -79396,7 +47275,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79406,7 +47285,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79414,7 +47293,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -79427,16 +47306,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -79455,14 +47325,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -79473,400 +47343,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/de/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/de/Makefile
+ $(AUTOMAKE) --foreign po/de/Makefile
cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in
--- po/el/Makefile.in
+++ po/el/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -79874,7 +47410,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79884,7 +47420,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79892,7 +47428,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -79905,16 +47441,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -79933,14 +47460,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -79951,400 +47478,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/el/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/el/Makefile
+ $(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
-@@ -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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -80352,7 +47545,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80362,7 +47555,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80370,7 +47563,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -80383,16 +47576,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -80411,14 +47595,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -80429,400 +47613,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -815,9 +824,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/en_GB/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- po/es/Makefile.in
+++ po/es/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -80830,7 +47680,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80840,7 +47690,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80848,7 +47698,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -80861,16 +47711,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -80889,14 +47730,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -80907,400 +47748,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/es/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/es/Makefile
+ $(AUTOMAKE) --foreign po/es/Makefile
cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in
--- po/et/Makefile.in
+++ po/et/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -81308,7 +47815,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81318,7 +47825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81326,7 +47833,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -81339,16 +47846,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -81367,14 +47865,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -81385,400 +47883,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/et/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/et/Makefile
+ $(AUTOMAKE) --foreign po/et/Makefile
cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in
--- po/fi/Makefile.in
+++ po/fi/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -81786,7 +47950,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81796,7 +47960,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81804,7 +47968,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -81817,16 +47981,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -81845,14 +48000,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -81863,400 +48018,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -775,9 +784,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/fi/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/fi/Makefile
+ $(AUTOMAKE) --foreign po/fi/Makefile
cd $(top_srcdir) && perl admin/am_edit po/fi/Makefile.in
--- po/fr/Makefile.in
+++ po/fr/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -82264,7 +48085,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82274,7 +48095,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82282,7 +48103,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -82295,16 +48116,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -82323,14 +48135,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -82341,400 +48153,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -823,9 +832,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/fr/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/fr/Makefile
+ $(AUTOMAKE) --foreign po/fr/Makefile
cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in
--- po/ga/Makefile.in
+++ po/ga/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -82742,7 +48220,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82752,7 +48230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82760,7 +48238,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -82773,16 +48251,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -82801,14 +48270,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -82819,400 +48288,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/ga/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ga/Makefile
+ $(AUTOMAKE) --foreign po/ga/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in
--- po/gl/Makefile.in
+++ po/gl/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -83220,7 +48355,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83230,7 +48365,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83238,7 +48373,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -83251,16 +48386,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -83279,14 +48405,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -83297,400 +48423,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -827,9 +836,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/gl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/gl/Makefile
+ $(AUTOMAKE) --foreign po/gl/Makefile
cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in
--- po/hu/Makefile.in
+++ po/hu/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -83698,7 +48490,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83708,7 +48500,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83716,7 +48508,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -83729,16 +48521,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -83757,14 +48540,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -83775,400 +48558,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -799,9 +808,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/hu/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/hu/Makefile
+ $(AUTOMAKE) --foreign po/hu/Makefile
cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in
--- po/is/Makefile.in
+++ po/is/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -84176,7 +48625,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84186,7 +48635,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84194,7 +48643,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -84207,16 +48656,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -84235,14 +48675,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -84253,400 +48693,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -815,9 +824,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/is/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/is/Makefile
+ $(AUTOMAKE) --foreign po/is/Makefile
cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in
--- po/it/Makefile.in
+++ po/it/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -84654,7 +48760,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84664,7 +48770,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84672,7 +48778,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -84685,16 +48791,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -84713,14 +48810,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -84731,400 +48828,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/it/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/it/Makefile
+ $(AUTOMAKE) --foreign po/it/Makefile
cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in
--- po/ja/Makefile.in
+++ po/ja/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -85132,7 +48895,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85142,7 +48905,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85150,7 +48913,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -85163,16 +48926,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -85191,14 +48945,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -85209,400 +48963,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/ja/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ja/Makefile
+ $(AUTOMAKE) --foreign po/ja/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in
--- po/lt/Makefile.in
+++ po/lt/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -85610,7 +49030,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85620,7 +49040,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85628,7 +49048,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -85641,16 +49061,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -85669,14 +49080,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -85687,400 +49098,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- 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
--#>+ 3
+#>- $(AUTOMAKE) --foreign 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -819,9 +828,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/lt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/lt/Makefile
+ $(AUTOMAKE) --foreign po/lt/Makefile
cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in
--- po/mt/Makefile.in
+++ po/mt/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -86088,7 +49165,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86098,7 +49175,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86106,7 +49183,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -86119,16 +49196,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -86147,14 +49215,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -86165,400 +49233,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/mt/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/mt/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -815,9 +824,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/mt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/mt/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/mt/Makefile
+ $(AUTOMAKE) --foreign po/mt/Makefile
cd $(top_srcdir) && perl admin/am_edit po/mt/Makefile.in
--- po/nb/Makefile.in
+++ po/nb/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -86566,7 +49300,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86576,7 +49310,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86584,7 +49318,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -86597,16 +49331,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -86625,14 +49350,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -86643,400 +49368,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -803,9 +812,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/nb/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/nb/Makefile
+ $(AUTOMAKE) --foreign po/nb/Makefile
cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in
--- po/nl/Makefile.in
+++ po/nl/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -87044,7 +49435,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87054,7 +49445,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -87062,7 +49453,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -87075,16 +49466,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -87103,14 +49485,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -87121,400 +49503,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/nl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/nl/Makefile
+ $(AUTOMAKE) --foreign po/nl/Makefile
cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in
--- po/nn/Makefile.in
+++ po/nn/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -87522,7 +49570,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87532,7 +49580,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -87540,7 +49588,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -87553,16 +49601,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -87581,14 +49620,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -87599,400 +49638,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -763,9 +772,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/nn/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/nn/Makefile
+ $(AUTOMAKE) --foreign po/nn/Makefile
cd $(top_srcdir) && perl admin/am_edit po/nn/Makefile.in
--- po/pa/Makefile.in
+++ po/pa/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -88000,7 +49705,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88010,7 +49715,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -88018,7 +49723,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -88031,16 +49736,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -88059,14 +49755,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -88077,400 +49773,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -815,9 +824,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/pa/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/pa/Makefile
+ $(AUTOMAKE) --foreign po/pa/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pa/Makefile.in
--- po/pl/Makefile.in
+++ po/pl/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -88478,7 +49840,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88488,7 +49850,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -88496,7 +49858,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -88509,16 +49871,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -88537,14 +49890,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -88555,400 +49908,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/pl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/pl/Makefile
+ $(AUTOMAKE) --foreign po/pl/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in
--- po/pt/Makefile.in
+++ po/pt/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -88956,7 +49975,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88966,7 +49985,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -88974,7 +49993,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -88987,16 +50006,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -89015,14 +50025,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -89033,400 +50043,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/pt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/pt/Makefile
+ $(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
-@@ -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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -89434,7 +50110,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89444,7 +50120,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -89452,7 +50128,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -89465,16 +50141,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -89493,14 +50160,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -89511,400 +50178,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -815,9 +824,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/pt_BR/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- 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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -89912,7 +50245,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89922,7 +50255,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -89930,7 +50263,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -89943,16 +50276,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -89971,14 +50295,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -89989,400 +50313,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ru/Makefile'; \
+#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ru/Makefile'; \
+ 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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -795,9 +804,9 @@
+ exit 1;; \
+ esac; \
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) --gnu po/ru/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ru/Makefile
+ $(AUTOMAKE) --foreign po/ru/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ru/Makefile.in
--- po/rw/Makefile.in
+++ po/rw/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -90390,7 +50380,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90400,7 +50390,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -90408,7 +50398,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -90421,16 +50411,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -90449,14 +50430,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -90467,400 +50448,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -819,9 +828,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/rw/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/rw/Makefile
+ $(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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -90868,7 +50515,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90878,7 +50525,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -90886,7 +50533,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -90899,16 +50546,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -90927,14 +50565,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -90945,400 +50583,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sk/Makefile'; \
+#>- 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; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sk/Makefile'; \
+ 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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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) --gnu po/sk/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sk/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/sk/Makefile
+ $(AUTOMAKE) --foreign po/sk/Makefile
cd $(top_srcdir) && perl admin/am_edit po/sk/Makefile.in
--- po/sr/Makefile.in
+++ po/sr/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -91346,7 +50650,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91356,7 +50660,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -91364,7 +50668,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -91377,16 +50681,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -91405,14 +50700,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -91423,400 +50718,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -823,9 +832,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/sr/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/sr/Makefile
+ $(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
-@@ -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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -91824,7 +50785,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91834,7 +50795,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -91842,7 +50803,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -91855,16 +50816,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -91883,14 +50835,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -91901,400 +50853,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr at Latn/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr at Latn/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -823,9 +832,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/sr at Latn/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr at Latn/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
--- po/sv/Makefile.in
+++ po/sv/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -92302,7 +50920,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92312,7 +50930,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -92320,7 +50938,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -92333,16 +50951,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -92361,14 +50970,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -92379,400 +50988,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/sv/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/sv/Makefile
+ $(AUTOMAKE) --foreign po/sv/Makefile
cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in
--- po/ta/Makefile.in
+++ po/ta/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -92780,7 +51055,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92790,7 +51065,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -92798,7 +51073,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -92811,16 +51086,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -92839,14 +51105,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -92857,400 +51123,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -815,9 +824,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/ta/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ta/Makefile
+ $(AUTOMAKE) --foreign po/ta/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in
--- po/tr/Makefile.in
+++ po/tr/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -93258,7 +51190,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93268,7 +51200,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -93276,7 +51208,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -93289,16 +51221,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -93317,14 +51240,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -93335,400 +51258,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -831,9 +840,9 @@
+ exit 1;; \
+ esac; \
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/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) --gnu po/tr/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/tr/Makefile
+ $(AUTOMAKE) --foreign po/tr/Makefile
cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in
--- po/uk/Makefile.in
+++ po/uk/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/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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -93736,7 +51325,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93746,7 +51335,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -93754,7 +51343,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -93767,16 +51356,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -93795,14 +51375,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -93813,400 +51393,66 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -779,9 +788,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/uk/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/uk/Makefile
+ $(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
-@@ -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 @@
+@@ -118,6 +118,7 @@
GPHOTO_CFLAGS = @GPHOTO_CFLAGS@
GPHOTO_CONFIG = @GPHOTO_CONFIG@
GPHOTO_PORT_CONFIG = @GPHOTO_PORT_CONFIG@
@@ -94214,7 +51460,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IMLIB2_CFLAGS = @IMLIB2_CFLAGS@
INSTALL_DATA = @INSTALL_DATA@
-@@ -175,6 +207,9 @@
+@@ -206,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94224,7 +51470,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,6 +248,7 @@
+@@ -244,6 +248,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -94232,7 +51478,7 @@
XMLLINT = @XMLLINT@
XSLT_CONFIG = @XSLT_CONFIG@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -220,12 +256,9 @@
+@@ -251,12 +256,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -94245,16 +51491,7 @@
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 @@
+@@ -287,14 +289,18 @@
compile_SLIDESHOW_FALSE = @compile_SLIDESHOW_FALSE@
compile_SLIDESHOW_TRUE = @compile_SLIDESHOW_TRUE@
datadir = @datadir@
@@ -94273,14 +51510,14 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_x11_FALSE = @include_x11_FALSE@
-@@ -298,13 +337,17 @@
+@@ -331,14 +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@
+ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
@@ -94291,324 +51528,59 @@
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
+@@ -369,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -378,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \
+#>- 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 \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -390,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \
+ 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
--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
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -407,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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 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
+ 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; \
+@@ -787,9 +796,9 @@
+ exit 1;; \
+ esac; \
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_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) --gnu po/zh_CN/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \
-+ cd $(top_srcdir) && \
+ 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
Modified: kde-extras/kipi-plugins/branches/experimental/debian/patches/98_configure.diff
===================================================================
--- kde-extras/kipi-plugins/branches/experimental/debian/patches/98_configure.diff 2007-01-25 22:40:56 UTC (rev 5435)
+++ kde-extras/kipi-plugins/branches/experimental/debian/patches/98_configure.diff 2007-01-25 22:41:48 UTC (rev 5436)
@@ -1,6 +1,6 @@
---- kipi-plugins-0.1.3-rc1/configure.save-me 2007-01-22 13:37:57.000000000 +0100
-+++ kipi-plugins-0.1.3-rc1/configure 2007-01-22 13:38:06.000000000 +0100
-@@ -39084,7 +39084,7 @@
+--- kipi-plugins-0.1.3/configure.save-me 2007-01-25 22:05:03.000000000 +0100
++++ kipi-plugins-0.1.3/configure 2007-01-25 22:05:11.000000000 +0100
+@@ -38740,7 +38740,7 @@
MOC!$MOC$ac_delim
UIC!$UIC$ac_delim
UIC_TR!$UIC_TR$ac_delim
@@ -9,7 +9,7 @@
LIB_QPE!$LIB_QPE$ac_delim
kde_qtver!$kde_qtver$ac_delim
KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
-@@ -39174,7 +39174,7 @@
+@@ -38830,7 +38830,7 @@
kde_styledir!$kde_styledir$ac_delim
kde_widgetdir!$kde_widgetdir$ac_delim
LIB_KDED!$LIB_KDED$ac_delim
More information about the pkg-kde-commits
mailing list