rev 5000 - people/chrsmrtn/packages/gwenview-i18n/debian/patches

Christopher Martin chrsmrtn at alioth.debian.org
Sun Nov 26 23:48:45 UTC 2006


Author: chrsmrtn
Date: 2006-11-27 00:48:30 +0100 (Mon, 27 Nov 2006)
New Revision: 5000

Modified:
   people/chrsmrtn/packages/gwenview-i18n/debian/patches/98_buildprep.diff
Log:
Updated buildprep.


Modified: people/chrsmrtn/packages/gwenview-i18n/debian/patches/98_buildprep.diff
===================================================================
--- people/chrsmrtn/packages/gwenview-i18n/debian/patches/98_buildprep.diff	2006-11-26 23:48:13 UTC (rev 4999)
+++ people/chrsmrtn/packages/gwenview-i18n/debian/patches/98_buildprep.diff	2006-11-26 23:48:30 UTC (rev 5000)
@@ -17145,15 +17145,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17163,27 +17155,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -17192,32 +17164,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -17225,20 +17172,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -17318,7 +17252,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -17333,7 +17267,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -17342,7 +17276,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -17357,7 +17291,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -17366,7 +17300,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -17381,7 +17315,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -17406,7 +17340,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -17422,7 +17356,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -17435,7 +17369,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -17444,7 +17378,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -17467,7 +17401,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -17475,7 +17409,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -17484,7 +17418,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -17493,7 +17427,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -17626,15 +17560,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17644,27 +17570,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -17673,32 +17579,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -17706,20 +17587,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -17799,7 +17667,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -17814,7 +17682,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -17823,7 +17691,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -17838,7 +17706,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -17847,7 +17715,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -17862,7 +17730,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -17887,7 +17755,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -17903,7 +17771,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -17918,7 +17786,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -17927,7 +17795,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -17950,7 +17818,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -17958,7 +17826,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -17967,7 +17835,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -17976,7 +17844,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -18018,7 +17886,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -18110,15 +17978,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18128,27 +17988,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -18157,32 +17997,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -18190,20 +18005,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -18283,7 +18085,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -18298,7 +18100,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -18307,7 +18109,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -18322,7 +18124,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -18331,7 +18133,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -18346,7 +18148,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -18371,7 +18173,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -18387,7 +18189,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -18400,7 +18202,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -18409,7 +18211,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -18432,7 +18234,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -18440,7 +18242,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -18449,7 +18251,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -18458,7 +18260,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -18591,15 +18393,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18609,27 +18403,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -18638,32 +18412,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -18671,20 +18420,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -18764,7 +18500,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -18779,7 +18515,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -18788,7 +18524,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -18803,7 +18539,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -18812,7 +18548,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -18827,7 +18563,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -18852,7 +18588,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -18868,7 +18604,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -18883,7 +18619,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -18892,7 +18628,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -18915,7 +18651,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -18923,7 +18659,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -18932,7 +18668,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -18941,7 +18677,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -18983,7 +18719,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -19075,15 +18811,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19093,27 +18821,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -19122,32 +18830,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -19155,20 +18838,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -19248,7 +18918,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -19263,7 +18933,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19272,7 +18942,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -19287,7 +18957,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19296,7 +18966,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -19311,7 +18981,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -19336,7 +19006,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -19352,7 +19022,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -19365,7 +19035,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -19374,7 +19044,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -19397,7 +19067,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -19405,7 +19075,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -19414,7 +19084,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -19423,7 +19093,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -19556,15 +19226,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19574,27 +19236,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -19603,32 +19245,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -19636,20 +19253,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -19729,7 +19333,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -19744,7 +19348,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19753,7 +19357,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -19768,7 +19372,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19777,7 +19381,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -19792,7 +19396,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -19817,7 +19421,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -19833,7 +19437,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -19848,7 +19452,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -19857,7 +19461,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -19880,7 +19484,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -19888,7 +19492,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -19897,7 +19501,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -19906,7 +19510,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -19948,7 +19552,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -20040,15 +19644,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20058,27 +19654,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -20087,32 +19663,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -20120,20 +19671,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -20213,7 +19751,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -20228,7 +19766,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -20237,7 +19775,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -20252,7 +19790,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -20261,7 +19799,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -20276,7 +19814,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -20301,7 +19839,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -20317,7 +19855,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -20330,7 +19868,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -20339,7 +19877,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -20362,7 +19900,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -20370,7 +19908,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -20379,7 +19917,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -20388,7 +19926,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -20521,15 +20059,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20539,27 +20069,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -20568,32 +20078,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -20601,20 +20086,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -20694,7 +20166,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -20709,7 +20181,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -20718,7 +20190,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -20733,7 +20205,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -20742,7 +20214,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -20757,7 +20229,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -20782,7 +20254,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -20798,7 +20270,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -20813,7 +20285,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -20822,7 +20294,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -20845,7 +20317,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -20853,7 +20325,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -20862,7 +20334,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -20871,7 +20343,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -20913,7 +20385,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -21005,15 +20477,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21023,27 +20487,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -21052,32 +20496,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -21085,20 +20504,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -21178,7 +20584,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -21193,7 +20599,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21202,7 +20608,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -21217,7 +20623,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21226,7 +20632,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -21241,7 +20647,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -21266,7 +20672,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -21282,7 +20688,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -21295,7 +20701,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -21304,7 +20710,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -21327,7 +20733,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -21335,7 +20741,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -21344,7 +20750,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -21353,7 +20759,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -21486,15 +20892,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21504,27 +20902,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -21533,32 +20911,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -21566,20 +20919,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -21659,7 +20999,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -21674,7 +21014,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21683,7 +21023,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -21698,7 +21038,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21707,7 +21047,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -21722,7 +21062,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -21747,7 +21087,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -21763,7 +21103,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -21778,7 +21118,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -21787,7 +21127,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -21810,7 +21150,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -21818,7 +21158,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -21827,7 +21167,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -21836,7 +21176,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -21878,7 +21218,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -21901,682 +21241,142 @@
  	cd $(top_srcdir) && perl admin/am_edit ca/messages/Makefile.in
  
  
---- config.h.in
-+++ config.h.in
-@@ -108,22 +108,22 @@
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- 
--/* The size of a `char *', as computed by sizeof. */
-+/* The size of `char *', as computed by sizeof. */
- #undef SIZEOF_CHAR_P
- 
--/* The size of a `int', as computed by sizeof. */
-+/* The size of `int', as computed by sizeof. */
- #undef SIZEOF_INT
- 
--/* The size of a `long', as computed by sizeof. */
-+/* The size of `long', as computed by sizeof. */
- #undef SIZEOF_LONG
- 
--/* The size of a `short', as computed by sizeof. */
-+/* The size of `short', as computed by sizeof. */
- #undef SIZEOF_SHORT
- 
--/* The size of a `size_t', as computed by sizeof. */
-+/* The size of `size_t', as computed by sizeof. */
- #undef SIZEOF_SIZE_T
- 
--/* The size of a `unsigned long', as computed by sizeof. */
-+/* The size of `unsigned long', as computed by sizeof. */
- #undef SIZEOF_UNSIGNED_LONG
- 
- /* Define to 1 if you have the ANSI C header files. */
 --- configure
 +++ configure
-@@ -1,8 +1,9 @@
+@@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60a.
+-# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.61.
  #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -10,7 +10,8 @@
+ ## M4sh Initialization.  ##
  ## --------------------- ##
-@@ -16,11 +17,35 @@
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
  
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -19,10 +20,13 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
 +
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
-@@ -29,8 +54,43 @@
  fi
- 
- 
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
 +
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
 +
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -44,18 +104,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
  
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
  
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
+ # PATH needs CR
+@@ -215,7 +219,7 @@
  else
-   as_basename=false
-@@ -63,157 +124,386 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
-+# CDPATH.
-+$as_unset CDPATH
- 
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
-+if test "x$CONFIG_SHELL" = x; then
-+  if (eval ":") 2>/dev/null; then
-+  as_have_required=yes
-+else
-+  as_have_required=no
- fi
- 
-+  if test $as_have_required = yes && 	 (eval ":
-+(as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
- 
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
- 
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=\$LINENO
-+  as_lineno_2=\$LINENO
-+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+  :
-+else
-+  as_candidate_shells=
+   as_candidate_shells=
      as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
-+  case $as_dir in
- 	 /*)
--	   if ("$as_dir/$as_base" -c '
-+	   for as_base in sh bash ksh sh5; do
-+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	   done;;
-+       esac
-+done
-+IFS=$as_save_IFS
+@@ -233,7 +237,6 @@
+ 	 # Try only shells that exist, to save several forks.
+ 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -242,10 +245,12 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
 +
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
 +
-+      for as_shell in $as_candidate_shells $SHELL; do
-+	 # Try only shells that exist, to save several forks.
-+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ :
+ _ASEOF
+@@ -253,7 +258,6 @@
+   CONFIG_SHELL=$as_shell
+ 	       as_have_required=yes
+ 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -262,10 +266,12 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
 +
-+:
-+_ASEOF
-+}; then
-+  CONFIG_SHELL=$as_shell
-+	       as_have_required=yes
-+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
 +
-+:
-+(as_func_return () {
-+  (exit $1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+  break
-+fi
-+
-+fi
-+
-+      done
-+
-+      if test "x$CONFIG_SHELL" != x; then
-+  for as_var in BASH_ENV ENV
-+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+        done
-+        export CONFIG_SHELL
-+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+    if test $as_have_required = no; then
-+  echo This script requires a shell more modern than all the
-+      echo shells that I found on your system.  Please install a
-+      echo modern shell, or manually run the script under such a
-+      echo shell if you do have one.
-+      { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+  echo No shell found that supports shell functions.
-+  echo Please tell autoconf at gnu.org about your system,
-+  echo including any error possibly output before this
-+  echo message
-+}
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
  
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-     sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-       N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
-+      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
-+  chmod +x "$as_me.lineno" ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
- esac
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
+ :
+ (as_func_return () {
+@@ -512,19 +518,28 @@
+   as_mkdir_p=false
  fi
  
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
+-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
  else
-   as_ln_s='cp -p'
+-  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
  fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
+-rm -f conf$$.file
++as_executable_p=$as_test_x
  
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
-@@ -222,7 +512,19 @@
-   as_mkdir_p=false
- fi
- 
--as_executable_p="test -f"
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
- 
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,15 +533,6 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+@@ -571,15 +586,15 @@
  
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- 
- 
- # Check that we are running under the correct shell.
-@@ -278,15 +571,15 @@
- 
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
 -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
@@ -22594,41 +21394,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -395,29 +688,26 @@
- 
- tagnames=${tagnames+${tagnames},}F77
- 
-+exec 7<&0 </dev/null 6>&1
-+
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete.  It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME=
- PACKAGE_TARNAME=
-@@ -430,42 +720,409 @@
+@@ -720,36 +735,36 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -22665,813 +21431,96 @@
 -#if HAVE_INTTYPES_H
 +#ifdef HAVE_INTTYPES_H
  # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--#  include <stdint.h>
--# endif
  #endif
--#if HAVE_UNISTD_H
+-#if HAVE_STDINT_H
 +#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
+ # include <stdint.h>
+ #endif
+-#if HAVE_UNISTD_H
 +#ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO 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 LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN TOPSUBDIRS ar_SUBDIR_included_TRUE ar_SUBDIR_included_FALSE az_SUBDIR_included_TRUE az_SUBDIR_included_FALSE bg_SUBDIR_included_TRUE bg_SUBDIR_included_FALSE br_SUBDIR_included_TRUE br_SUBDIR_included_FALSE ca_SUBDIR_included_TRUE ca_SUBDIR_included_FALSE cs_SUBDIR_included_TRUE cs_SUBDIR_included_FALSE cy_SUBDIR_included_TRUE cy_SUBDIR_included_FALSE da_SUBDIR_included_TRUE da_SUBDIR_included_FALSE de_SUBDIR_included_TRUE de_SUBDIR_included_FALSE el_SUBDIR_included_TRUE el_SUBDIR_included_FALSE en_GB_SUBDIR_included_TRUE en_GB_SUBDIR_included_FALSE es_SUBDIR_included_TRUE es_SUBDIR_included_FALSE et_SUBDIR_included_TRUE et_SUBDIR_included_FALSE fi_SUBDIR_included_TRUE fi_SUBDIR_included_FALSE fo_SUBDIR_included_TRUE fo_SUBDIR_included_FALSE fr_SUBDIR_included_TRUE fr_SUBDIR_included_FALSE ga_SUBDIR_included_TRUE ga_SUBDIR_included_FALSE gl_SUBDIR_included_TRUE gl_SUBDIR_included_FALSE he_SUBDIR_included_TRUE he_SUBDIR_included_FALSE hi_SUBDIR_included_TRUE hi_SUBDIR_included_FALSE hu_SUBDIR_included_TRUE hu_SUBDIR_included_FALSE is_SUBDIR_included_TRUE is_SUBDIR_included_FALSE it_SUBDIR_included_TRUE it_SUBDIR_included_FALSE ja_SUBDIR_included_TRUE ja_SUBDIR_included_FALSE ka_SUBDIR_included_TRUE ka_SUBDIR_included_FALSE ko_SUBDIR_included_TRUE ko_SUBDIR_included_FALSE lt_SUBDIR_included_TRUE lt_SUBDIR_included_FALSE nb_SUBDIR_included_TRUE nb_SUBDIR_included_FALSE nl_SUBDIR_included_TRUE nl_SUBDIR_included_FALSE nso_SUBDIR_included_TRUE nso_SUBDIR_included_FALSE pa_SUBDIR_included_TRUE pa_SUBDIR_included_FALSE pl_SUBDIR_included_TRUE pl_SUBDIR_included_FALSE pt_SUBDIR_included_TRUE pt_SUBDIR_included_FALSE pt_BR_SUBDIR_included_TRUE pt_BR_SUBDIR_included_FALSE ro_SUBDIR_included_TRUE ro_SUBDIR_included_FALSE ru_SUBDIR_included_TRUE ru_SUBDIR_included_FALSE rw_SUBDIR_included_TRUE rw_SUBDIR_included_FALSE sk_SUBDIR_included_TRUE sk_SUBDIR_included_FALSE sr_SUBDIR_included_TRUE sr_SUBDIR_included_FALSE sr_Latn_SUBDIR_included_TRUE sr_Latn_SUBDIR_included_FALSE sv_SUBDIR_included_TRUE sv_SUBDIR_included_FALSE ta_SUBDIR_included_TRUE ta_SUBDIR_included_FALSE tr_SUBDIR_included_TRUE tr_SUBDIR_included_FALSE uk_SUBDIR_included_TRUE uk_SUBDIR_included_FALSE ven_SUBDIR_included_TRUE ven_SUBDIR_included_FALSE xh_SUBDIR_included_TRUE xh_SUBDIR_included_FALSE zh_CN_SUBDIR_included_TRUE zh_CN_SUBDIR_included_FALSE zh_TW_SUBDIR_included_TRUE zh_TW_SUBDIR_included_FALSE zu_SUBDIR_included_TRUE zu_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+target
-+target_cpu
-+target_vendor
-+target_os
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+STRIP
-+INSTALL_STRIP_PROGRAM
+@@ -813,13 +828,19 @@
+ AUTOMAKE
+ AUTOHEADER
+ MAKEINFO
+-AMTAR
+ install_sh
+ STRIP
+ INSTALL_STRIP_PROGRAM
 +mkdir_p
-+AWK
-+SET_MAKE
-+am__leading_dot
+ AWK
+ SET_MAKE
+ am__leading_dot
 +AMTAR
 +am__tar
 +am__untar
 +MAINTAINER_MODE_TRUE
 +MAINTAINER_MODE_FALSE
 +MAINT
-+KDECONFIG
-+kde_libs_prefix
-+kde_libs_htmldir
-+CONF_FILES
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+DEPDIR
-+am__include
-+am__quote
-+AMDEP_TRUE
-+AMDEP_FALSE
-+AMDEPBACKSLASH
-+CCDEPMODE
-+am__fastdepCC_TRUE
-+am__fastdepCC_FALSE
-+CPP
-+CXX
-+CXXFLAGS
-+ac_ct_CXX
-+CXXDEPMODE
-+am__fastdepCXX_TRUE
-+am__fastdepCXX_FALSE
-+WOVERLOADED_VIRTUAL
-+HAVE_GCC_VISIBILITY
-+unsermake_enable_pch_TRUE
-+unsermake_enable_pch_FALSE
-+USE_EXCEPTIONS
-+USE_RTTI
-+CXXCPP
-+NOOPT_CXXFLAGS
-+NOOPT_CFLAGS
-+ENABLE_PERMISSIVE_FLAG
-+LDFLAGS_AS_NEEDED
-+LDFLAGS_NEW_DTAGS
-+KDE_USE_FINAL_TRUE
-+KDE_USE_FINAL_FALSE
-+KDE_USE_CLOSURE_TRUE
-+KDE_USE_CLOSURE_FALSE
-+KDE_NO_UNDEFINED
-+KDE_USE_NMCHECK_TRUE
-+KDE_USE_NMCHECK_FALSE
-+GREP
-+EGREP
-+LN_S
-+ECHO
-+AR
-+RANLIB
-+F77
-+FFLAGS
-+ac_ct_F77
-+LIBTOOL
-+KDE_PLUGIN
-+KDE_CHECK_PLUGIN
-+MSGFMT
-+GMSGFMT
-+XGETTEXT
-+LIBUTIL
-+LIBCOMPAT
-+LIBCRYPT
-+LIBRESOLV
-+LIB_POLL
-+FRAMEWORK_COREAUDIO
-+LIBSOCKET
-+X_EXTRA_LIBS
-+LIBUCB
-+LIBDL
-+KDE_USE_FPIE
-+KDE_USE_PIE
-+include_x11_TRUE
-+include_x11_FALSE
-+XMKMF
-+X_PRE_LIBS
-+LIB_X11
-+LIB_XRENDER
-+LIBSM
-+X_INCLUDES
-+X_LDFLAGS
-+x_includes
-+x_libraries
-+QTE_NORTTI
-+LIB_XEXT
-+LIBPTHREAD
-+USE_THREADS
-+KDE_MT_LDFLAGS
-+KDE_MT_LIBS
-+USER_INCLUDES
-+USER_LDFLAGS
-+LIBZ
-+LIBPNG
-+LIBJPEG
-+qt_libraries
-+qt_includes
-+QT_INCLUDES
-+QT_LDFLAGS
-+PERL
-+MOC
-+UIC
-+UIC_TR
-+LIB_QT
-+LIB_QPE
-+kde_qtver
-+KDE_EXTRA_RPATH
-+KDE_RPATH
-+X_RPATH
-+kde_libraries
-+kde_includes
-+KDE_LDFLAGS
-+KDE_INCLUDES
-+all_includes
-+all_libraries
-+AUTODIRS
-+include_ARTS_TRUE
-+include_ARTS_FALSE
-+MAKEKDEWIDGETS
-+KCONFIG_COMPILER
-+KCFG_DEPENDENCIES
-+DCOPIDLNG
-+DCOPIDL
-+DCOPIDL2CPP
-+DCOP_DEPENDENCIES
-+MCOPIDL
-+ARTSCCONFIG
-+MEINPROC
-+KDE_XSL_STYLESHEET
-+XMLLINT
-+kde_htmldir
-+kde_appsdir
-+kde_icondir
-+kde_sounddir
-+kde_datadir
-+kde_locale
-+kde_confdir
-+kde_kcfgdir
-+kde_mimedir
-+kde_wallpaperdir
-+kde_bindir
-+xdg_appsdir
-+xdg_menudir
-+xdg_directorydir
-+kde_templatesdir
-+kde_servicesdir
-+kde_servicetypesdir
-+kde_moduledir
-+kdeinitdir
-+kde_styledir
-+kde_widgetdir
-+LIB_KDED
-+LIB_KDECORE
-+LIB_KDEUI
-+LIB_KIO
-+LIB_KJS
-+LIB_SMB
-+LIB_KAB
-+LIB_KABC
-+LIB_KHTML
-+LIB_KSPELL
-+LIB_KPARTS
-+LIB_KDEPRINT
-+LIB_KUTILS
-+LIB_KDEPIM
-+LIB_KIMPROXY
-+LIB_KNEWSTUFF
-+LIB_KDNSSD
-+LIB_KUNITTEST
-+LIB_KSYCOCA
-+LIB_KFILE
-+LIB_KFM
-+LIB_ARTS
-+QTDOCDIR
-+KDE_HAVE_DOT
-+DOXYGEN
-+DOXYGEN_PROJECT_NAME
-+DOXYGEN_PROJECT_NUMBER
-+KDE_HAS_DOXYGEN
-+TOPSUBDIRS
-+ar_SUBDIR_included_TRUE
-+ar_SUBDIR_included_FALSE
-+az_SUBDIR_included_TRUE
-+az_SUBDIR_included_FALSE
-+bg_SUBDIR_included_TRUE
-+bg_SUBDIR_included_FALSE
-+br_SUBDIR_included_TRUE
-+br_SUBDIR_included_FALSE
-+ca_SUBDIR_included_TRUE
-+ca_SUBDIR_included_FALSE
-+cs_SUBDIR_included_TRUE
-+cs_SUBDIR_included_FALSE
-+cy_SUBDIR_included_TRUE
-+cy_SUBDIR_included_FALSE
-+da_SUBDIR_included_TRUE
-+da_SUBDIR_included_FALSE
-+de_SUBDIR_included_TRUE
-+de_SUBDIR_included_FALSE
-+el_SUBDIR_included_TRUE
-+el_SUBDIR_included_FALSE
-+en_GB_SUBDIR_included_TRUE
-+en_GB_SUBDIR_included_FALSE
-+es_SUBDIR_included_TRUE
-+es_SUBDIR_included_FALSE
-+et_SUBDIR_included_TRUE
-+et_SUBDIR_included_FALSE
-+fi_SUBDIR_included_TRUE
-+fi_SUBDIR_included_FALSE
-+fo_SUBDIR_included_TRUE
-+fo_SUBDIR_included_FALSE
-+fr_SUBDIR_included_TRUE
-+fr_SUBDIR_included_FALSE
-+ga_SUBDIR_included_TRUE
-+ga_SUBDIR_included_FALSE
-+gl_SUBDIR_included_TRUE
-+gl_SUBDIR_included_FALSE
-+he_SUBDIR_included_TRUE
-+he_SUBDIR_included_FALSE
-+hi_SUBDIR_included_TRUE
-+hi_SUBDIR_included_FALSE
-+hu_SUBDIR_included_TRUE
-+hu_SUBDIR_included_FALSE
-+is_SUBDIR_included_TRUE
-+is_SUBDIR_included_FALSE
-+it_SUBDIR_included_TRUE
-+it_SUBDIR_included_FALSE
-+ja_SUBDIR_included_TRUE
-+ja_SUBDIR_included_FALSE
-+ka_SUBDIR_included_TRUE
-+ka_SUBDIR_included_FALSE
-+ko_SUBDIR_included_TRUE
-+ko_SUBDIR_included_FALSE
-+lt_SUBDIR_included_TRUE
-+lt_SUBDIR_included_FALSE
-+nb_SUBDIR_included_TRUE
-+nb_SUBDIR_included_FALSE
-+nl_SUBDIR_included_TRUE
-+nl_SUBDIR_included_FALSE
-+nso_SUBDIR_included_TRUE
-+nso_SUBDIR_included_FALSE
-+pa_SUBDIR_included_TRUE
-+pa_SUBDIR_included_FALSE
-+pl_SUBDIR_included_TRUE
-+pl_SUBDIR_included_FALSE
-+pt_SUBDIR_included_TRUE
-+pt_SUBDIR_included_FALSE
-+pt_BR_SUBDIR_included_TRUE
-+pt_BR_SUBDIR_included_FALSE
-+ro_SUBDIR_included_TRUE
-+ro_SUBDIR_included_FALSE
-+ru_SUBDIR_included_TRUE
-+ru_SUBDIR_included_FALSE
-+rw_SUBDIR_included_TRUE
-+rw_SUBDIR_included_FALSE
-+sk_SUBDIR_included_TRUE
-+sk_SUBDIR_included_FALSE
-+sr_SUBDIR_included_TRUE
-+sr_SUBDIR_included_FALSE
-+sr_Latn_SUBDIR_included_TRUE
-+sr_Latn_SUBDIR_included_FALSE
-+sv_SUBDIR_included_TRUE
-+sv_SUBDIR_included_FALSE
-+ta_SUBDIR_included_TRUE
-+ta_SUBDIR_included_FALSE
-+tr_SUBDIR_included_TRUE
-+tr_SUBDIR_included_FALSE
-+uk_SUBDIR_included_TRUE
-+uk_SUBDIR_included_FALSE
-+ven_SUBDIR_included_TRUE
-+ven_SUBDIR_included_FALSE
-+xh_SUBDIR_included_TRUE
-+xh_SUBDIR_included_FALSE
-+zh_CN_SUBDIR_included_TRUE
-+zh_CN_SUBDIR_included_FALSE
-+zh_TW_SUBDIR_included_TRUE
-+zh_TW_SUBDIR_included_FALSE
-+zu_SUBDIR_included_TRUE
-+zu_SUBDIR_included_FALSE
-+LIBOBJS
-+LTLIBOBJS'
- ac_subst_files=''
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+CPP
-+CXX
-+CXXFLAGS
-+CCC
-+CXXCPP
-+F77
-+FFLAGS
-+XMKMF'
-+
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -492,34 +1149,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
- 
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
-   # If the previous option needs an argument, assign it.
-   if test -n "$ac_prev"; then
--    eval "$ac_prev=\$ac_option"
-+    eval $ac_prev=\$ac_option
-     ac_prev=
-     continue
-   fi
- 
--  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
- 
--  case $ac_option in
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
- 
-   -bindir | --bindir | --bindi | --bind | --bin | --bi)
-     ac_prev=bindir ;;
-@@ -541,12 +1212,18 @@
-   --config-cache | -C)
-     cache_file=config.cache ;;
- 
--  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+  -datadir | --datadir | --datadi | --datad)
-     ac_prev=datadir ;;
--  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
--  | --da=*)
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-     datadir=$ac_optarg ;;
- 
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
+ KDECONFIG
+ kde_libs_prefix
+ kde_libs_htmldir
+@@ -1109,6 +1130,7 @@
+ CC
+ CFLAGS
+ LDFLAGS
++LIBS
+ CPPFLAGS
+ CPP
+ CXX
+@@ -1223,10 +1245,10 @@
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
-@@ -554,7 +1231,17 @@
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    eval "enable_$ac_feature=no" ;;
-+    eval enable_$ac_feature=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=no ;;
  
+   -docdir | --docdir | --docdi | --doc | --do)
+@@ -1242,10 +1264,10 @@
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -563,11 +1250,7 @@
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
--    esac
--    eval "enable_$ac_feature='$ac_optarg'" ;;
-+    eval enable_$ac_feature=\$ac_optarg ;;
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=\$ac_optarg ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -594,6 +1277,12 @@
-   -host=* | --host=* | --hos=* | --ho=*)
-     host_alias=$ac_optarg ;;
- 
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-   -includedir | --includedir | --includedi | --included | --include \
-   | --includ | --inclu | --incl | --inc)
-     ac_prev=includedir ;;
-@@ -618,13 +1307,16 @@
-   | --libexe=* | --libex=* | --libe=*)
-     libexecdir=$ac_optarg ;;
- 
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-   -localstatedir | --localstatedir | --localstatedi | --localstated \
--  | --localstate | --localstat | --localsta | --localst \
--  | --locals | --local | --loca | --loc | --lo)
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-     ac_prev=localstatedir ;;
-   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
--  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
--  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-     localstatedir=$ac_optarg ;;
- 
-   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -689,6 +1381,16 @@
-   | --progr-tra=* | --program-tr=* | --program-t=*)
-     program_transform_name=$ac_optarg ;;
- 
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil)
-     silent=yes ;;
-@@ -745,11 +1447,7 @@
+@@ -1439,19 +1461,19 @@
+   -with-* | --with-*)
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
-     ac_package=`echo $ac_package| sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
--    esac
--    eval "with_$ac_package='$ac_optarg'" ;;
-+    eval with_$ac_package=\$ac_optarg ;;
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+     eval with_$ac_package=\$ac_optarg ;;
  
    -without-* | --without-*)
      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -758,7 +1456,7 @@
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
-     ac_package=`echo $ac_package | sed 's/-/_/g'`
--    eval "with_$ac_package=no" ;;
-+    eval with_$ac_package=no ;;
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+     eval with_$ac_package=no ;;
  
    --x)
-     # Obsolete; use --with-x.
-@@ -789,8 +1487,7 @@
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-    { (exit 1); exit 1; }; }
--    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
--    eval "$ac_envvar='$ac_optarg'"
-+    eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
- 
-   *)
-@@ -810,27 +1507,19 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
--  eval ac_val=$`echo $ac_var`
--  case $ac_val in
--    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
--  esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--	      localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
- do
--  eval ac_val=$`echo $ac_var`
-+  eval ac_val=\$$ac_var
-   case $ac_val in
--    [\\/$]* | ?:[\\/]* ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
-+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+   { (exit 1); exit 1; }; }
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -857,94 +1546,76 @@
- test "$silent" = yes && exec 6>/dev/null
- 
- 
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  { echo "$as_me: error: Working directory cannot be determined" >&2
-+   { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+   { (exit 1); exit 1; }; }
-+
-+
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
--  # Try the directory containing this script, then its parent.
--  ac_confdir=`(dirname "$0") 2>/dev/null ||
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$0" : 'X\(//\)[^/]' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-   srcdir=$ac_confdir
--  if test ! -r $srcdir/$ac_unique_file; then
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-     srcdir=..
-   fi
- else
-   ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
--  if test "$ac_srcdir_defaulted" = yes; then
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
--   { (exit 1); exit 1; }; }
--  else
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
--   { (exit 1); exit 1; }; }
--  fi
--fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
--  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
--   { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
--ac_env_CXX_set=${CXX+set}
--ac_env_CXX_value=$CXX
--ac_cv_env_CXX_set=${CXX+set}
--ac_cv_env_CXX_value=$CXX
--ac_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_env_CXXFLAGS_value=$CXXFLAGS
--ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_cv_env_CXXFLAGS_value=$CXXFLAGS
--ac_env_CXXCPP_set=${CXXCPP+set}
--ac_env_CXXCPP_value=$CXXCPP
--ac_cv_env_CXXCPP_set=${CXXCPP+set}
--ac_cv_env_CXXCPP_value=$CXXCPP
--ac_env_F77_set=${F77+set}
--ac_env_F77_value=$F77
--ac_cv_env_F77_set=${F77+set}
--ac_cv_env_F77_value=$F77
--ac_env_FFLAGS_set=${FFLAGS+set}
--ac_env_FFLAGS_value=$FFLAGS
--ac_cv_env_FFLAGS_set=${FFLAGS+set}
--ac_cv_env_FFLAGS_value=$FFLAGS
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+   { (exit 1); exit 1; }; }
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+   { (exit 1); exit 1; }; }
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
- 
- #
- # Report the --help message.
-@@ -973,9 +1644,6 @@
-   -n, --no-create         do not create output files
-       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
- 
--_ACEOF
--
--  cat <<_ACEOF
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
- 			  [$ac_default_prefix]
-@@ -993,15 +1661,22 @@
-   --bindir=DIR           user executables [EPREFIX/bin]
-   --sbindir=DIR          system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR       program executables [EPREFIX/libexec]
--  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-   --libdir=DIR           object code libraries [EPREFIX/lib]
-   --includedir=DIR       C header files [PREFIX/include]
-   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
--  --infodir=DIR          info documentation [PREFIX/info]
--  --mandir=DIR           man documentation [PREFIX/man]
-+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR          info documentation [DATAROOTDIR/info]
-+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR           man documentation [DATAROOTDIR/man]
-+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-+  --htmldir=DIR          html documentation [DOCDIR]
-+  --dvidir=DIR           dvi documentation [DOCDIR]
-+  --pdfdir=DIR           pdf documentation [DOCDIR]
-+  --psdir=DIR            ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -1025,6 +1700,8 @@
+@@ -1696,6 +1718,8 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -23480,7 +21529,7 @@
    --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
-@@ -1032,8 +1709,8 @@
+@@ -1703,8 +1727,8 @@
                            work!)
    --disable-warnings      disables compilation with -Wall and similar
    --enable-profile        creates profiling infos default=no
@@ -23491,791 +21540,59 @@
    --enable-pch            enables precompiled header support (currently only
                            KCC or gcc >=3.4+unsermake) default=no
    --enable-coverage       use gcc coverage testing
-@@ -1042,10 +1719,8 @@
-                           of memory)
-   --enable-closure        delay template instantiation
-   --enable-nmcheck        enable automatic namespace cleanness check
--  --enable-shared[=PKGS]
--                          build shared libraries [default=yes]
--  --enable-static[=PKGS]
--                          build static libraries [default=no]
-+  --enable-shared[=PKGS]  build shared libraries [default=yes]
-+  --enable-static[=PKGS]  build static libraries [default=no]
-   --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
-   --enable-fast-install[=PKGS]
-                           optimize for fast installation [default=yes]
-@@ -1065,8 +1740,7 @@
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-                           both]
--  --with-tags[=TAGS]
--                          include additional configurations [automatic]
-+  --with-tags[=TAGS]      include additional configurations [automatic]
-   --with-extra-includes=DIR
-                           adds non standard include paths
-   --with-extra-libs=DIR   adds non standard library paths
-@@ -1080,131 +1754,100 @@
+@@ -1748,6 +1772,7 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
--  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
--              headers in a nonstandard directory <include dir>
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
++  LIBS        libraries to pass to the linker, e.g. -l<library>
+   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
-   CXX         C++ compiler command
-   CXXFLAGS    C++ compiler flags
-   CXXCPP      C++ preprocessor
-   F77         Fortran 77 compiler command
-   FFLAGS      Fortran 77 compiler flags
-+  XMKMF       Path to xmkmf, Makefile generator for X Window System
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
- 
- _ACEOF
-+ac_status=$?
- fi
- 
- if test "$ac_init_help" = "recursive"; then
-   # If there are subdirs, report their specific --help.
--  ac_popdir=`pwd`
-   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
--    test -d $ac_dir || continue
-+    test -d "$ac_dir" || continue
-     ac_builddir=.
- 
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
-+  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-     ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--    cd $ac_dir
--    # Check for guested configure; otherwise get Cygnus style configure.
--    if test -f $ac_srcdir/configure.gnu; then
--      echo
--      $SHELL $ac_srcdir/configure.gnu  --help=recursive
--    elif test -f $ac_srcdir/configure; then
--      echo
--      $SHELL $ac_srcdir/configure  --help=recursive
--    elif test -f $ac_srcdir/configure.ac ||
--	   test -f $ac_srcdir/configure.in; then
--      echo
--      $ac_configure --help
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
--    fi
--    cd "$ac_popdir"
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-   done
- fi
- 
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
+@@ -1822,7 +1847,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.60a
+ configure
+-generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.61
  
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
--  exit 0
-+  exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -1836,7 +1861,7 @@
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
--generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.60a.  Invocation command line was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
  
    $ $0 $@
  
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1223,7 +1866,7 @@
- /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
- /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
- /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
- /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
- /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1237,6 +1880,7 @@
-   test -z "$as_dir" && as_dir=.
-   echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
+@@ -2354,7 +2379,7 @@
+ rm -f conftest.sed
  
- } >&5
  
-@@ -1258,7 +1902,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1269,7 +1912,7 @@
-     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-     | -silent | --silent | --silen | --sile | --sil)
-       continue ;;
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+    *\'*)
-       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
-@@ -1291,9 +1934,7 @@
- 	  -* ) ac_must_keep_next=true ;;
- 	esac
-       fi
--      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
--      # Get rid of the leading space.
--      ac_sep=" "
-+      ac_configure_args="$ac_configure_args '$ac_arg'"
-       ;;
-     esac
-   done
-@@ -1304,8 +1945,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log.  We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
- trap 'exit_status=$?
-   # Save into config.log some information that might help in debugging.
-   {
-@@ -1318,20 +1959,34 @@
- _ASBOX
-     echo
-     # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-   (set) 2>&1 |
--    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-       sed -n \
--	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
--      ;;
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-     *)
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--}
-+    esac |
-+    sort
-+)
-     echo
- 
-     cat <<\_ASBOX
-@@ -1342,22 +1997,28 @@
-     echo
-     for ac_var in $ac_subst_vars
-     do
--      eval ac_val=$`echo $ac_var`
--      echo "$ac_var='"'"'$ac_val'"'"'"
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      echo "$ac_var='\''$ac_val'\''"
-     done | sort
-     echo
- 
-     if test -n "$ac_subst_files"; then
-       cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
-       echo
-       for ac_var in $ac_subst_files
-       do
--	eval ac_val=$`echo $ac_var`
--	echo "$ac_var='"'"'$ac_val'"'"'"
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	echo "$ac_var='\''$ac_val'\''"
-       done | sort
-       echo
-     fi
-@@ -1369,26 +2030,24 @@
- ## ----------- ##
- _ASBOX
-       echo
--      sed "/^$/d" confdefs.h | sort
-+      cat confdefs.h
-       echo
-     fi
-     test "$ac_signal" != 0 &&
-       echo "$as_me: caught signal $ac_signal"
-     echo "$as_me: exit $exit_status"
-   } >&5
--  rm -f core *.core &&
--  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-     exit $exit_status
--     ' 0
-+' 0
- for ac_signal in 1 2 13 15; do
-   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
- ac_signal=0
- 
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
- 
- # Predefined preprocessor variables.
- 
-@@ -1419,14 +2078,17 @@
- 
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
--  if test "x$prefix" != xNONE; then
--    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--  else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--  fi
-+if test -n "$CONFIG_SITE"; then
-+  set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+  set x "$ac_default_prefix/share/config.site" \
-+	"$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
-   if test -r "$ac_site_file"; then
-     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1442,8 +2104,8 @@
-     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
--      [\\/]* | ?:[\\/]* ) . $cache_file;;
--      *)                      . ./$cache_file;;
-+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+      *)                      . "./$cache_file";;
-     esac
-   fi
- else
-@@ -1455,12 +2117,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
--	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+for ac_var in $ac_precious_vars; do
-   eval ac_old_set=\$ac_cv_env_${ac_var}_set
-   eval ac_new_set=\$ac_env_${ac_var}_set
--  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
--  eval ac_new_val="\$ac_env_${ac_var}_value"
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-   case $ac_old_set,$ac_new_set in
-     set,)
-       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1485,8 +2146,7 @@
-   # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-     *) ac_arg=$ac_var=$ac_new_val ;;
-     esac
-     case " $ac_configure_args " in
-@@ -1503,12 +2163,6 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
- 
- 
- 
-@@ -1525,110 +2179,165 @@
- 
- 
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- ac_aux_dir=
--for ac_dir in admin $srcdir/admin; do
--  if test -f $ac_dir/install-sh; then
-+for ac_dir in admin "$srcdir"/admin; do
-+  if test -f "$ac_dir/install-sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install-sh -c"
-     break
--  elif test -f $ac_dir/install.sh; then
-+  elif test -f "$ac_dir/install.sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install.sh -c"
-     break
--  elif test -f $ac_dir/shtool; then
-+  elif test -f "$ac_dir/shtool"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/shtool install -c"
-     break
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;}
-+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
- 
- 
- unset CDPATH
- 
- # Make sure we can run config.sub.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
--  ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
-+  ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
-   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
- build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
- 
- 
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
--  ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+  if test "x$host_alias" = x; then
-+  ac_cv_host=$ac_cv_build
-+else
-+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
-+fi
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
- host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- 
- 
--echo "$as_me:$LINENO: checking target system type" >&5
--echo $ECHO_N "checking target system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking target system type" >&5
-+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
- if test "${ac_cv_target+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_target_alias=$target_alias
--test "x$ac_cv_target_alias" = "x" &&
--  ac_cv_target_alias=$ac_cv_host_alias
--ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-+  if test "x$target_alias" = x; then
-+  ac_cv_target=$ac_cv_host
-+else
-+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
-+fi
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_target" >&5
--echo "${ECHO_T}$ac_cv_target" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-+echo "${ECHO_T}$ac_cv_target" >&6; }
-+case $ac_cv_target in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-+echo "$as_me: error: invalid value of canonical target" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
- target=$ac_cv_target
--target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_target
-+shift
-+target_cpu=$1
-+target_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+target_os=$*
-+IFS=$ac_save_IFS
-+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
- 
- 
- # The aliases save the names the user supplied, while $host etc.
-@@ -1638,20 +2347,20 @@
-     NONENONEs,x,x, &&
-   program_prefix=${target_alias}-
- test "$program_prefix" != NONE &&
--  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
--  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
- # Double any \ or $.  echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm conftest.sed
-+rm -f conftest.sed
- 
- 
 -am__api_version="1.7"
 +am__api_version="1.9"
  
  
            test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-@@ -1670,8 +2379,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1693,7 +2402,7 @@
+@@ -2396,7 +2421,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
--	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -1712,21 +2421,22 @@
-     ;;
- esac
- done
-+IFS=$as_save_IFS
- 
- 
+@@ -2513,7 +2538,6 @@
  fi
-   if test "${ac_cv_path_install+set}" = set; then
-     INSTALL=$ac_cv_path_install
-   else
--    # As a last resort, use the slow shell script.  We don't cache a
--    # path for INSTALL within a source directory, because that will
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL within a source directory, because that will
-     # break other packages using the cache if that directory is
--    # removed, or if the path is relative.
-+    # removed, or if the value is a relative name.
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -1740,8 +2450,8 @@
-   if test -z "$kde_save_INSTALL_given" ; then
-     # OK, user hasn't given any INSTALL, autoconf found one for us
-     # now we test, if it supports the -p flag
--    echo "$as_me:$LINENO: checking for -p flag to install" >&5
--echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for -p flag to install" >&5
-+echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
-     rm -f confinst.$$.* > /dev/null 2>&1
-     echo "Testtest" > confinst.$$.orig
-     ac_res=no
-@@ -1753,8 +2463,8 @@
-       fi
-     fi
-     rm -f confinst.$$.*
--    echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6
-+    { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-   fi
- 
-   if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1764,8 +2474,8 @@
-     INSTALL_SCRIPT='${INSTALL}'
-   fi
- 
--echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -1807,9 +2517,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; }
 -
-+{ 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`
  
-@@ -1823,12 +2532,45 @@
+@@ -2527,6 +2551,39 @@
  echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
@@ -24315,95 +21632,17 @@
  for ac_prog in gawk mawk nawk awk
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1841,54 +2583,57 @@
+@@ -2545,7 +2602,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AWK="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
+@@ -2608,7 +2665,7 @@
  fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+  { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$AWK" && break
- done
- 
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
--	@echo 'ac_maketemp="$(MAKE)"'
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
--  eval ac_cv_prog_make_${ac_make}_set=yes
--else
--  eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
- rm -f conftest.make
- fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   SET_MAKE=
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-@@ -1901,7 +2646,7 @@
- fi
  rmdir .tst 2>/dev/null
  
 - # test to see if srcdir already configured
@@ -24411,7 +21650,7 @@
  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
-@@ -1949,9 +2694,6 @@
+@@ -2656,9 +2713,6 @@
  
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
@@ -24421,110 +21660,26 @@
  install_sh=${install_sh-"$am_aux_dir/install-sh"}
  
  # Installed binaries are usually stripped using `strip' when the user
-@@ -1962,8 +2704,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
-@@ -1976,32 +2718,34 @@
+@@ -2683,7 +2737,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2014,27 +2758,41 @@
+@@ -2723,7 +2777,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+@@ -2767,6 +2821,38 @@
  
--  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  STRIP=$ac_ct_STRIP
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
- else
-   STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -2044,6 +2802,38 @@
- 
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
 +# Always define AMTAR for backward compatibility.
@@ -24562,736 +21717,72 @@
  
  
  
-@@ -2065,14 +2855,14 @@
- 
-   if test "x$prefix" = "xNONE"; then
- 
--   echo "$as_me:$LINENO: checking for kde-config" >&5
--echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for kde-config" >&5
-+echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
-    if test -n "$KDECONFIG"; then
-         kde_cv_path="$KDECONFIG";
-    else
-         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -2115,8 +2905,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
- Please check whether you installed KDE correctly.
-@@ -2127,8 +2917,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       KDECONFIG=$kde_cv_path
- 
-    fi
-@@ -2137,14 +2927,14 @@
-         kde_save_PATH="$PATH"
-     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
- 
--   echo "$as_me:$LINENO: checking for kde-config" >&5
--echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for kde-config" >&5
-+echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
-    if test -n "$KDECONFIG"; then
-         kde_cv_path="$KDECONFIG";
-    else
-         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -2187,8 +2977,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
- Please check whether you installed KDE correctly.
-@@ -2199,8 +2989,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       KDECONFIG=$kde_cv_path
- 
-    fi
-@@ -2222,16 +3012,16 @@
-   fi
-   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- 
--  echo "$as_me:$LINENO: checking where to install" >&5
--echo $ECHO_N "checking where to install... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking where to install" >&5
-+echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
-   if test "x$prefix" = "xNONE"; then
-     prefix=$kde_libs_prefix
--    echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
--echo "${ECHO_T}$prefix (as returned by kde-config)" >&6
-+    { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
-+echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
-   else
-         given_prefix=$prefix
--    echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
--echo "${ECHO_T}$prefix (as requested)" >&6
-+    { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
-+echo "${ECHO_T}$prefix (as requested)" >&6; }
-   fi
- 
-   # And delete superfluous '/' to make compares easier
-@@ -2244,13 +3034,13 @@
- 
- 
- 
--    # Check whether --enable-fast-perl or --disable-fast-perl was given.
-+    # Check whether --enable-fast-perl was given.
- if test "${enable_fast_perl+set}" = set; then
--  enableval="$enable_fast_perl"
--  with_fast_perl=$enableval
-+  enableval=$enable_fast_perl; with_fast_perl=$enableval
- else
-   with_fast_perl=yes
--fi;
-+fi
-+
- 
- 
-   val=
-@@ -2267,11 +3057,11 @@
- 
- 
- 
--          ac_config_headers="$ac_config_headers config.h"
-+ac_config_headers="$ac_config_headers config.h"
- 
- DEPDIR="${am__leading_dot}deps"
- 
--          ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
- 
- 
- am_make=${MAKE-make}
-@@ -2281,8 +3071,8 @@
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -2309,15 +3099,15 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
- 
--# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+# Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
--  enableval="$enable_dependency_tracking"
-+  enableval=$enable_dependency_tracking;
-+fi
- 
--fi;
- if test "x$enable_dependency_tracking" != xno; then
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
-@@ -2337,10 +3127,9 @@
- 
- 
- 
--  # Check whether --enable-debug or --disable-debug was given.
-+  # Check whether --enable-debug was given.
- if test "${enable_debug+set}" = set; then
--  enableval="$enable_debug"
--
-+  enableval=$enable_debug;
-     case $enableval in
-       yes)
-         kde_use_debug_code="yes"
-@@ -2360,18 +3149,18 @@
-   kde_use_debug_code="no"
-       kde_use_debug_define=no
- 
--fi;
-+fi
-+
- 
--    # Check whether --enable-dummyoption or --disable-dummyoption was given.
-+    # Check whether --enable-dummyoption was given.
- if test "${enable_dummyoption+set}" = set; then
--  enableval="$enable_dummyoption"
-+  enableval=$enable_dummyoption;
-+fi
- 
--fi;
- 
--  # Check whether --enable-strict or --disable-strict was given.
-+  # Check whether --enable-strict was given.
- if test "${enable_strict+set}" = set; then
--  enableval="$enable_strict"
--
-+  enableval=$enable_strict;
-     if test $enableval = "no"; then
-          kde_use_strict_options="no"
-        else
-@@ -2380,12 +3169,12 @@
- 
- else
-   kde_use_strict_options="no"
--fi;
-+fi
- 
--  # Check whether --enable-warnings or --disable-warnings was given.
--if test "${enable_warnings+set}" = set; then
--  enableval="$enable_warnings"
- 
-+  # Check whether --enable-warnings was given.
-+if test "${enable_warnings+set}" = set; then
-+  enableval=$enable_warnings;
-     if test $enableval = "no"; then
-          kde_use_warnings="no"
-        else
-@@ -2394,20 +3183,21 @@
- 
- else
-   kde_use_warnings="yes"
--fi;
-+fi
-+
- 
-     if test "$kde_use_debug_code" != "no"; then
-     kde_use_warnings=yes
-   fi
- 
--  # Check whether --enable-profile or --disable-profile was given.
-+  # Check whether --enable-profile was given.
- if test "${enable_profile+set}" = set; then
--  enableval="$enable_profile"
--  kde_use_profiling=$enableval
-+  enableval=$enable_profile; kde_use_profiling=$enableval
- else
-   kde_use_profiling="no"
- 
--fi;
-+fi
-+
- 
-     CFLAGS=" $CFLAGS"
- 
-@@ -2419,8 +3209,8 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2433,32 +3223,34 @@
+@@ -3156,7 +3242,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_CC"; then
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2471,36 +3263,51 @@
+@@ -3196,7 +3282,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
- else
-   CC="$ac_cv_prog_CC"
- fi
- 
- if test -z "$CC"; then
--  if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2513,74 +3320,34 @@
+@@ -3253,7 +3339,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  CC=$ac_ct_CC
--else
--  CC="$ac_cv_prog_CC"
--fi
- 
-+  fi
- fi
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2594,7 +3361,7 @@
+@@ -3294,7 +3380,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2605,6 +3372,7 @@
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- if test $ac_prog_rejected = yes; then
-   # We found a bogon in the path, so make sure we never use it.
-@@ -2622,22 +3390,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$CC"; then
-   if test -n "$ac_tool_prefix"; then
--  for ac_prog in cl
-+  for ac_prog in cl.exe
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2650,36 +3419,38 @@
+@@ -3352,7 +3438,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     test -n "$CC" && break
-   done
- fi
- if test -z "$CC"; then
-   ac_ct_CC=$CC
--  for ac_prog in cl
-+  for ac_prog in cl.exe
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2692,29 +3463,45 @@
+@@ -3396,7 +3482,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$ac_ct_CC" && break
- done
- 
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
- fi
- 
- fi
-@@ -2727,21 +3514,35 @@
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-@@ -2766,47 +3567,77 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
--  (eval $ac_link_default) 2>&5
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort.  b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions.  Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link_default") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  # Find the output, starting from the most likely.  This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
+@@ -3537,7 +3623,7 @@
+ # in a Makefile.  We should not override ac_cv_exeext if it was cached,
+ # so that the user can short-circuit this test for compilers unknown to
+ # Autoconf.
+-for ac_file in $ac_files
 +for ac_file in $ac_files ''
  do
    test -f "$ac_file" || continue
    case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
--	;;
--    conftest.$ac_ext )
--	# This is the source file.
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- 	;;
-     [ab].out )
- 	# We found the default executable, but exeext='' is most
- 	# certainly right.
- 	break;;
-     *.* )
--	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	# FIXME: I believe we export ac_cv_exeext for Libtool,
--	# but it would be cool to find out if it's true.  Does anybody
--	# maintain Libtool? --akim.
--	export ac_cv_exeext
-+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	then :; else
-+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	fi
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
- 	break;;
-     * )
- 	break;;
-   esac
- done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
+@@ -3565,6 +3651,12 @@
+ test "$ac_cv_exeext" = no && ac_cv_exeext=
+ 
  else
 +  ac_file=''
 +fi
@@ -25302,744 +21793,176 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -2818,19 +3649,21 @@
+@@ -3576,8 +3668,6 @@
  fi
  
  ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
+-{ echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6; }
  
--# Check the compiler produces executables we can run.  If not, either
-+# Check that the compiler produces executables we can run.  If not, either
+ # Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -2849,22 +3682,27 @@
-     fi
-   fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run.  If not, either
-+# Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
--
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-@@ -2875,9 +3713,8 @@
- for ac_file in conftest.exe conftest conftest.*; do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	  export ac_cv_exeext
- 	  break;;
-     * ) break;;
-   esac
-@@ -2891,14 +3728,14 @@
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2918,14 +3755,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+  for ac_file in conftest.o conftest.obj conftest.*; do
-+  test -f "$ac_file" || continue;
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
-@@ -2943,12 +3786,12 @@
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2971,23 +3814,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -3755,27 +3845,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -2996,24 +3852,28 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_compiler_gnu=no
-+	ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
  else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3029,23 +3889,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -3830,27 +3903,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3054,281 +3927,278 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_cc_g=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
--  else
--    CFLAGS=
--  fi
--fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_prog_cc_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
-+	CFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
--{
--  return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
--}
--
--/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
--   function prototypes and stuff, but not '\xHH' hex character constants.
--   These don't provoke an error unfortunately, instead are silently treated
--   as 'x'.  The following induces an error, until -std1 is added to get
--   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
--   array size at least.  It's necessary to write '\x00'==0 to get something
--   that's true only with -std1.  */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
- 
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
- int
- main ()
- {
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+
-   ;
-   return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX 10.20 and later	-Ae
--# HP-UX older versions	-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-  (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=$?
-+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
+-  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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3885,27 +3941,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_prog_cc_stdc=$ac_arg
--break
-+  :
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
--rm -f conftest.err conftest.$ac_objext
--done
--rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
--
--fi
--
--case "x$ac_cv_prog_cc_stdc" in
--  x|xno)
--    echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
--  *)
--    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
--    CC="$CC $ac_cv_prog_cc_stdc" ;;
+-  (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
--
--# Some people use a C++ compiler to compile C.  Since we use `exit',
--# in C++ we need to declare it.  In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
--  choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$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
--  for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
-+	ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
-+
- int
- main ()
- {
--exit (42);
-+
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3941,27 +3980,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  :
-+  ac_cv_prog_cc_g=yes
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--continue
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
- int
- main ()
- {
--exit (42);
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -4077,27 +4099,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  break
-+  ac_cv_prog_cc_c89=$ac_arg
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_c89=$ac_arg
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
- fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+  xno)
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
- 
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3337,8 +4207,8 @@
- 
- depcc="$CC"   am_compiler_list=
- 
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3376,7 +4246,9 @@
+@@ -4175,7 +4180,9 @@
      : > sub/conftest.c
      for i in 1 2 3 4 5 6; do
        echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -26050,7 +21973,7 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
-@@ -3404,9 +4276,14 @@
+@@ -4203,9 +4210,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
@@ -26068,666 +21991,241 @@
          am_cv_CC_dependencies_compiler_type=$depmode
          break
        fi
-@@ -3420,8 +4297,8 @@
- fi
- 
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
- 
-@@ -3443,8 +4320,8 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -3478,8 +4355,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -4289,17 +4301,10 @@
    rm -f conftest.er1
-@@ -3504,9 +4386,10 @@
-   # Broken: fails on valid input.
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4333,17 +4338,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
  continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3516,8 +4399,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+ else
+@@ -4408,17 +4406,10 @@
    rm -f conftest.er1
-@@ -3544,6 +4432,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -3561,8 +4450,8 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
  else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -3585,8 +4474,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -4452,17 +4443,10 @@
    rm -f conftest.er1
-@@ -3611,9 +4505,10 @@
-   # Broken: fails on valid input.
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
  continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3623,8 +4518,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -3651,6 +4551,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -3701,18 +4602,22 @@
- 
-   CXXFLAGS=" $CXXFLAGS"
- 
--  ac_ext=cc
-+  ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--if test -n "$ac_tool_prefix"; then
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3725,36 +4630,38 @@
+@@ -4552,7 +4536,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6
-+  { echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     test -n "$CXX" && break
-   done
- fi
- if test -z "$CXX"; then
-   ac_ct_CXX=$CXX
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3767,55 +4674,85 @@
+@@ -4596,7 +4580,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CXX="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--echo "${ECHO_T}$ac_ct_CXX" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$ac_ct_CXX" && break
- done
--test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- 
--  CXX=$ac_ct_CXX
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CXX=$ac_ct_CXX
-+  fi
- fi
- 
--
-+  fi
-+fi
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C++ compiler version" >&5
-+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3838,23 +4775,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -4709,27 +4693,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3863,24 +4813,28 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_compiler_gnu=no
-+	ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
- GXX=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--CXXFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  (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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
  else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
-+   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3896,23 +4850,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -4784,27 +4751,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3921,69 +4888,53 @@
+-  (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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cxx_g=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_cxx_g=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
--if test "$ac_test_CXXFLAGS" = set; then
--  CXXFLAGS=$ac_save_CXXFLAGS
--elif test $ac_cv_prog_cxx_g = yes; then
--  if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
--  else
--    CXXFLAGS="-g"
--  fi
--else
--  if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
--  else
--    CXXFLAGS=
--  fi
--fi
--for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
-+	CXXFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
-+
- int
- main ()
- {
--exit (42);
-+
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -4839,27 +4789,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3992,60 +4943,91 @@
+-  (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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
-+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
-+
- int
- main ()
- {
--exit (42);
-+
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -4895,27 +4828,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  break
-+  ac_cv_prog_cxx_g=yes
+-  (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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cxx_g=yes
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
-+else
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
-+fi
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4054,8 +5036,8 @@
- 
- depcc="$CXX"  am_compiler_list=
- 
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4093,7 +5075,9 @@
+@@ -4997,7 +4913,9 @@
      : > sub/conftest.c
      for i in 1 2 3 4 5 6; do
        echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -26738,7 +22236,7 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
-@@ -4121,9 +5105,14 @@
+@@ -5025,9 +4943,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
@@ -26756,2529 +22254,1116 @@
          am_cv_CXX_dependencies_compiler_type=$depmode
          break
        fi
-@@ -4137,8 +5126,8 @@
- fi
- 
- fi
--echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
- 
-@@ -4156,8 +5145,8 @@
- 
- 
- 
--  echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
--echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
-+echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
- 
- 
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -4182,23 +5171,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -5098,27 +5021,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4207,13 +5209,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_bad_compiler=yes
-+	kde_bad_compiler=yes
- 
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--  echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
--echo "${ECHO_T}$kde_bad_compiler" >&6
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+  { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
-+echo "${ECHO_T}$kde_bad_compiler" >&6; }
- 
- if test "$kde_bad_compiler" = "yes"; then
-   { { echo "$as_me:$LINENO: error:
-@@ -4255,17 +5258,16 @@
-         fi
-       fi
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
- kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_bad_compiler=no
  else
- 
- 
- 
--
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4293,23 +5295,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -5222,27 +5128,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4318,8 +5333,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5251,7 +5141,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4332,29 +5349,28 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="-fno-builtin $CXXFLAGS"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
--echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
-+echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
- kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4381,23 +5397,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -5324,27 +5214,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4406,8 +5435,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5353,7 +5227,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4420,13 +5451,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
-  WOVERLOADED_VRITUAL=""
- fi
-@@ -4447,16 +5478,15 @@
- 
-   if test "$kde_use_profiling" = "yes"; then
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
--echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
-+echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
- kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4483,23 +5513,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -5440,27 +5314,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4508,8 +5551,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5469,7 +5327,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4522,16 +5567,16 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
- 
-       CFLAGS="-pg $CFLAGS"
-       CXXFLAGS="-pg $CXXFLAGS"
- 
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
-@@ -4546,16 +5591,15 @@
-             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
--echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
- kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4582,23 +5626,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -5553,27 +5411,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4607,8 +5664,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5582,7 +5424,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4621,27 +5680,26 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
--echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
-+echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
- kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4666,23 +5724,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -5651,27 +5493,11 @@
    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
-@@ -4691,8 +5762,10 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cc_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5680,7 +5506,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
    ac_ext=c
-@@ -4705,13 +5778,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
-@@ -4719,16 +5792,15 @@
-           ;;
-         esac
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
--echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
- kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4755,23 +5827,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -5754,27 +5580,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4780,8 +5865,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5783,7 +5593,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4794,28 +5881,27 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="-Wundef $CXXFLAGS"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
--echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
- kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4842,23 +5928,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -5855,27 +5665,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4867,8 +5966,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5884,7 +5678,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4881,28 +5982,27 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="-Wno-long-long $CXXFLAGS"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
--echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
- kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4929,23 +6029,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -5956,27 +5750,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4954,8 +6067,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5985,7 +5763,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4968,13 +6083,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
-@@ -4986,13 +6101,13 @@
-     CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
-   fi
- 
--  # Check whether --enable-pch or --disable-pch was given.
-+  # Check whether --enable-pch was given.
- if test "${enable_pch+set}" = set; then
--  enableval="$enable_pch"
--   kde_use_pch=$enableval
-+  enableval=$enable_pch;  kde_use_pch=$enableval
- else
-    kde_use_pch=no
--fi;
-+fi
-+
- 
-   HAVE_GCC_VISIBILITY=0
- 
-@@ -5000,16 +6115,15 @@
-   if test "$GXX" = "yes"; then
-     gcc_no_reorder_blocks=NO
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
- kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5036,23 +6150,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -6077,27 +5855,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5061,8 +6188,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6106,7 +5868,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5075,13 +6204,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  gcc_no_reorder_blocks=YES
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
-@@ -5093,16 +6222,15 @@
-           CFLAGS="$CFLAGS -fno-reorder-blocks"
-     fi
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
- kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5129,23 +6257,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -6184,27 +5946,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5154,8 +6295,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6213,7 +5959,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5168,28 +6311,27 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -fno-exceptions"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
- kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5216,23 +6358,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -6285,27 +6031,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5241,8 +6396,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6314,7 +6044,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5255,28 +6412,27 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -fno-check-new"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
- kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5303,23 +6459,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -6386,27 +6116,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5328,8 +6497,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6415,7 +6129,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5342,28 +6513,27 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -fno-common"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
--echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
-+echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
- kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5390,23 +6560,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -6487,27 +6201,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5415,8 +6598,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6516,7 +6214,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5429,13 +6614,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  USE_EXCEPTIONS="-fexceptions"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
-  USE_EXCEPTIONS=
- fi
-@@ -5443,37 +6628,37 @@
-     ENABLE_PERMISSIVE_FLAG="-fpermissive"
- 
-     if test "$kde_use_pch" = "yes"; then
--        echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
--echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
-+echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
-         echo >conftest.h
-         if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
-             kde_gcc_supports_pch=yes
--            echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+            { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-         else
-             kde_gcc_supports_pch=no
--            echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+            { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-         fi
-         if test "$kde_gcc_supports_pch" = "yes"; then
--            echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
--echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6
-+            { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
-+echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
-             if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
-                 kde_gcc_supports_pch=yes
--                echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+                { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-             else
-                 kde_gcc_supports_pch=no
--                echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+                { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-             fi
-         fi
-         rm -f conftest.h conftest.h.gch
-     fi
- 
- 
--  echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
--echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
-+echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
- if test "${kde_cv_opt_noinline_match+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5505,23 +6690,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -6617,27 +6315,11 @@
    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
-@@ -5530,18 +6728,19 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   kde_cv_opt_noinline_match=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6647,7 +6329,7 @@
  
--kde_cv_opt_noinline_match=no
-+	kde_cv_opt_noinline_match=no
- 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
      CFLAGS="$ac_cflags_save"
-   fi
- 
- fi
--echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
--echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
-+echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
- 
-     if test "x$kde_cv_opt_noinline_match" = "xno" ; then
-        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5561,16 +6760,15 @@
- 
-     if test "$kde_use_pch" = "yes"; then
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
--echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
-+echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
- kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5597,23 +6795,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -6722,27 +6404,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5622,8 +6833,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6751,7 +6417,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5636,29 +6849,28 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --pch"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
-                                               fi
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
--echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
-+echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
- kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5685,23 +6897,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -6824,27 +6490,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5710,8 +6935,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6853,7 +6503,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5724,28 +6951,27 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
--echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
-+echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
- kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5772,23 +6998,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -6925,27 +6575,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5797,8 +7036,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6954,7 +6588,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5811,28 +7052,27 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
--echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
-+echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
- kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5859,23 +7099,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -7026,27 +6660,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5884,8 +7137,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7055,7 +6673,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5898,28 +7153,27 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
--echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
-+echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
- kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5946,23 +7200,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -7127,27 +6745,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5971,8 +7238,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7156,7 +6758,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5985,28 +7254,27 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
--echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
-+echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
- kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6033,23 +7301,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -7228,27 +6830,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6058,8 +7339,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7257,7 +6843,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6072,13 +7355,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --one_per"
+@@ -7431,17 +7017,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  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
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
  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
-@@ -6185,13 +7468,13 @@
- fi
- 
- 
--  ac_ext=cc
-+  ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6221,8 +7504,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -7475,17 +7054,10 @@
    rm -f conftest.er1
-@@ -6247,9 +7535,10 @@
-   # Broken: fails on valid input.
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  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
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
  continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6259,8 +7548,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+ else
+@@ -7550,17 +7122,10 @@
    rm -f conftest.er1
-@@ -6287,6 +7581,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -6304,8 +7599,8 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  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
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
  else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:$LINENO: result: $CXXCPP" >&5
--echo "${ECHO_T}$CXXCPP" >&6
-+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
- do
-@@ -6328,8 +7623,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -7594,17 +7159,10 @@
    rm -f conftest.er1
-@@ -6354,9 +7654,10 @@
-   # Broken: fails on valid input.
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  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
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
  continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6366,8 +7667,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -6394,6 +7700,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -6420,16 +7727,15 @@
-      NOOPT_CFLAGS=-O0
-   fi
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
--echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
-+echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
- kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6456,23 +7762,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -7689,27 +7247,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6481,8 +7800,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7718,7 +7260,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6495,22 +7816,21 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  NOOPT_CXXFLAGS=-O0
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--  # Check whether --enable-coverage or --disable-coverage was given.
-+  # Check whether --enable-coverage was given.
- if test "${enable_coverage+set}" = set; then
--  enableval="$enable_coverage"
--
-+  enableval=$enable_coverage;
-       if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
-         ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
-         ac_coverage_linker="-lgcc"
-@@ -6526,36 +7846,36 @@
-       CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
-       LDFLAGS="$LDFLAGS $ac_coverage_linker"
- 
--fi;
-+fi
-+
- 
- 
- 
- 
- 
- 
--  # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
-+  # Check whether --enable-new_ldflags was given.
- if test "${enable_new_ldflags+set}" = set; then
--  enableval="$enable_new_ldflags"
--  kde_use_new_ldflags=$enableval
-+  enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval
- else
-   kde_use_new_ldflags=no
--fi;
-+fi
-+
- 
-   LDFLAGS_AS_NEEDED=""
-   LDFLAGS_NEW_DTAGS=""
-   if test "x$kde_use_new_ldflags" = "xyes"; then
-        LDFLAGS_NEW_DTAGS=""
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
- kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6582,23 +7902,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -7829,27 +7371,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6607,8 +7940,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7858,7 +7384,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6621,29 +7956,28 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
- kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6670,23 +8004,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -7931,27 +7457,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6695,8 +8042,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7960,7 +7470,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6709,13 +8058,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  LDFLAGS_AS_NEEDED="-Wl,--as-needed"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
-@@ -6725,13 +8074,13 @@
- 
- 
- 
--  # Check whether --enable-final or --disable-final was given.
-+  # Check whether --enable-final was given.
- if test "${enable_final+set}" = set; then
--  enableval="$enable_final"
--  kde_use_final=$enableval
-+  enableval=$enable_final; kde_use_final=$enableval
- else
-   kde_use_final=no
--fi;
-+fi
-+
- 
-   if test "x$kde_use_final" = "xyes"; then
-       KDE_USE_FINAL_TRUE=""
-@@ -6744,13 +8093,13 @@
- 
- 
- 
--  # Check whether --enable-closure or --disable-closure was given.
-+  # Check whether --enable-closure was given.
- if test "${enable_closure+set}" = set; then
--  enableval="$enable_closure"
--  kde_use_closure=$enableval
-+  enableval=$enable_closure; kde_use_closure=$enableval
- else
-   kde_use_closure=no
--fi;
-+fi
-+
- 
-   KDE_NO_UNDEFINED=""
-   if test "x$kde_use_closure" = "xyes"; then
-@@ -6761,238 +8110,60 @@
+@@ -8025,211 +7535,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
 -       case $host in
 -         *-*-linux-gnu)
 -
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6; }
 -kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+-if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -
 -
-+  fi
- 
--   ac_ext=cc
+-   ac_ext=cpp
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
+-
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- 
- 
+-
+-
 -  save_CXXFLAGS="$CXXFLAGS"
 -  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -29287,7 +23372,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-
 -int
 -main ()
 -{
@@ -29297,37 +23382,48 @@
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  eval "kde_cv_prog_cxx_$kde_cache=yes"
-+  # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
-+  kde_use_nmcheck=no
- fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  CXXFLAGS="$save_CXXFLAGS"
 -  ac_ext=c
@@ -29336,61 +23432,31 @@
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -
- 
+-
 -fi
- 
+-
 -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 - :
-+  if test "$kde_use_nmcheck" = "yes"; then
-+      KDE_USE_NMCHECK_TRUE=""
-+      KDE_USE_NMCHECK_FALSE="#"
-+   else
-+      KDE_USE_NMCHECK_TRUE="#"
-+      KDE_USE_NMCHECK_FALSE=""
-+  fi
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
+-
+-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6; }
 -kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+-if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
- 
- 
- 
--   ac_ext=cc
+-
+-
+-   ac_ext=cpp
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
+-
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- 
-+# Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then
-+  enableval=$enable_shared; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_shared=yes
-+fi
- 
+-
+-
 -  save_CXXFLAGS="$CXXFLAGS"
 -  CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -29399,7 +23465,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-
 -int
 -main ()
 -{
@@ -29409,23 +23475,36 @@
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -29434,8 +23513,10 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+-
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  CXXFLAGS="$save_CXXFLAGS"
 -  ac_ext=c
@@ -29448,157 +23529,30 @@
 -fi
 -
 -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 - :
 - KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
 -else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 - :
 - KDE_NO_UNDEFINED=""
 -fi
 -
 -else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 - :
 - KDE_NO_UNDEFINED=""
 -fi
 -
 -           ;;
 -       esac
--  fi
--
--
--
--
--
--  # Check whether --enable-nmcheck or --disable-nmcheck was given.
--if test "${enable_nmcheck+set}" = set; then
--  enableval="$enable_nmcheck"
--  kde_use_nmcheck=$enableval
--else
--  kde_use_nmcheck=no
--fi;
--
--  if test "$kde_use_nmcheck" = "yes"; then
--      KDE_USE_NMCHECK_TRUE=""
--      KDE_USE_NMCHECK_FALSE="#"
--   else
--      KDE_USE_NMCHECK_TRUE="#"
--      KDE_USE_NMCHECK_FALSE=""
--  fi
--
--
--
--
--
--
--# Check whether --enable-shared or --disable-shared was given.
--if test "${enable_shared+set}" = set; then
--  enableval="$enable_shared"
--  p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_shared=yes ;;
--    no) enable_shared=no ;;
--    *)
--      enable_shared=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_shared=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac
--else
--  enable_shared=yes
--fi;
--
--# Check whether --enable-static or --disable-static was given.
-+# Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
--  enableval="$enable_static"
--  p=${PACKAGE-default}
-+  enableval=$enable_static; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_static=yes ;;
-     no) enable_static=no ;;
-@@ -7011,18 +8182,19 @@
-     esac
- else
-   enable_static=no
--fi;
-+fi
+   fi
  
  
- 
- 
--    # Check whether --enable-libsuffix or --disable-libsuffix was given.
-+
-+    # Check whether --enable-libsuffix was given.
- if test "${enable_libsuffix+set}" = set; then
--  enableval="$enable_libsuffix"
--  kdelibsuff=$enableval
-+  enableval=$enable_libsuffix; kdelibsuff=$enableval
- else
-   kdelibsuff="auto"
--fi;
-+fi
-+
- 
-     if test "$kdelibsuff" = "auto"; then
- 
-@@ -7043,8 +8215,8 @@
-        kdelibsuff=
-     fi
-     if test -z "$kdelibsuff"; then
--        echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
--echo "${ECHO_T}not using lib directory suffix" >&6
-+        { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
-+echo "${ECHO_T}not using lib directory suffix" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define KDELIBSUFF ""
-@@ -7060,14 +8232,13 @@
- #define KDELIBSUFF "${kdelibsuff}"
- _ACEOF
- 
--        echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
--echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
-+        { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
-+echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
-     fi
- 
--# Check whether --enable-fast-install or --disable-fast-install was given.
-+# Check whether --enable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
--  enableval="$enable_fast_install"
--  p=${PACKAGE-default}
-+  enableval=$enable_fast_install; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_fast_install=yes ;;
-     no) enable_fast_install=no ;;
-@@ -7086,10 +8257,11 @@
-     esac
- else
-   enable_fast_install=yes
--fi;
-+fi
- 
--echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+
-+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
- if test "${lt_cv_path_SED+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7113,7 +8285,7 @@
+@@ -8405,7 +7710,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
@@ -29607,225 +23561,25 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7142,37 +8314,184 @@
- fi
- 
- SED=$lt_cv_path_SED
--echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6
-+{ echo "$as_me:$LINENO: result: $SED" >&5
-+echo "${ECHO_T}$SED" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in grep ggrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-+    # Check for GNU ac_path_GREP and select it if it is found.
-+  # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    echo 'GREP' >> "conftest.nl"
-+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
-+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_GREP="$ac_path_GREP"
-+      ac_path_GREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+    $ac_path_GREP_found && break 3
-+  done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_GREP=$GREP
-+fi
-+
- 
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
-+  ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in egrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-+    # Check for GNU ac_path_EGREP and select it if it is found.
-+  # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    echo 'EGREP' >> "conftest.nl"
-+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
-+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_EGREP="$ac_path_EGREP"
-+      ac_path_EGREP_max=$ac_count
-     fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+    $ac_path_EGREP_found && break 3
-+  done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+   fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
- 
- 
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
--fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -7201,11 +8520,11 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7218,7 +8537,7 @@
+@@ -8458,7 +7763,7 @@
+   for ac_prog in grep ggrep; do
+   for ac_exec_ext in '' $ac_executable_extensions; do
+     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+     # Check for GNU ac_path_GREP and select it if it is found.
+   # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+@@ -8540,7 +7845,7 @@
+   for ac_prog in egrep; do
+   for ac_exec_ext in '' $ac_executable_extensions; do
+     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+     # Check for GNU ac_path_EGREP and select it if it is found.
+   # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+@@ -8657,7 +7962,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,
@@ -29834,27 +23588,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'*)
-@@ -7238,21 +8557,21 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+  { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+@@ -8691,7 +7996,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -29863,33 +23597,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7262,29 +8581,38 @@
-   ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
--echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
--echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_ld_reload_flag='-r'
- fi
--echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
+@@ -8721,6 +8026,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -29903,14 +23611,9 @@
 +    ;;
 +esac
  
--echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7292,56 +8620,63 @@
+ { echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+@@ -8731,36 +8045,43 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -29978,37 +23681,7 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
--echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
- 
--echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
--  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6
-+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7368,44 +8703,36 @@
+@@ -8807,44 +8128,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -30063,7 +23736,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7421,7 +8748,7 @@
+@@ -8860,7 +8173,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -30072,7 +23745,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
-@@ -7437,43 +8764,27 @@
+@@ -8876,43 +8189,27 @@
    esac
    ;;
  
@@ -30129,7 +23802,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
-@@ -7492,32 +8803,22 @@
+@@ -8931,32 +8228,22 @@
    ;;
  
  openbsd*)
@@ -30165,7 +23838,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]'
-@@ -7538,17 +8839,20 @@
+@@ -8977,10 +8264,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -30180,16 +23853,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7557,14 +8861,17 @@
+@@ -8996,6 +8286,9 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -30199,27 +23863,16 @@
  # Allow CC to be a program name with arguments.
  compiler=$CC
  
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
-+  enableval=$enable_libtool_lock;
-+fi
- 
--fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- # Some flags need to be propagated to the compiler or linker for good
-@@ -7591,7 +8898,7 @@
+@@ -9030,7 +8323,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7594 "configure"' > conftest.$ac_ext
-+  echo '#line 8901 "configure"' > conftest.$ac_ext
+-  echo '#line 9033 "configure"' > conftest.$ac_ext
++  echo '#line 8326 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7634,14 +8941,13 @@
+@@ -9073,14 +8366,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -30236,7 +23889,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7653,7 +8959,6 @@
+@@ -9092,7 +8384,6 @@
        esac
        ;;
      *64-bit*)
@@ -30244,84 +23897,49 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7678,8 +8983,8 @@
-   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -belf"
--  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7705,23 +9010,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -9156,27 +8447,11 @@
    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
-@@ -7730,9 +9048,10 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   lt_cv_cc_needs_belf=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--lt_cv_cc_needs_belf=no
-+	lt_cv_cc_needs_belf=no
+@@ -9185,7 +8460,7 @@
+ 	lt_cv_cc_needs_belf=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -7741,13 +9060,33 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+@@ -9201,6 +8476,26 @@
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -30348,371 +23966,140 @@
  
  esac
  
-@@ -7755,8 +9094,8 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7780,23 +9119,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -9245,27 +8540,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7805,9 +9157,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdc=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_header_stdc=no
-+	ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7863,6 +9216,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7882,18 +9236,27 @@
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
+@@ -9441,27 +8719,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7906,12 +9269,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -7934,9 +9299,9 @@
- 		  inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -7950,23 +9315,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -9524,27 +8785,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7975,12 +9353,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_Header=no"
-+	eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -7995,18 +9375,19 @@
- for ac_header in dlfcn.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
  else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8017,23 +9398,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -9580,17 +8824,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -8042,15 +9436,16 @@
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9649,47 +8886,280 @@
  
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8059,8 +9454,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -8084,9 +9484,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8110,25 +9511,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8140,17 +9535,278 @@
- 
  done
  
+-ac_ext=f
+-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_F77+set}" = set; then
 +
 +
 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
@@ -30727,14 +24114,40 @@
 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 +if test -z "$CXXCPP"; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$F77"; then
+-  ac_cv_prog_F77="$F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
 +      # Double quotes because CXXCPP needs to be expanded
 +    for CXXCPP in "$CXX -E" "/lib/cpp"
 +    do
 +      ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
-+do
+ do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-F77=$ac_cv_prog_F77
+-if test -n "$F77"; then
+-  { echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6; }
+-else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -30766,17 +24179,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  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
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  :
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -30810,17 +24216,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  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
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  # Broken: success on invalid input.
 +continue
 +else
@@ -30885,17 +24284,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  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
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  :
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -30929,17 +24321,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  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
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  # Broken: success on invalid input.
 +continue
 +else
@@ -30974,318 +24359,133 @@
 +
 +fi
 +
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-+  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8163,36 +9819,38 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
++if test "${ac_cv_prog_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
 +IFS=$as_save_IFS
- 
- fi
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
--  echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
 +  { echo "$as_me:$LINENO: result: $F77" >&5
 +echo "${ECHO_T}$F77" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
-+
-     test -n "$F77" && break
-   done
+ 
+@@ -9698,7 +9168,7 @@
  fi
  if test -z "$F77"; then
    ac_ct_F77=$F77
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-+  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
+-  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
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8205,48 +9863,78 @@
+@@ -9716,7 +9186,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_F77="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_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
-+  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-+echo "${ECHO_T}$ac_ct_F77" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$ac_ct_F77" && break
- done
- 
--  F77=$ac_ct_F77
-+  if test "x$ac_ct_F77" = x; then
-+    F77=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    F77=$ac_ct_F77
-+  fi
- fi
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:8235:" \
--     "checking for Fortran 77 compiler version" >&5
-+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-@@ -8256,8 +9944,8 @@
- # input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8270,23 +9958,36 @@
-       end
- _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
+@@ -9823,27 +9293,10 @@
    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;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -8295,20 +9996,21 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_compiler_gnu=no
-+	ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
--echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
-+{ 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
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
  else
-@@ -8319,23 +10021,36 @@
-       end
- _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
+   echo "$as_me: failed program was:" >&5
+@@ -9886,27 +9339,10 @@
    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;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -8344,13 +10059,14 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_f77_g=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_f77_g=no
-+	ac_cv_prog_f77_g=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-+{ 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
-@@ -8379,13 +10095,13 @@
- # 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
-+{ 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
+@@ -9954,7 +9390,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -31294,7 +24494,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8414,20 +10130,70 @@
+@@ -9983,20 +9419,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -31371,33 +24571,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -8438,19 +10204,19 @@
- 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
-+  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
- else
--  echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
-+  { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
- 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
-+{ 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
-@@ -8464,9 +10230,6 @@
+@@ -10033,9 +9519,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -31407,7 +24581,7 @@
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
-@@ -8488,14 +10251,30 @@
+@@ -10057,14 +9540,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'"
    ;;
@@ -31440,7 +24614,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8513,14 +10292,17 @@
+@@ -10082,14 +9581,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -31460,41 +24634,8 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8638,15 +10420,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
--  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
+@@ -10251,7 +9753,7 @@
  
--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
- else
-@@ -8660,8 +10442,8 @@
- 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
- 
- 
-@@ -8682,7 +10464,7 @@
- 
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
 -Xsed='sed -e s/^X//'
@@ -31502,7 +24643,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8702,7 +10484,7 @@
+@@ -10271,7 +9773,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -31511,313 +24652,61 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8712,8 +10494,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
-@@ -8726,32 +10508,34 @@
+@@ -10295,7 +9797,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AR="${ac_tool_prefix}ar"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- 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
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8764,27 +10548,41 @@
+@@ -10335,7 +9837,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_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
- 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
--  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
- 
--  AR=$ac_ct_AR
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AR=$ac_ct_AR
-+  fi
- else
-   AR="$ac_cv_prog_AR"
- fi
-@@ -8792,8 +10590,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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8806,32 +10604,34 @@
+@@ -10391,7 +9893,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- 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
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_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
-@@ -8844,27 +10644,41 @@
+@@ -10431,7 +9933,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_RANLIB="ranlib"
      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_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
--  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
- 
--  RANLIB=$ac_ct_RANLIB
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    RANLIB=$ac_ct_RANLIB
-+  fi
- else
-   RANLIB="$ac_cv_prog_RANLIB"
- fi
-@@ -8872,8 +10686,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
-@@ -8886,32 +10700,34 @@
+@@ -10487,7 +9989,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8924,27 +10740,41 @@
+@@ -10527,7 +10029,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  STRIP=$ac_ct_STRIP
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
- else
-   STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -8959,6 +10789,7 @@
+@@ -10576,6 +10078,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -31825,7 +24714,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -8978,21 +10809,32 @@
+@@ -10595,15 +10098,26 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -31854,15 +24743,7 @@
  # 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
-@@ -9012,7 +10854,7 @@
+@@ -10629,7 +10143,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -31871,31 +24752,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9044,17 +10886,17 @@
- 
- 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
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- if test -z "$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
-@@ -9074,7 +10916,7 @@
+@@ -10691,7 +10205,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -31904,52 +24761,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9106,11 +10948,11 @@
- 
- 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
--  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
- 
-   else
-@@ -9125,21 +10967,21 @@
- enable_dlopen=yes
- enable_win32_dll=no
- 
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
-+  enableval=$enable_libtool_lock;
-+fi
- 
--fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- 
--# Check whether --with-pic or --without-pic was given.
-+# Check whether --with-pic was given.
- if test "${with_pic+set}" = set; then
--  withval="$with_pic"
--  pic_mode="$withval"
-+  withval=$with_pic; pic_mode="$withval"
- else
-   pic_mode=default
--fi;
-+fi
-+
- test -z "$pic_mode" && pic_mode=default
- 
- # Use C for the default configuration in the libtool script
-@@ -9169,70 +11011,31 @@
+@@ -10786,70 +10300,31 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -31986,8 +24798,8 @@
 -#
 -# 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
+-{ 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
@@ -32009,8 +24821,8 @@
 -   LDFLAGS="$save_LDFLAGS"
 -
 -fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
 -
 -if test x"$lt_prog_compiler_static_works" = xyes; then
 -    :
@@ -32041,18 +24853,7 @@
  
  lt_prog_compiler_no_builtin_flag=
  
-@@ -9240,8 +11043,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
- else
-@@ -9255,26 +11058,28 @@
+@@ -10872,18 +10347,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -32060,13 +24861,13 @@
 +   -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:9261: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11064: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:10878: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10353: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9265: \$? = $ac_status" >&5
-+   echo "$as_me:11068: \$? = $ac_status" >&5
+-   echo "$as_me:10882: \$? = $ac_status" >&5
++   echo "$as_me:10357: \$? = $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
@@ -32078,28 +24879,7 @@
         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
-+{ 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="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9288,8 +11093,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,'
-@@ -9327,6 +11132,11 @@
+@@ -10944,6 +10421,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -32111,7 +24891,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9343,7 +11153,7 @@
+@@ -10960,7 +10442,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -32120,7 +24900,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9369,6 +11179,16 @@
+@@ -10986,6 +10468,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -32137,7 +24917,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9380,7 +11200,7 @@
+@@ -10997,7 +10489,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.
@@ -32146,7 +24926,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9403,13 +11223,20 @@
+@@ -11020,13 +10512,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -32169,7 +24949,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9424,15 +11251,15 @@
+@@ -11041,15 +10540,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -32191,7 +24971,7 @@
        ;;
  
      sunos4*)
-@@ -9441,7 +11268,7 @@
+@@ -11058,7 +10557,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -32200,7 +24980,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9454,6 +11281,17 @@
+@@ -11071,6 +10570,17 @@
        fi
        ;;
  
@@ -32218,28 +24998,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9465,16 +11303,16 @@
-     esac
-   fi
- 
--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; }
- 
- #
- # 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
-+{ 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
-@@ -9488,26 +11326,28 @@
+@@ -11105,18 +10615,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -32247,13 +25006,13 @@
 +   -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:9494: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11332: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:11111: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10621: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9498: \$? = $ac_status" >&5
-+   echo "$as_me:11336: \$? = $ac_status" >&5
+-   echo "$as_me:11115: \$? = $ac_status" >&5
++   echo "$as_me:10625: \$? = $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
@@ -32265,31 +25024,19 @@
         lt_prog_compiler_pic_works=yes
       fi
     fi
-    $rm conftest*
- 
+@@ -11137,7 +10649,7 @@
  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; }
  
- if test x"$lt_prog_compiler_pic_works" = xyes; then
-     case $lt_prog_compiler_pic in
-@@ -9520,7 +11360,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=
-@@ -9530,8 +11370,50 @@
+@@ -11147,6 +10659,48 @@
      ;;
  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
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -32332,12 +25079,10 @@
 +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; }
+ { 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
-@@ -9542,60 +11424,58 @@
+@@ -11159,38 +10713,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -32358,13 +25103,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9561: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11436: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:11178: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10725: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9565: \$? = $ac_status" >&5
-+   echo "$as_me:11440: \$? = $ac_status" >&5
+-   echo "$as_me:11182: \$? = $ac_status" >&5
++   echo "$as_me:10729: \$? = $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
@@ -32388,46 +25133,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
- 
- 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; }
- 
- 
- 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
--  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;}
-@@ -9605,8 +11485,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
-+{ 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=
-@@ -9644,6 +11524,16 @@
+@@ -11261,6 +10813,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -32444,7 +25150,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9654,6 +11544,10 @@
+@@ -11271,6 +10833,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -32455,7 +25161,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9664,6 +11558,27 @@
+@@ -11281,6 +10847,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -32483,7 +25189,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9701,7 +11616,7 @@
+@@ -11318,7 +10905,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -32492,7 +25198,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9711,13 +11626,13 @@
+@@ -11328,13 +10915,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'
@@ -32509,7 +25215,7 @@
  	# 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
-@@ -9726,23 +11641,70 @@
+@@ -11343,23 +10930,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -32585,7 +25291,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9756,13 +11718,40 @@
+@@ -11373,13 +11007,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -32628,7 +25334,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9772,24 +11761,19 @@
+@@ -11389,24 +11050,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -32660,7 +25366,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9801,7 +11785,7 @@
+@@ -11418,7 +11074,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -32669,7 +25375,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9823,9 +11807,21 @@
+@@ -11440,9 +11096,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
@@ -32693,7 +25399,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9842,7 +11838,7 @@
+@@ -11459,7 +11127,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -32702,7 +25408,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9861,8 +11857,12 @@
+@@ -11478,8 +11146,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -32715,7 +25421,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9870,22 +11870,23 @@
+@@ -11487,22 +11159,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -32746,58 +25452,44 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9901,23 +11902,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -11530,27 +11203,11 @@
    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
-@@ -9931,19 +11945,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
-+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -11564,18 +11221,17 @@
+ 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -32816,63 +25508,49 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -9962,23 +11977,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -11606,27 +11262,11 @@
    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
-@@ -9992,8 +12020,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
-+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -11640,7 +11280,7 @@
+ 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10002,13 +12032,11 @@
+@@ -11649,13 +11289,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -32889,7 +25567,7 @@
  	fi
        fi
        ;;
-@@ -10021,7 +12049,7 @@
+@@ -11668,7 +11306,7 @@
        ld_shlibs=no
        ;;
  
@@ -32898,7 +25576,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10031,13 +12059,13 @@
+@@ -11678,13 +11316,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -32915,7 +25593,7 @@
        # 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.
-@@ -10047,52 +12075,52 @@
+@@ -11694,52 +11332,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -33008,7 +25686,7 @@
      fi
        ;;
  
-@@ -10126,8 +12154,8 @@
+@@ -11773,8 +11411,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -33019,7 +25697,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10135,7 +12163,7 @@
+@@ -11782,7 +11420,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -33028,7 +25706,7 @@
        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
-@@ -10149,47 +12177,62 @@
+@@ -11796,47 +11434,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -33097,25 +25775,25 @@
 +	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld='+b $libdir'
 -	  hardcode_libdir_separator=:
- 	  hardcode_direct=no
- 	  hardcode_shlibpath_var=no
- 	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec='-L$libdir'
 -	  hardcode_direct=no
 -	  hardcode_shlibpath_var=no
+-	  ;;
+-	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'
  
-@@ -10203,7 +12246,7 @@
+@@ -11850,7 +11503,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -33124,7 +25802,7 @@
        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'
-@@ -10213,7 +12256,7 @@
+@@ -11860,7 +11513,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -33133,7 +25811,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10236,7 +12279,8 @@
+@@ -11883,7 +11536,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
@@ -33143,7 +25821,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10246,7 +12290,7 @@
+@@ -11893,7 +11547,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -33152,7 +25830,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10257,14 +12301,14 @@
+@@ -11904,14 +11558,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -33169,7 +25847,7 @@
        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'
-@@ -10276,13 +12320,13 @@
+@@ -11923,13 +11577,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -33185,7 +25863,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10290,21 +12334,15 @@
+@@ -11937,21 +11591,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -33211,7 +25889,7 @@
  	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'
-@@ -10313,8 +12351,18 @@
+@@ -11960,8 +11608,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -33232,7 +25910,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10323,7 +12371,7 @@
+@@ -11970,7 +11628,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.
@@ -33241,7 +25919,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10371,36 +12419,45 @@
+@@ -12018,36 +11676,45 @@
        fi
        ;;
  
@@ -33308,14 +25986,8 @@
        ;;
  
      uts4*)
-@@ -10415,15 +12472,10 @@
-     esac
-   fi
- 
--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; }
+@@ -12066,11 +11733,6 @@
+ echo "${ECHO_T}$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -33326,18 +25998,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10441,8 +12493,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
- 
-@@ -10456,6 +12508,7 @@
+@@ -12103,6 +11765,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -33345,24 +26006,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10478,20 +12531,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
-   fi
-   ;;
- esac
- 
--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; }
+@@ -12138,7 +11801,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -33371,7 +26015,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10501,7 +12554,20 @@
+@@ -12148,7 +11811,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -33393,7 +26037,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10566,7 +12632,7 @@
+@@ -12213,7 +11889,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -33402,7 +26046,7 @@
    ;;
  
  beos*)
-@@ -10575,7 +12641,7 @@
+@@ -12222,7 +11898,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -33411,7 +26055,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10591,7 +12657,7 @@
+@@ -12238,7 +11914,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -33420,7 +26064,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10603,7 +12669,8 @@
+@@ -12250,7 +11926,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -33430,7 +26074,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10633,7 +12700,7 @@
+@@ -12280,7 +11957,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -33439,7 +26083,7 @@
        ;;
      esac
      ;;
-@@ -10656,7 +12723,7 @@
+@@ -12303,7 +11980,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -33448,7 +26092,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10679,20 +12746,17 @@
+@@ -12326,20 +12003,17 @@
    dynamic_linker=no
    ;;
  
@@ -33480,7 +26124,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10710,14 +12774,19 @@
+@@ -12357,14 +12031,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -33502,7 +26146,7 @@
    esac
    ;;
  
-@@ -10737,9 +12806,9 @@
+@@ -12384,9 +12063,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -33514,7 +26158,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10754,7 +12823,7 @@
+@@ -12401,7 +12080,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -33523,7 +26167,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10765,7 +12834,7 @@
+@@ -12412,7 +12091,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -33532,7 +26176,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10777,6 +12846,18 @@
+@@ -12424,6 +12103,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -33551,7 +26195,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10820,29 +12901,26 @@
+@@ -12467,29 +12158,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -33588,7 +26232,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10852,6 +12930,18 @@
+@@ -12499,6 +12187,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -33607,7 +26251,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10861,7 +12951,7 @@
+@@ -12508,7 +12208,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -33616,7 +26260,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10889,8 +12979,13 @@
+@@ -12536,8 +12236,13 @@
  
  openbsd*)
    version_type=sunos
@@ -33631,7 +26275,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -10910,7 +13005,7 @@
+@@ -12557,7 +12262,7 @@
  
  os2*)
    libname_spec='$name'
@@ -33640,7 +26284,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -10928,13 +13023,6 @@
+@@ -12575,13 +12280,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -33654,7 +26298,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -10960,7 +13048,7 @@
+@@ -12607,7 +12305,7 @@
    need_version=yes
    ;;
  
@@ -33663,7 +26307,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -10993,6 +13081,29 @@
+@@ -12640,6 +12338,29 @@
    fi
    ;;
  
@@ -33693,25 +26337,17 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11004,16 +13115,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; }
+@@ -12655,12 +12376,17 @@
+ 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
 +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; }
+ { 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 " || \
@@ -33721,729 +26357,301 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11033,8 +13149,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; }
- 
- if test "$hardcode_action" = relink; then
-   # Fast installation is not supported
-@@ -11047,29 +13163,29 @@
- 
- 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"
--  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"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+         { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-        else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { 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
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-     ;;
-   esac
- fi
-@@ -11101,8 +13217,8 @@
- 
-   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
-@@ -11115,39 +13231,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -12790,27 +12516,11 @@
    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
-@@ -11156,14 +13285,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dl_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dl_dlopen=no
-+	ac_cv_lib_dl_dlopen=no
+@@ -12819,7 +12529,7 @@
+ 	ac_cv_lib_dl_dlopen=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        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
-@@ -11177,8 +13307,8 @@
-    ;;
- 
-   *)
--    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
-@@ -11205,52 +13335,59 @@
- 
- #undef shl_load
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shl_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
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != shl_load;
-+return 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
-+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
+@@ -12901,27 +12611,11 @@
    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
-@@ -11259,18 +13396,19 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   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
-+	ac_cv_func_shl_load=no
+@@ -12930,7 +12624,7 @@
+ 	ac_cv_func_shl_load=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        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
--  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
-@@ -11283,39 +13421,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shl_load ();
- int
- main ()
- {
--shl_load ();
-+return 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
-+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
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+@@ -12980,27 +12674,11 @@
    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
-@@ -11324,19 +13475,20 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   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
-+	ac_cv_lib_dld_shl_load=no
+@@ -13009,7 +12687,7 @@
+ 	ac_cv_lib_dld_shl_load=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        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
--  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
-@@ -11363,52 +13515,59 @@
- 
- #undef dlopen
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- /* 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
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != dlopen;
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -13081,27 +12759,11 @@
    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
-@@ -11417,18 +13576,19 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_dlopen=no
-+	ac_cv_func_dlopen=no
+@@ -13110,7 +12772,7 @@
+ 	ac_cv_func_dlopen=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        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
--  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
-@@ -11441,39 +13601,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+ { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+@@ -13160,27 +12822,11 @@
    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
-@@ -11482,19 +13655,20 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dl_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dl_dlopen=no
-+	ac_cv_lib_dl_dlopen=no
+@@ -13189,7 +12835,7 @@
+ 	ac_cv_lib_dl_dlopen=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        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
--  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
-@@ -11507,39 +13681,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -13240,27 +12886,11 @@
    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
-@@ -11548,19 +13735,20 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_svld_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_svld_dlopen=no
-+	ac_cv_lib_svld_dlopen=no
+@@ -13269,7 +12899,7 @@
+ 	ac_cv_lib_svld_dlopen=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        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
--  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
-@@ -11573,39 +13761,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dld_link ();
- int
- main ()
- {
--dld_link ();
-+return 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
-+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
+@@ -13320,27 +12950,11 @@
    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
-@@ -11614,14 +13815,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dld_dld_link=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dld_dld_link=no
-+	ac_cv_lib_dld_dld_link=no
+@@ -13349,7 +12963,7 @@
+ 	ac_cv_lib_dld_dld_link=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        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
-@@ -11656,13 +13858,13 @@
+@@ -13389,7 +13003,7 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -34452,24 +26660,16 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+    { 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
-@@ -11672,7 +13874,7 @@
+@@ -13405,7 +13019,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11675 "configure"
-+#line 13877 "configure"
+-#line 13408 "configure"
++#line 13022 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11729,6 +13931,8 @@
+@@ -13462,6 +13076,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -34478,7 +26678,7 @@
  
      exit (status);
  }
-@@ -11738,12 +13942,12 @@
+@@ -13471,12 +13087,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -34493,35 +26693,25 @@
      esac
    else :
      # compilation failed
-@@ -11754,13 +13958,13 @@
+@@ -13491,7 +13107,7 @@
+ echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
  
- 
- 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
 -      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; }
+       { 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
-@@ -11770,7 +13974,7 @@
+@@ -13503,7 +13119,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11773 "configure"
-+#line 13977 "configure"
+-#line 13506 "configure"
++#line 13122 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11827,6 +14031,8 @@
+@@ -13560,6 +13176,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -34530,7 +26720,7 @@
  
      exit (status);
  }
-@@ -11836,12 +14042,12 @@
+@@ -13569,12 +13187,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -34545,38 +26735,17 @@
      esac
    else :
      # compilation failed
-@@ -11852,8 +14058,8 @@
- 
- 
+@@ -13607,7 +13225,7 @@
  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
  
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -11874,19 +14080,19 @@
- fi
  
- 
 -# 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; }
+ { 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
+@@ -13619,7 +13237,7 @@
  
--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
- 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -34584,7 +26753,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -11895,58 +14101,21 @@
+@@ -13628,47 +13246,10 @@
    fi
    ;;
  
@@ -34632,25 +26801,8 @@
 -  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; }
- 
--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
--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
-@@ -11961,7 +14130,8 @@
+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -13694,7 +13275,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.
@@ -34660,7 +26812,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 \
-@@ -12075,11 +14245,11 @@
+@@ -13808,11 +13390,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -34674,7 +26826,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12109,6 +14279,12 @@
+@@ -13842,6 +13424,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -34687,7 +26839,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12120,6 +14296,9 @@
+@@ -13853,6 +13441,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -34697,7 +26849,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12139,7 +14318,7 @@
+@@ -13872,7 +13463,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -34706,7 +26858,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12170,7 +14349,7 @@
+@@ -13903,7 +13494,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -34715,7 +26867,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12185,7 +14364,7 @@
+@@ -13918,7 +13509,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -34724,7 +26876,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12412,7 +14591,10 @@
+@@ -14145,7 +13736,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.
@@ -34736,23 +26888,7 @@
  fi
  
  
-@@ -12425,11 +14607,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
-@@ -12447,6 +14629,9 @@
+@@ -14180,6 +13774,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -34762,20 +26898,18 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12477,8 +14662,10 @@
+@@ -14210,7 +13807,9 @@
  
        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_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'
-@@ -12497,6 +14684,7 @@
+@@ -14230,6 +13829,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -34783,7 +26917,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12514,7 +14702,7 @@
+@@ -14247,7 +13847,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -34792,7 +26926,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12524,17 +14712,34 @@
+@@ -14257,17 +13857,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -34828,7 +26962,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12545,18 +14750,27 @@
+@@ -14278,18 +13895,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -34859,48 +26993,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12570,18 +14784,18 @@
-   # Set up default GNU C++ configuration
- 
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
--fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -12610,11 +14824,11 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12627,7 +14841,7 @@
+@@ -14360,7 +13986,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,
@@ -34909,27 +27002,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'*)
-@@ -12647,21 +14861,21 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+  { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+@@ -14394,7 +14020,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -34938,18 +27011,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12671,8 +14885,8 @@
-   ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
-@@ -12680,8 +14894,8 @@
+@@ -14413,8 +14039,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
@@ -34960,7 +27022,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12707,7 +14921,7 @@
+@@ -14440,7 +14066,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.
@@ -34969,18 +27031,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12722,8 +14936,8 @@
- fi
- 
- # 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
-+{ 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*)
-@@ -12738,8 +14952,23 @@
+@@ -14471,8 +14097,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -35006,7 +27057,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12756,7 +14985,7 @@
+@@ -14489,7 +14130,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -35015,7 +27066,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12775,8 +15004,12 @@
+@@ -14508,8 +14149,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -35028,7 +27079,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12785,15 +15018,16 @@
+@@ -14518,15 +14163,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -35049,58 +27100,44 @@
      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.
-@@ -12815,23 +15049,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -14560,27 +14206,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -12845,20 +15092,21 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
-+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -14594,19 +14224,18 @@
+ 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -35119,63 +27156,49 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12877,23 +15125,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -14637,27 +14266,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -12907,8 +15168,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
-+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -14671,7 +14284,7 @@
+ 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -12917,16 +15180,26 @@
+@@ -14680,16 +14293,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -35207,7 +27230,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -12940,12 +15213,12 @@
+@@ -14703,12 +14326,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'
@@ -35222,7 +27245,7 @@
        # 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
-@@ -12954,70 +15227,81 @@
+@@ -14717,70 +14340,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -35356,7 +27379,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13028,14 +15312,14 @@
+@@ -14791,14 +14425,14 @@
  	;;
      esac
      ;;
@@ -35373,7 +27396,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13052,12 +15336,12 @@
+@@ -14815,12 +14449,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -35389,7 +27412,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13066,11 +15350,11 @@
+@@ -14829,11 +14463,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.
@@ -35403,7 +27426,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13080,33 +15364,22 @@
+@@ -14843,33 +14477,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -35444,7 +27467,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13117,17 +15390,20 @@
+@@ -14880,17 +14503,20 @@
      esac
  
      case $cc_basename in
@@ -35471,7 +27494,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13143,12 +15419,15 @@
+@@ -14906,12 +14532,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -35491,7 +27514,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13159,11 +15438,25 @@
+@@ -14922,11 +14551,25 @@
  	;;
      esac
      ;;
@@ -35519,7 +27542,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13174,9 +15467,9 @@
+@@ -14937,9 +14580,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -35531,7 +27554,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13185,16 +15478,16 @@
+@@ -14948,16 +14591,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -35552,7 +27575,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13212,20 +15505,44 @@
+@@ -14975,20 +14618,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -35603,7 +27626,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13253,7 +15570,7 @@
+@@ -15016,7 +14683,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -35612,7 +27635,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13263,7 +15580,7 @@
+@@ -15026,7 +14693,7 @@
  	;;
      esac
      ;;
@@ -35621,7 +27644,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13274,15 +15591,31 @@
+@@ -15037,15 +14704,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::"'
      ;;
@@ -35655,7 +27678,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13292,14 +15625,14 @@
+@@ -15055,14 +14738,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -35673,7 +27696,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13317,7 +15650,7 @@
+@@ -15080,7 +14763,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -35682,7 +27705,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13336,13 +15669,13 @@
+@@ -15099,13 +14782,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -35698,7 +27721,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13351,17 +15684,17 @@
+@@ -15114,17 +14797,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -35720,7 +27743,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13380,7 +15713,7 @@
+@@ -15143,7 +14826,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -35729,7 +27752,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13401,27 +15734,14 @@
+@@ -15164,27 +14847,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -35759,7 +27782,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13434,36 +15754,33 @@
+@@ -15197,36 +14867,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -35808,7 +27831,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13471,9 +15788,9 @@
+@@ -15234,9 +14901,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -35820,7 +27843,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13483,9 +15800,9 @@
+@@ -15246,9 +14913,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
@@ -35832,7 +27855,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13494,9 +15811,9 @@
+@@ -15257,9 +14924,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -35844,14 +27867,14 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13509,12 +15826,63 @@
+@@ -15272,12 +14939,63 @@
  	;;
      esac
      ;;
 -  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
 +  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 +    no_undefined_flag_CXX='${wl}-z,text'
-     archive_cmds_need_lc_CXX=no
++    archive_cmds_need_lc_CXX=no
 +    hardcode_shlibpath_var_CXX=no
 +    runpath_var='LD_RUN_PATH'
 +
@@ -35884,7 +27907,7 @@
 +    # names for shared libraries.
 +    no_undefined_flag_CXX='${wl}-z,text'
 +    allow_undefined_flag_CXX='${wl}-z,nodefs'
-+    archive_cmds_need_lc_CXX=no
+     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=':'
@@ -35910,16 +27933,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13534,13 +15902,17 @@
-     ld_shlibs_CXX=no
-     ;;
- esac
--echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6
-+{ 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
- 
+@@ -15304,6 +15022,10 @@
  GCC_CXX="$GXX"
  LD_CXX="$LD"
  
@@ -35930,7 +27944,7 @@
  
  cat > conftest.$ac_ext <<EOF
  class Foo
-@@ -13567,7 +15939,7 @@
+@@ -15330,7 +15052,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.
@@ -35939,7 +27953,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13607,7 +15979,7 @@
+@@ -15370,7 +15092,7 @@
         fi
         ;;
  
@@ -35948,7 +27962,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13643,6 +16015,29 @@
+@@ -15406,6 +15128,29 @@
  
  $rm -f confest.$objext
  
@@ -35978,18 +27992,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13651,8 +16046,8 @@
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
- 
--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
-@@ -13690,6 +16085,10 @@
+@@ -15453,6 +15198,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -36000,7 +28003,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13698,7 +16097,7 @@
+@@ -15461,7 +15210,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -36009,7 +28012,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13723,18 +16122,28 @@
+@@ -15486,18 +15235,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -36041,7 +28044,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13742,22 +16151,22 @@
+@@ -15505,22 +15264,22 @@
  	    ;;
  	esac
  	;;
@@ -36070,7 +28073,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13770,9 +16179,13 @@
+@@ -15533,9 +15292,13 @@
  	    ;;
  	esac
  	;;
@@ -36085,7 +28088,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13781,20 +16194,26 @@
+@@ -15544,20 +15307,26 @@
  	    ;;
  	esac
  	;;
@@ -36116,7 +28119,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13811,25 +16230,25 @@
+@@ -15574,25 +15343,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -36147,7 +28150,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13843,24 +16262,15 @@
+@@ -15606,24 +15375,15 @@
  	;;
        psos*)
  	;;
@@ -36174,7 +28177,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13870,12 +16280,12 @@
+@@ -15633,12 +15393,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -36189,7 +28192,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13885,7 +16295,7 @@
+@@ -15648,7 +15408,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -36198,7 +28201,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -13893,7 +16303,14 @@
+@@ -15656,7 +15416,14 @@
  	    ;;
  	esac
  	;;
@@ -36214,28 +28217,7 @@
  	;;
        vxworks*)
  	;;
-@@ -13903,16 +16320,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
-+{ 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
-+{ 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
-@@ -13926,26 +16343,28 @@
+@@ -15689,18 +15456,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -36243,13 +28225,13 @@
 +   -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:13932: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16349: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15695: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15462: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13936: \$? = $ac_status" >&5
-+   echo "$as_me:16353: \$? = $ac_status" >&5
+-   echo "$as_me:15699: \$? = $ac_status" >&5
++   echo "$as_me:15466: \$? = $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
@@ -36261,31 +28243,19 @@
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-    $rm conftest*
- 
+@@ -15721,7 +15490,7 @@
  fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_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
-@@ -13958,7 +16377,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_CXX=
-@@ -13968,8 +16387,50 @@
+@@ -15731,6 +15500,48 @@
      ;;
  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
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -36328,12 +28298,10 @@
 +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; }
+ { 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
-@@ -13980,60 +16441,58 @@
+@@ -15743,38 +15554,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -36354,13 +28322,13 @@
 +   -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:13999: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16453: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15762: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15566: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14003: \$? = $ac_status" >&5
-+   echo "$as_me:16457: \$? = $ac_status" >&5
+-   echo "$as_me:15766: \$? = $ac_status" >&5
++   echo "$as_me:15570: \$? = $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
@@ -36384,46 +28352,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
- 
- 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
-+  { 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
-+  { 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;}
-@@ -14043,8 +16502,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
-+{ 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
-@@ -14061,22 +16520,20 @@
+@@ -15824,7 +15633,10 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -36435,13 +28364,8 @@
    ;;
    *)
      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
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+@@ -15835,11 +15647,6 @@
+ 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"
@@ -36452,18 +28376,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14094,8 +16551,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
- 
-@@ -14109,6 +16566,7 @@
+@@ -15872,6 +15679,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -36471,24 +28384,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14131,20 +16589,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
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--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; }
+@@ -15907,7 +15715,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -36497,11 +28393,15 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14154,7 +16612,20 @@
+@@ -15917,11 +15725,24 @@
  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
 +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
@@ -36516,10 +28416,14 @@
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
+ # flags to be left without arguments
+ need_version=unknown
  
-@@ -14219,7 +16690,7 @@
+@@ -15982,7 +15803,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -36528,7 +28432,7 @@
    ;;
  
  beos*)
-@@ -14228,7 +16699,7 @@
+@@ -15991,7 +15812,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -36537,7 +28441,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14244,7 +16715,7 @@
+@@ -16007,7 +15828,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -36546,7 +28450,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14256,7 +16727,8 @@
+@@ -16019,7 +15840,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -36556,7 +28460,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14286,7 +16758,7 @@
+@@ -16049,7 +15871,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -36565,7 +28469,7 @@
        ;;
      esac
      ;;
-@@ -14309,7 +16781,7 @@
+@@ -16072,7 +15894,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -36574,7 +28478,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14332,20 +16804,17 @@
+@@ -16095,20 +15917,17 @@
    dynamic_linker=no
    ;;
  
@@ -36606,7 +28510,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14363,14 +16832,19 @@
+@@ -16126,14 +15945,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -36628,7 +28532,7 @@
    esac
    ;;
  
-@@ -14390,9 +16864,9 @@
+@@ -16153,9 +15977,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -36640,7 +28544,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14407,7 +16881,7 @@
+@@ -16170,7 +15994,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -36649,7 +28553,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14418,7 +16892,7 @@
+@@ -16181,7 +16005,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -36658,7 +28562,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14430,6 +16904,18 @@
+@@ -16193,6 +16017,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -36677,7 +28581,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14473,29 +16959,26 @@
+@@ -16236,29 +16072,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -36714,7 +28618,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -14505,6 +16988,18 @@
+@@ -16268,6 +16101,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -36733,7 +28637,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14514,7 +17009,7 @@
+@@ -16277,7 +16122,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -36742,7 +28646,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14542,8 +17037,13 @@
+@@ -16305,8 +16150,13 @@
  
  openbsd*)
    version_type=sunos
@@ -36757,7 +28661,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -14563,7 +17063,7 @@
+@@ -16326,7 +16176,7 @@
  
  os2*)
    libname_spec='$name'
@@ -36766,7 +28670,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14581,13 +17081,6 @@
+@@ -16344,13 +16194,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -36780,7 +28684,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14613,7 +17106,7 @@
+@@ -16376,7 +16219,7 @@
    need_version=yes
    ;;
  
@@ -36789,7 +28693,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14646,6 +17139,29 @@
+@@ -16409,6 +16252,29 @@
    fi
    ;;
  
@@ -36819,25 +28723,17 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14657,16 +17173,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; }
+@@ -16424,12 +16290,17 @@
+ 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
 +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; }
+ { 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" || \
@@ -36847,50 +28743,39 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14686,8 +17207,8 @@
-   # directories.
-   hardcode_action_CXX=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--echo "${ECHO_T}$hardcode_action_CXX" >&6
-+{ 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
-@@ -14698,1228 +17219,413 @@
+@@ -16461,1213 +16332,309 @@
    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
+-{ 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
+-  { 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
+-         { 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
+-  { 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
+-  { 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
@@ -36898,18 +28783,6 @@
 -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=
--   ;;
 +# 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
@@ -36968,10 +28841,11 @@
 +    exclude_expsyms_CXX \
 +    include_expsyms_CXX; do
  
--  cygwin*)
--    lt_cv_dlopen="dlopen"
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
--   ;;
+-    lt_cv_dlopen_self=yes
 +    case $var in
 +    old_archive_cmds_CXX | \
 +    old_archive_from_new_cmds_CXX | \
@@ -36993,11 +28867,30 @@
 +      ;;
 +    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
  
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
++cfgfile="$ofile"
+ 
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+ 
 -  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
@@ -37009,45 +28902,54 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+  case $lt_echo in
-+  *'\$0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+    ;;
-+  esac
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -37055,38 +28957,43 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+cfgfile="$ofile"
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
  
--ac_cv_lib_dl_dlopen=no
+-	ac_cv_lib_dl_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
-+  cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
  
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
  
 -fi
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
  
 -   ;;
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
  
 -  *)
--    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
@@ -37099,78 +29006,88 @@
 -/* 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
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
  
 -/* 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.  */
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
  
 -#undef shl_load
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--{
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char shl_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
--#else
--char (*f) () = shl_load;
 -#endif
--#ifdef __cplusplus
--}
--#endif
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# A C compiler.
++LTCC=$lt_LTCC
  
 -int
 -main ()
 -{
--return f != shl_load;
+-return 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
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -37178,23 +29095,24 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
  
--ac_cv_func_shl_load=no
+-	ac_cv_func_shl_load=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# A language-specific compiler.
++CC=$lt_compiler_CXX
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-{ 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
+-  { 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
@@ -37206,42 +29124,55 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -int
 -main ()
 -{
--shl_load ();
+-return 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
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -37249,23 +29180,25 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# An ERE matcher.
++EGREP=$lt_EGREP
  
--ac_cv_lib_dld_shl_load=no
+-	ac_cv_lib_dld_shl_load=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# The linker used to build libraries.
++LD=$lt_LD_CXX
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-{ 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
+-  { 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
@@ -37278,76 +29211,83 @@
 -/* 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
-+# A C compiler.
-+LTCC=$lt_LTCC
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
  
 -/* 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.  */
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# A BSD-compatible nm program.
++NM=$lt_NM
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# A symbol stripping program
++STRIP=$lt_STRIP
  
 -#undef dlopen
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--{
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -/* 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
--#else
--char (*f) () = dlopen;
 -#endif
--#ifdef __cplusplus
--}
--#endif
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
  
 -int
 -main ()
 -{
--return f != dlopen;
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -37355,21 +29295,24 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
  
--ac_cv_func_dlopen=no
+-	ac_cv_func_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# Used on cygwin: assembler.
++AS="$AS"
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-{ 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
+-  { 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
@@ -37381,42 +29324,55 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -37424,22 +29380,26 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
--ac_cv_lib_dl_dlopen=no
+-	ac_cv_lib_dl_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  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
@@ -37451,42 +29411,55 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# Object file suffix (normally "o").
++objext="$ac_objext"
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -37494,22 +29467,25 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# Old archive suffix (normally "a").
++libext="$libext"
  
--ac_cv_lib_svld_dlopen=no
+-	ac_cv_lib_svld_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-{ 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
+-  { 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
@@ -37521,42 +29497,55 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# 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
--/* 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
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -37564,92 +29553,95 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
  
--ac_cv_lib_dld_dld_link=no
+-	ac_cv_lib_dld_dld_link=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_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
-+# Used on cygwin: assembler.
-+AS="$AS"
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
  
 -fi
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
  
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
++# Do we need a version for libraries?
++need_version=$need_version
  
 -fi
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
  
-+# Old archive suffix (normally "a").
-+libext="$libext"
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
  
 -fi
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
-+# Executable file suffix (normally "").
-+exeext="$exeext"
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
  
 -fi
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
  
 -fi
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
  
 -    ;;
 -  esac
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
  
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
 -  fi
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# Library versioning type.
++version_type=$version_type
  
 -  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 a version for libraries?
-+need_version=$need_version
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
  
 -    save_LDFLAGS="$LDFLAGS"
 -    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
++# 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
  
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
--    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
@@ -37659,20 +29651,23 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15328 "configure"
+-#line 17177 "configure"
 -#include "confdefs.h"
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# 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
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
  
 -#include <stdio.h>
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# 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
@@ -37683,8 +29678,11 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# 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. */
@@ -37707,22 +29705,25 @@
 -#    endif
 -#  endif
 -#endif
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# 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
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# 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;
-+# Library versioning type.
-+version_type=$version_type
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
  
 -  if (self)
 -    {
@@ -37730,8 +29731,9 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
  
 -    exit (status);
 -}
@@ -37754,26 +29756,25 @@
 -  fi
 -fi
 -rm -fr conftest*
-+# 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
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
  
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# 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" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&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
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&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
  
 -    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
+-      { 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
@@ -37783,23 +29784,20 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15426 "configure"
+-#line 17275 "configure"
 -#include "confdefs.h"
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# 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
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
  
 -#include <stdio.h>
-+# 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
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -37810,10 +29808,7 @@
 -#    define LT_DLGLOBAL		0
 -#  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
- 
+-
 -/* 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
@@ -37835,36 +29830,24 @@
 -#    endif
 -#  endif
 -#endif
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
- 
+-
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
- 
+-
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_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 before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
- 
+-
 -    exit (status);
 -}
 -EOF
@@ -37889,40 +29872,28 @@
 -
 -
 -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
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
- 
+-
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
-+# 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 $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
- 
+-
 -  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
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
- 
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
- 
+-
+-
 -# 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
@@ -37979,9 +29950,7 @@
 -    lt_cv_prog_compiler_c_o_CXX \
 -    exclude_expsyms_CXX \
 -    include_expsyms_CXX; do
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
- 
+-
 -    case $var in
 -    old_archive_cmds_CXX | \
 -    old_archive_from_new_cmds_CXX | \
@@ -38003,162 +29972,98 @@
 -      ;;
 -    esac
 -  done
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
- 
+-
 -  case $lt_echo in
 -  *'\$0 --fallback-echo"')
 -    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
 -    ;;
 -  esac
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
- 
+-
 -cfgfile="$ofile"
-+# 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
- 
+-
 -  cat <<__EOF__ >> "$cfgfile"
 -# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
- 
+-
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# 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
- 
+-
 -# Shell to use when invoking shell scripts.
 -SHELL=$lt_SHELL
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
- 
+-
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
- 
+-
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
- 
+-
 -# Whether or not to add -lc for building shared libraries.
 -build_libtool_need_lc=$archive_cmds_need_lc_CXX
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_CXX
- 
+-
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
- 
+-
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
-+# 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
- 
+-
 -# The host system.
 -host_alias=$host_alias
 -host=$host
-+# 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
- 
+-
 -# An echo program that does not interpret backslashes.
 -echo=$lt_echo
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
- 
+-
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_CXX
- 
+-
 -# A C compiler.
 -LTCC=$lt_LTCC
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_CXX
- 
+-
 -# A language-specific compiler.
 -CC=$lt_compiler_CXX
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
- 
+-
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC_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
- 
+-
 -# An ERE matcher.
 -EGREP=$lt_EGREP
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
- 
+-
 -# The linker used to build libraries.
 -LD=$lt_LD_CXX
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_CXX
- 
+-
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- 
+-
 -# A BSD-compatible nm program.
 -NM=$lt_NM
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
+-
 -# A symbol stripping program
 -STRIP=$STRIP
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_CXX"
- 
+-
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
- 
+-
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_CXX
- 
+-
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
- 
+-
 -# Used on cygwin: assembler.
 -AS="$AS"
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
- 
+-
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
- 
+-
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
-+# ### END LIBTOOL TAG CONFIG: $tagname
- 
+-
 -# How to pass a linker flag through the compiler.
 -wl=$lt_lt_prog_compiler_wl_CXX
-+__EOF__
- 
+-
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
- 
+-
 -# Old archive suffix (normally "a").
 -libext="$libext"
 -
@@ -38281,120 +30186,24 @@
 -
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag_CXX
--
--# 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
--
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
--# 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_CXX
--
--# 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_CXX
--
--# 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
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_CXX
--
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_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
--
--# 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_CXX
--
--# 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_CXX"
--
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_CXX
--
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_CXX
--
--# 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_CXX
--
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_CXX
--
--# ### END LIBTOOL TAG CONFIG: $tagname
--
--__EOF__
--
--
--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.
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+ 
+ # Commands used to finish a libtool library installation in a directory.
+ finish_cmds=$lt_finish_cmds
+@@ -17767,7 +16734,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"
--fi
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
 +  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
 +  fi
-+fi
+ fi
  
  
- ac_ext=c
-@@ -15990,29 +17696,55 @@
+@@ -17839,16 +16809,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -38434,23 +30243,12 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
--echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
- 
--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 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 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
  
+ { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+@@ -17861,7 +16857,7 @@
+ 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -38458,7 +30256,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16020,21 +17752,21 @@
+@@ -17869,8 +16865,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -38470,38 +30268,17 @@
 +  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; }
+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -17883,8 +16881,6 @@
+ { echo "$as_me:$LINENO: result: $enable_static" >&5
+ echo "${ECHO_T}$enable_static" >&6; }
  
--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
--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; }
- 
+-
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16043,8 +17775,8 @@
- lt_prog_compiler_pic_F77=
- lt_prog_compiler_static_F77=
  
--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_F77='-Wl,'
-@@ -16082,6 +17814,11 @@
+@@ -17931,6 +16927,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -38513,7 +30290,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16098,7 +17835,7 @@
+@@ -17947,7 +16948,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -38522,7 +30299,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16124,6 +17861,16 @@
+@@ -17973,6 +16974,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -38539,7 +30316,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16135,7 +17882,7 @@
+@@ -17984,7 +16995,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.
@@ -38548,7 +30325,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16158,13 +17905,20 @@
+@@ -18007,13 +17018,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -38571,7 +30348,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16179,15 +17933,15 @@
+@@ -18028,15 +17046,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -38593,7 +30370,7 @@
        ;;
  
      sunos4*)
-@@ -16196,7 +17950,7 @@
+@@ -18045,7 +17063,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -38602,7 +30379,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16209,6 +17963,17 @@
+@@ -18058,6 +17076,17 @@
        fi
        ;;
  
@@ -38620,28 +30397,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16220,16 +17985,16 @@
-     esac
-   fi
- 
--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
- 
--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
-@@ -16243,26 +18008,28 @@
+@@ -18092,18 +17121,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -38649,13 +30405,13 @@
 +   -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:16249: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18014: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18098: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17127: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16253: \$? = $ac_status" >&5
-+   echo "$as_me:18018: \$? = $ac_status" >&5
+-   echo "$as_me:18102: \$? = $ac_status" >&5
++   echo "$as_me:17131: \$? = $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
@@ -38667,33 +30423,19 @@
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-    $rm conftest*
- 
+@@ -18124,7 +17155,7 @@
  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
-@@ -16275,7 +18042,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=
-@@ -16285,10 +18052,52 @@
+@@ -18134,6 +17165,48 @@
      ;;
  esac
  
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -38736,14 +30478,10 @@
 +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_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
-@@ -16297,60 +18106,58 @@
+ { 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
+@@ -18146,38 +17219,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -38764,13 +30502,13 @@
 +   -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:16316: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18118: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18165: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17231: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16320: \$? = $ac_status" >&5
-+   echo "$as_me:18122: \$? = $ac_status" >&5
+-   echo "$as_me:18169: \$? = $ac_status" >&5
++   echo "$as_me:17235: \$? = $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
@@ -38794,46 +30532,7 @@
     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
--  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
--  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;}
-@@ -16360,8 +18167,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
-+{ 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_F77=
-@@ -16399,6 +18206,16 @@
+@@ -18248,6 +17319,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -38850,7 +30549,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16409,6 +18226,10 @@
+@@ -18258,6 +17339,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -38861,7 +30560,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16419,6 +18240,27 @@
+@@ -18268,6 +17353,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -38889,7 +30588,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16456,7 +18298,7 @@
+@@ -18305,7 +17411,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -38898,7 +30597,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16466,13 +18308,13 @@
+@@ -18315,13 +17421,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'
@@ -38915,7 +30614,7 @@
  	# 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
-@@ -16481,23 +18323,70 @@
+@@ -18330,23 +17436,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -38924,9 +30623,10 @@
        else
 -	ld_shlibs=no
 +	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    netbsd*)
 +    interix3*)
 +      hardcode_direct_F77=no
 +      hardcode_shlibpath_var_F77=no
@@ -38971,10 +30671,9 @@
 +	link_all_deplibs_F77=no
 +      else
 +	ld_shlibs_F77=no
-       fi
-       ;;
- 
--    netbsd*)
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -38992,7 +30691,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16511,13 +18400,40 @@
+@@ -18360,13 +17513,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -39035,7 +30734,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16527,24 +18443,19 @@
+@@ -18376,24 +17556,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -39067,7 +30766,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16556,7 +18467,7 @@
+@@ -18405,7 +17580,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -39076,7 +30775,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16578,9 +18489,21 @@
+@@ -18427,9 +17602,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
@@ -39100,7 +30799,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16597,7 +18520,7 @@
+@@ -18446,7 +17633,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -39109,7 +30808,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16616,8 +18539,12 @@
+@@ -18465,8 +17652,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -39122,7 +30821,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16625,44 +18552,58 @@
+@@ -18474,22 +17665,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -39153,56 +30852,44 @@
        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;;
-+  *) 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
+@@ -18507,27 +17699,11 @@
    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;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$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
-@@ -16676,19 +18617,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
-+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -18541,18 +17717,17 @@
+ 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -39221,63 +30908,49 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16697,23 +18639,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;;
-+  *) 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
+@@ -18573,27 +17748,11 @@
    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;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$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
-@@ -16727,8 +18682,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
-+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -18607,7 +17766,7 @@
+ 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16737,13 +18694,11 @@
+@@ -18616,13 +17775,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -39294,7 +30967,7 @@
  	fi
        fi
        ;;
-@@ -16756,7 +18711,7 @@
+@@ -18635,7 +17792,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -39303,7 +30976,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16766,68 +18721,68 @@
+@@ -18645,68 +17802,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -39416,7 +31089,7 @@
      fi
        ;;
  
-@@ -16861,8 +18816,8 @@
+@@ -18740,8 +17897,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -39427,7 +31100,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -16870,7 +18825,7 @@
+@@ -18749,7 +17906,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -39436,7 +31109,7 @@
        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
-@@ -16884,47 +18839,62 @@
+@@ -18763,47 +17920,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -39523,7 +31196,7 @@
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -16938,7 +18908,7 @@
+@@ -18817,7 +17989,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -39532,7 +31205,7 @@
        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'
-@@ -16948,7 +18918,7 @@
+@@ -18827,7 +17999,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -39541,7 +31214,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -16971,7 +18941,8 @@
+@@ -18850,7 +18022,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
@@ -39551,7 +31224,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -16981,7 +18952,7 @@
+@@ -18860,7 +18033,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -39560,7 +31233,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -16992,14 +18963,14 @@
+@@ -18871,14 +18044,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -39577,7 +31250,7 @@
        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'
-@@ -17011,13 +18982,13 @@
+@@ -18890,13 +18063,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -39593,7 +31266,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17025,21 +18996,15 @@
+@@ -18904,21 +18077,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -39619,7 +31292,7 @@
  	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'
-@@ -17048,8 +19013,18 @@
+@@ -18927,8 +18094,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -39640,7 +31313,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17058,7 +19033,7 @@
+@@ -18937,7 +18114,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.
@@ -39649,7 +31322,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17106,36 +19081,45 @@
+@@ -18985,36 +18162,45 @@
        fi
        ;;
  
@@ -39716,14 +31389,8 @@
        ;;
  
      uts4*)
-@@ -17150,15 +19134,10 @@
-     esac
-   fi
- 
--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; }
+@@ -19033,11 +18219,6 @@
+ 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"
@@ -39734,18 +31401,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17176,8 +19155,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
- 
-@@ -17191,6 +19170,7 @@
+@@ -19070,6 +18251,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -39753,24 +31409,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17213,20 +19193,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
- 
--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; }
+@@ -19105,7 +18287,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -39779,7 +31418,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17236,7 +19216,20 @@
+@@ -19115,7 +18297,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -39801,7 +31440,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17301,7 +19294,7 @@
+@@ -19180,7 +18375,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -39810,7 +31449,7 @@
    ;;
  
  beos*)
-@@ -17310,7 +19303,7 @@
+@@ -19189,7 +18384,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -39819,7 +31458,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17326,7 +19319,7 @@
+@@ -19205,7 +18400,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -39828,7 +31467,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17338,7 +19331,8 @@
+@@ -19217,7 +18412,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -39838,7 +31477,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17368,7 +19362,7 @@
+@@ -19247,7 +18443,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -39847,7 +31486,7 @@
        ;;
      esac
      ;;
-@@ -17391,7 +19385,7 @@
+@@ -19270,7 +18466,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -39856,7 +31495,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17414,20 +19408,17 @@
+@@ -19293,20 +18489,17 @@
    dynamic_linker=no
    ;;
  
@@ -39888,7 +31527,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17445,14 +19436,19 @@
+@@ -19324,14 +18517,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -39910,7 +31549,7 @@
    esac
    ;;
  
-@@ -17472,9 +19468,9 @@
+@@ -19351,9 +18549,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -39922,7 +31561,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17489,7 +19485,7 @@
+@@ -19368,7 +18566,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -39931,7 +31570,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17500,7 +19496,7 @@
+@@ -19379,7 +18577,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -39940,7 +31579,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17512,6 +19508,18 @@
+@@ -19391,6 +18589,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -39959,7 +31598,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17555,29 +19563,26 @@
+@@ -19434,29 +18644,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -39996,7 +31635,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -17587,6 +19592,18 @@
+@@ -19466,6 +18673,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -40015,7 +31654,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17596,7 +19613,7 @@
+@@ -19475,7 +18694,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -40024,7 +31663,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17624,8 +19641,13 @@
+@@ -19503,8 +18722,13 @@
  
  openbsd*)
    version_type=sunos
@@ -40039,7 +31678,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -17645,7 +19667,7 @@
+@@ -19524,7 +18748,7 @@
  
  os2*)
    libname_spec='$name'
@@ -40048,7 +31687,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17663,13 +19685,6 @@
+@@ -19542,13 +18766,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -40062,7 +31701,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17695,7 +19710,7 @@
+@@ -19574,7 +18791,7 @@
    need_version=yes
    ;;
  
@@ -40071,7 +31710,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17728,6 +19743,29 @@
+@@ -19607,6 +18824,29 @@
    fi
    ;;
  
@@ -40101,25 +31740,17 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17739,16 +19777,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; }
+@@ -19622,12 +18862,17 @@
+ 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
 +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; }
+ { 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" || \
@@ -40129,46 +31760,35 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17768,8 +19811,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; }
- 
- if test "$hardcode_action_F77" = relink; then
-   # Fast installation is not supported
-@@ -17780,36 +19823,6 @@
+@@ -19659,36 +18904,6 @@
    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
+-{ 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
+-  { 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
+-         { 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
+-  { 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
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -    ;;
 -  esac
 -fi
@@ -40177,7 +31797,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17824,7 +19837,8 @@
+@@ -19703,7 +18918,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.
@@ -40187,7 +31807,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 \
-@@ -17924,6 +19938,12 @@
+@@ -19803,6 +19019,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -40200,7 +31820,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -17935,6 +19955,9 @@
+@@ -19814,6 +19036,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -40210,7 +31830,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -17954,7 +19977,7 @@
+@@ -19833,7 +19058,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -40219,7 +31839,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -17985,7 +20008,7 @@
+@@ -19864,7 +19089,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -40228,7 +31848,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18000,7 +20023,7 @@
+@@ -19879,7 +19104,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -40237,7 +31857,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18202,7 +20225,10 @@
+@@ -20081,7 +19306,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.
@@ -40249,15 +31869,7 @@
  fi
  
  
-@@ -18223,7 +20249,6 @@
- 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
- 
- 
--
- # Source file extension for Java test sources.
- ac_ext=java
- 
-@@ -18235,26 +20260,59 @@
+@@ -20113,26 +19341,59 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -40318,18 +31930,7 @@
  
  lt_prog_compiler_no_builtin_flag_GCJ=
  
-@@ -18262,8 +20320,8 @@
-   lt_prog_compiler_no_builtin_flag_GCJ=' -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
- else
-@@ -18277,26 +20335,28 @@
+@@ -20155,18 +19416,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -40337,13 +31938,13 @@
 +   -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:18283: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20341: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:20161: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19422: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18287: \$? = $ac_status" >&5
-+   echo "$as_me:20345: \$? = $ac_status" >&5
+-   echo "$as_me:20165: \$? = $ac_status" >&5
++   echo "$as_me:19426: \$? = $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
@@ -40355,28 +31956,7 @@
         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
-+{ 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"
-@@ -18310,8 +20370,8 @@
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_static_GCJ=
- 
--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_GCJ='-Wl,'
-@@ -18349,6 +20409,11 @@
+@@ -20227,6 +19490,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -40388,7 +31968,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18365,7 +20430,7 @@
+@@ -20243,7 +19511,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -40397,7 +31977,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18391,6 +20456,16 @@
+@@ -20269,6 +19537,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -40414,7 +31994,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18402,7 +20477,7 @@
+@@ -20280,7 +19558,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.
@@ -40423,7 +32003,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18425,13 +20500,20 @@
+@@ -20303,13 +19581,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -40446,7 +32026,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18446,15 +20528,15 @@
+@@ -20324,15 +19609,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -40468,7 +32048,7 @@
        ;;
  
      sunos4*)
-@@ -18463,7 +20545,7 @@
+@@ -20341,7 +19626,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -40477,7 +32057,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18476,6 +20558,17 @@
+@@ -20354,6 +19639,17 @@
        fi
        ;;
  
@@ -40495,28 +32075,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18487,16 +20580,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-+{ 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
- 
--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
-+{ 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
-@@ -18510,26 +20603,28 @@
+@@ -20388,18 +19684,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -40524,13 +32083,13 @@
 +   -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:18516: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20609: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:20394: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19690: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18520: \$? = $ac_status" >&5
-+   echo "$as_me:20613: \$? = $ac_status" >&5
+-   echo "$as_me:20398: \$? = $ac_status" >&5
++   echo "$as_me:19694: \$? = $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
@@ -40542,31 +32101,19 @@
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-    $rm conftest*
- 
+@@ -20420,7 +19718,7 @@
  fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $lt_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
-@@ -18542,7 +20637,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_GCJ=
-@@ -18552,8 +20647,50 @@
+@@ -20430,6 +19728,48 @@
      ;;
  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
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -40609,12 +32156,10 @@
 +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; }
+ { 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
-@@ -18564,60 +20701,58 @@
+@@ -20442,38 +19782,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -40635,13 +32180,13 @@
 +   -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:18583: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20713: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:20461: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19794: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18587: \$? = $ac_status" >&5
-+   echo "$as_me:20717: \$? = $ac_status" >&5
+-   echo "$as_me:20465: \$? = $ac_status" >&5
++   echo "$as_me:19798: \$? = $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
@@ -40665,46 +32210,7 @@
     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
-+{ 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
-+  { 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
-+  { 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;}
-@@ -18627,8 +20762,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
-+{ 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=
-@@ -18666,6 +20801,16 @@
+@@ -20544,6 +19882,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -40721,7 +32227,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18676,6 +20821,10 @@
+@@ -20554,6 +19902,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -40732,7 +32238,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18686,6 +20835,27 @@
+@@ -20564,6 +19916,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -40760,7 +32266,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18723,7 +20893,7 @@
+@@ -20601,7 +19974,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -40769,7 +32275,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18733,13 +20903,13 @@
+@@ -20611,13 +19984,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'
@@ -40786,7 +32292,7 @@
  	# 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
-@@ -18748,23 +20918,70 @@
+@@ -20626,23 +19999,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -40863,7 +32369,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18778,13 +20995,40 @@
+@@ -20656,13 +20076,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -40906,7 +32412,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18794,24 +21038,19 @@
+@@ -20672,24 +20119,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -40938,7 +32444,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18823,7 +21062,7 @@
+@@ -20701,7 +20143,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -40947,7 +32453,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18845,9 +21084,21 @@
+@@ -20723,9 +20165,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
@@ -40971,7 +32477,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18864,7 +21115,7 @@
+@@ -20742,7 +20196,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -40980,7 +32486,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -18883,8 +21134,12 @@
+@@ -20761,8 +20215,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -40993,7 +32499,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -18892,22 +21147,23 @@
+@@ -20770,22 +20228,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -41024,58 +32530,44 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -18923,23 +21179,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -20813,27 +20272,11 @@
    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
-@@ -18953,19 +21222,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
-+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -20847,18 +20290,17 @@
+ 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -41094,63 +32586,49 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -18984,23 +21254,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -20889,27 +20331,11 @@
    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
-@@ -19014,8 +21297,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
-+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -20923,7 +20349,7 @@
+ 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -19024,13 +21309,11 @@
+@@ -20932,13 +20358,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -41167,7 +32645,7 @@
  	fi
        fi
        ;;
-@@ -19043,7 +21326,7 @@
+@@ -20951,7 +20375,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -41176,7 +32654,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19053,68 +21336,68 @@
+@@ -20961,68 +20385,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -41289,7 +32767,7 @@
      fi
        ;;
  
-@@ -19148,8 +21431,8 @@
+@@ -21056,8 +20480,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -41300,7 +32778,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19157,7 +21440,7 @@
+@@ -21065,7 +20489,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -41309,7 +32787,7 @@
        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
-@@ -19171,47 +21454,62 @@
+@@ -21079,47 +20503,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -41396,7 +32874,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19225,7 +21523,7 @@
+@@ -21133,7 +20572,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -41405,7 +32883,7 @@
        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'
-@@ -19235,7 +21533,7 @@
+@@ -21143,7 +20582,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -41414,7 +32892,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19258,7 +21556,8 @@
+@@ -21166,7 +20605,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
@@ -41424,7 +32902,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19268,7 +21567,7 @@
+@@ -21176,7 +20616,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -41433,7 +32911,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19279,14 +21578,14 @@
+@@ -21187,14 +20627,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -41450,7 +32928,7 @@
        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'
-@@ -19298,13 +21597,13 @@
+@@ -21206,13 +20646,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -41466,7 +32944,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19312,21 +21611,15 @@
+@@ -21220,21 +20660,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -41492,7 +32970,7 @@
  	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'
-@@ -19335,8 +21628,18 @@
+@@ -21243,8 +20677,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -41513,7 +32991,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19345,7 +21648,7 @@
+@@ -21253,7 +20697,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.
@@ -41522,7 +33000,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19393,1506 +21696,746 @@
+@@ -21301,36 +20745,45 @@
        fi
        ;;
  
@@ -41530,22 +33008,30 @@
 -      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
 -      ;;
--
++      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'
--      fi
++	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
--      ;;
--
+       ;;
+ 
 -    sysv5*)
 -      no_undefined_flag_GCJ=' -z text'
 -      # $CC -shared without GNU ld will not create a library from C++
@@ -41554,289 +33040,143 @@
 -      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'
--      ;;
--
--    uts4*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    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
--      ;;
--
--    *)
--      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
--
++      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*)
+@@ -21349,11 +20802,6 @@
+ 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
 -
--#
--# Do we need to explicitly link libc?
--#
--case "x$archive_cmds_need_lc_GCJ" in
--x|xyes)
--  # Assume -lc should be added
--  archive_cmds_need_lc_GCJ=yes
--
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $archive_cmds_GCJ in
--    *'~'*)
--      # FIXME: we may have to deal with multi-command sequences.
--      ;;
--    '$CC '*)
--      # Test whether the compiler implicitly links with -lc since on some
--      # systems, -lgcc has to come before -lc. If gcc already passes -lc
--      # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
--      $rm conftest*
--      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 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
--      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
--
--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=
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -21386,6 +20834,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=
+@@ -21421,7 +20870,7 @@
+ 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=
+@@ -21431,7 +20880,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
--
--  # AIX 3 has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}${shared_ext}$major'
--  ;;
--
--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.
++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
+ 
+@@ -21496,7 +20958,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
--  ;;
--
++  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*)
+@@ -21505,7 +20967,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
--  ;;
--
--cygwin* | mingw* | pw32*)
--  version_type=windows
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -21521,7 +20983,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
 -  shrext=".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~
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -21533,7 +20995,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
--
--    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'
++      $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'
+@@ -21563,7 +21026,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}'
--      ;;
--    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
--  ;;
--
--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
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -21586,7 +21049,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"`
+@@ -21609,20 +21072,17 @@
+   dynamic_linker=no
+   ;;
+ 
 -kfreebsd*-gnu*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -41851,120 +33191,95 @@
 -
 -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
--      ;;
--  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*)
+@@ -21640,14 +21100,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
--  ;;
--
--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
++  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
+   ;;
+ 
+@@ -21667,9 +21132,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
+@@ -21684,7 +21149,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
+@@ -21695,7 +21160,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'
--  ;;
--
--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
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -21707,6 +21172,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -21737,1156 +21214,277 @@
+     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}"
@@ -42162,12 +33477,12 @@
 -  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
 -
--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
+-{ 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" || \
@@ -42191,8 +33506,8 @@
 -  # directories.
 -  hardcode_action_GCJ=unsupported
 -fi
--echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--echo "${ECHO_T}$hardcode_action_GCJ" >&6
+-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
 -
 -if test "$hardcode_action_GCJ" = relink; then
 -  # Fast installation is not supported
@@ -42205,29 +33520,29 @@
 -
 -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"
--  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"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-         { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 -       else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { 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
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -    ;;
 -  esac
 -fi
@@ -42259,8 +33574,8 @@
 -
 -  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
@@ -42273,39 +33588,52 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -42314,14 +33642,15 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_cv_lib_dl_dlopen=no
+-	ac_cv_lib_dl_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
@@ -42335,8 +33664,8 @@
 -   ;;
 -
 -  *)
--    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
@@ -42363,52 +33692,59 @@
 -
 -#undef shl_load
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--{
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char shl_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
--#else
--char (*f) () = shl_load;
 -#endif
--#ifdef __cplusplus
--}
--#endif
 -
 -int
 -main ()
 -{
--return f != shl_load;
+-return 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
+-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
@@ -42417,18 +33753,19 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_cv_func_shl_load=no
+-	ac_cv_func_shl_load=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_func_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
--  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
@@ -42441,39 +33778,52 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -int
 -main ()
 -{
--shl_load ();
+-return 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
+-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
@@ -42482,19 +33832,20 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_cv_lib_dld_shl_load=no
+-	ac_cv_lib_dld_shl_load=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_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
--  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
@@ -42521,52 +33872,59 @@
 -
 -#undef dlopen
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--{
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -/* 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
--#else
--char (*f) () = dlopen;
 -#endif
--#ifdef __cplusplus
--}
--#endif
 -
 -int
 -main ()
 -{
--return f != dlopen;
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -42575,18 +33933,19 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_cv_func_dlopen=no
+-	ac_cv_func_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_func_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
--  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
@@ -42599,39 +33958,52 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -42639,21 +34011,21 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+      runpath_var='LD_RUN_PATH'
- 
--ac_cv_lib_dl_dlopen=no
+-
+-	ac_cv_lib_dl_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  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
@@ -42665,48 +34037,53 @@
 -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.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -42714,36 +34091,21 @@
 -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
+-
+-	ac_cv_lib_svld_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_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
--  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
@@ -42755,409 +34117,111 @@
 -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.  */
+-
+-/* 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 dld_link ();
 -int
 -main ()
 -{
--dld_link ();
+-return 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
+-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
-+    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_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
-+  (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
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$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
-+  (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
+-
+-	ac_cv_lib_dld_dld_link=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_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"
-+{ 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
+-
+-    { 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
@@ -43167,80 +34231,15 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20697 "configure"
+-#line 22691 "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
@@ -43250,36 +34249,6 @@
 -#    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}"
@@ -43409,8 +34378,8 @@
 +  ;;
  
 -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; }
 +newsos6)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -43420,8 +34389,8 @@
  
 -    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
+-      { 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
@@ -43431,7 +34400,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20795 "configure"
+-#line 22789 "configure"
 -#include "confdefs.h"
 +nto-qnx*)
 +  version_type=linux
@@ -43636,14 +34605,14 @@
 -rm -fr conftest*
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
-+
+ 
 +*)
 +  dynamic_linker=no
 +  ;;
@@ -43656,8 +34625,8 @@
 +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: 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
  
 -    CPPFLAGS="$save_CPPFLAGS"
@@ -43711,7 +34680,7 @@
  fi
  
  
-@@ -20909,7 +22452,8 @@
+@@ -22903,7 +21501,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.
@@ -43721,7 +34690,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 \
-@@ -21009,6 +22553,12 @@
+@@ -23003,6 +21602,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -43734,7 +34703,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21020,6 +22570,9 @@
+@@ -23014,6 +21619,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -43744,7 +34713,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21039,7 +22592,7 @@
+@@ -23033,7 +21641,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -43753,7 +34722,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21070,7 +22623,7 @@
+@@ -23064,7 +21672,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -43762,7 +34731,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21085,7 +22638,7 @@
+@@ -23079,7 +21687,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -43771,7 +34740,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21287,7 +22840,10 @@
+@@ -23281,7 +21889,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.
@@ -43783,15 +34752,7 @@
  fi
  
  
-@@ -21307,7 +22863,6 @@
-       RC)
- 
- 
--
- # Source file extension for RC test sources.
- ac_ext=rc
- 
-@@ -21326,15 +22881,42 @@
+@@ -23319,15 +21930,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -43834,7 +34795,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21350,7 +22932,8 @@
+@@ -23343,7 +21981,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.
@@ -43844,7 +34805,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 \
-@@ -21450,6 +23033,12 @@
+@@ -23443,6 +22082,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -43857,7 +34818,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21461,6 +23050,9 @@
+@@ -23454,6 +22099,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -43867,7 +34828,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21480,7 +23072,7 @@
+@@ -23473,7 +22121,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -43876,7 +34837,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21511,7 +23103,7 @@
+@@ -23504,7 +22152,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -43885,7 +34846,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21526,7 +23118,7 @@
+@@ -23519,7 +22167,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -43894,7 +34855,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21728,7 +23320,10 @@
+@@ -23721,7 +22369,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.
@@ -43906,7 +34867,7 @@
  fi
  
  
-@@ -21775,7 +23370,7 @@
+@@ -23768,7 +22419,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -43915,227 +34876,48 @@
  
  # Prevent multiple expansion
  
-@@ -21830,8 +23425,8 @@
- 
-     # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGFMT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -21857,17 +23452,17 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test -n "$MSGFMT"; then
--  echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6
-+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-     # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GMSGFMT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -21882,32 +23477,33 @@
+@@ -23875,7 +22526,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-   ;;
- esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
--
- if test -n "$GMSGFMT"; then
--  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--echo "${ECHO_T}$GMSGFMT" >&6
-+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
-+
-      if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
--        echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
--echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
-+        { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-+echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
-         GMSGFMT=":"
-       fi
-       MSGFMT=$GMSGFMT
-@@ -21916,8 +23512,8 @@
- 
-       # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -21943,11 +23539,11 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test -n "$XGETTEXT"; then
--  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--echo "${ECHO_T}$XGETTEXT" >&6
-+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
-@@ -21955,8 +23551,8 @@
- 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- 	  : ;
- 	else
--	  echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
--echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
-+	  { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
-+echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
- 	  XGETTEXT=":"
- 	fi
-       fi
-@@ -22050,8 +23646,7 @@
- 
- 
- 
--
--     ac_ext=cc
-+     ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22063,8 +23658,8 @@
-     ac_save_CXXFLAGS="$CXXFLAGS"
-     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
- 
--    echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
--echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
-+echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
-     if test "${kde_cv_stl_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22092,23 +23687,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -24097,27 +22748,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22117,15 +23725,16 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_stl_works=no
-+	kde_cv_stl_works=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
- 
--   echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
--echo "${ECHO_T}$kde_cv_stl_works" >&6
-+   { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
-+echo "${ECHO_T}$kde_cv_stl_works" >&6; }
- 
-    if test "$kde_cv_stl_works" = "yes"; then
-      # back compatible
-@@ -22154,15 +23763,14 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for strlcat" >&5
--echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for strlcat" >&5
-+echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
- if test "${kde_cv_func_strlcat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  (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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_stl_works=yes
  else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22174,9 +23782,6 @@
+   echo "$as_me: failed program was:" >&5
+@@ -24180,9 +22814,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -44145,178 +34927,81 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22202,23 +23807,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -24220,27 +22851,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22227,9 +23845,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_func_strlcat=no
-+	kde_cv_func_strlcat=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
- ac_ext=c
-@@ -22242,11 +23861,11 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
--echo "${ECHO_T}$kde_cv_func_strlcat" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
-+echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
- 
--echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
--echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
-+echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
- if test "${kde_cv_proto_strlcat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  (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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_strlcat=yes
  else
-@@ -22267,8 +23886,7 @@
- if test "x$kde_cv_proto_strlcat" = xunknown; then
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22306,23 +23924,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -24337,27 +22951,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22332,10 +23963,11 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+    kde_cv_func_strlcat=yes
+   kde_cv_proto_strlcat=yes
+ else
+@@ -24368,7 +22966,7 @@
  
--kde_cv_proto_strlcat="strlcat unavailable"
-+	kde_cv_proto_strlcat="strlcat unavailable"
- 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22348,8 +23980,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
--echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
-+echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
- 
- if test "x$kde_cv_func_strlcat" = xyes; then
- 
-@@ -22373,15 +24005,14 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for strlcpy" >&5
--echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for strlcpy" >&5
-+echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
- if test "${kde_cv_func_strlcpy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22393,9 +24024,6 @@
+@@ -24425,9 +23023,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -44326,2457 +35011,1053 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22420,23 +24048,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -24464,27 +23059,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22445,9 +24086,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_func_strlcpy=no
-+	kde_cv_func_strlcpy=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
- ac_ext=c
-@@ -22460,11 +24102,11 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
--echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
-+echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
- 
--echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
--echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
-+echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
- if test "${kde_cv_proto_strlcpy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  (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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_strlcpy=yes
  else
-@@ -22485,8 +24127,7 @@
- if test "x$kde_cv_proto_strlcpy" = xunknown; then
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22523,23 +24164,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -24580,27 +23158,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22549,10 +24203,11 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+    kde_cv_func_strlcpy=yes
+   kde_cv_proto_strlcpy=yes
+ else
+@@ -24611,7 +23173,7 @@
  
--kde_cv_proto_strlcpy="strlcpy unavailable"
-+	kde_cv_proto_strlcpy="strlcpy unavailable"
- 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22565,8 +24220,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
--echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
-+echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
- 
- if test "x$kde_cv_func_strlcpy" = xyes; then
- 
-@@ -22589,8 +24244,8 @@
- 
- 
- 
--      echo "$as_me:$LINENO: checking for main in -lutil" >&5
--echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for main in -lutil" >&5
-+echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
- if test "${ac_cv_lib_util_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22607,29 +24262,42 @@
- int
- main ()
- {
--main ();
-+return main ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -24684,27 +23246,11 @@
    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
-@@ -22638,20 +24306,21 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_util_main=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_util_main=no
-+	ac_cv_lib_util_main=no
+@@ -24713,7 +23259,7 @@
+ 	ac_cv_lib_util_main=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
--echo "${ECHO_T}$ac_cv_lib_util_main" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
- if test $ac_cv_lib_util_main = yes; then
-   LIBUTIL="-lutil"
- fi
- 
--   echo "$as_me:$LINENO: checking for main in -lcompat" >&5
--echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
-+echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
- if test "${ac_cv_lib_compat_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22668,29 +24337,42 @@
- int
- main ()
- {
--main ();
-+return main ();
-   ;
+@@ -24746,40 +23292,24 @@
    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
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
++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
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 +  (eval "$ac_link") 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_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
-@@ -22699,21 +24381,22 @@
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_compat_main=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_compat_main=no
-+	ac_cv_lib_compat_main=no
+@@ -24788,7 +23318,7 @@
+ 	ac_cv_lib_compat_main=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
--echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
- if test $ac_cv_lib_compat_main = yes; then
-   LIBCOMPAT="-lcompat"
- fi
- 
-    kde_have_crypt=
--   echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
--echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22726,39 +24409,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char crypt ();
- int
- main ()
- {
--crypt ();
-+return crypt ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -24841,27 +23371,11 @@
    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
-@@ -22767,19 +24463,20 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_crypt_crypt=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_crypt_crypt=no
-+	ac_cv_lib_crypt_crypt=no
+@@ -24870,7 +23384,7 @@
+ 	ac_cv_lib_crypt_crypt=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
--echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
- if test $ac_cv_lib_crypt_crypt = yes; then
-   LIBCRYPT="-lcrypt"; kde_have_crypt=yes
- else
--  echo "$as_me:$LINENO: checking for crypt in -lc" >&5
--echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
-+echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_c_crypt+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22792,39 +24489,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char crypt ();
- int
- main ()
- {
--crypt ();
-+return crypt ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -24921,27 +23435,11 @@
    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
-@@ -22833,14 +24543,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_c_crypt=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_c_crypt=no
-+	ac_cv_lib_c_crypt=no
+@@ -24950,7 +23448,7 @@
+ 	ac_cv_lib_c_crypt=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
--echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
- if test $ac_cv_lib_c_crypt = yes; then
-   kde_have_crypt=yes
- else
-@@ -22866,13 +24577,13 @@
- 
-    fi
- 
--   echo "$as_me:$LINENO: checking for socklen_t" >&5
--echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for socklen_t" >&5
-+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
-    if test "${kde_cv_socklen_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--      ac_ext=cc
-+      ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22901,23 +24612,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -25028,27 +23526,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22929,8 +24653,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
  
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -22940,17 +24666,17 @@
- 
- fi
- 
--   echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
--echo "${ECHO_T}$kde_cv_socklen_t" >&6
-+   { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
-+echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
-    if test $kde_cv_socklen_t = no; then
--      echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
--echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
-+echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
-       if test "${kde_cv_socklen_t_equiv+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-          kde_cv_socklen_t_equiv=int
--         ac_ext=cc
-+         ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22979,23 +24705,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+          kde_cv_socklen_t=yes
+          kde_cv_socklen_t_equiv=socklen_t
+@@ -25121,27 +23602,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23007,8 +24746,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
  
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-          done
-          ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -23019,8 +24760,8 @@
- 
- fi
- 
--      echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
--echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
-+echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
-    fi
- 
- cat >>confdefs.h <<_ACEOF
-@@ -23033,8 +24774,8 @@
- _ACEOF
- 
- 
--   echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23047,39 +24788,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+                kde_cv_socklen_t_equiv="$t"
+                break
+@@ -25220,27 +23684,11 @@
    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
-@@ -23088,21 +24842,22 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dnet_dnet_ntoa=no
-+	ac_cv_lib_dnet_dnet_ntoa=no
+@@ -25249,7 +23697,7 @@
+ 	ac_cv_lib_dnet_dnet_ntoa=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
- 
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
--      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23115,39 +24870,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -25302,27 +23750,11 @@
    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
-@@ -23156,21 +24924,22 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dnet_stub_dnet_ntoa=no
-+	ac_cv_lib_dnet_stub_dnet_ntoa=no
+@@ -25331,7 +23763,7 @@
+ 	ac_cv_lib_dnet_stub_dnet_ntoa=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
- 
-    fi
--   echo "$as_me:$LINENO: checking for inet_ntoa" >&5
--echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
-+echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
- if test "${ac_cv_func_inet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23197,52 +24966,59 @@
- 
- #undef inet_ntoa
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char inet_ntoa ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
-+#if defined __stub_inet_ntoa || defined __stub___inet_ntoa
- choke me
--#else
--char (*f) () = inet_ntoa;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != inet_ntoa;
-+return inet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -25405,27 +23837,11 @@
    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
-@@ -23251,17 +25027,18 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_inet_ntoa=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_inet_ntoa=no
-+	ac_cv_func_inet_ntoa=no
+@@ -25434,7 +23850,7 @@
+ 	ac_cv_func_inet_ntoa=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
- 
-    if test $ac_cv_func_inet_ntoa = no; then
--     echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
--echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
-+     { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
-+echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23274,39 +25051,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char inet_ntoa ();
- int
- main ()
- {
--inet_ntoa ();
-+return inet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+ { echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+@@ -25483,27 +23899,11 @@
    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
-@@ -23315,21 +25105,22 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_nsl_inet_ntoa=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_nsl_inet_ntoa=no
-+	ac_cv_lib_nsl_inet_ntoa=no
+@@ -25512,7 +23912,7 @@
+ 	ac_cv_lib_nsl_inet_ntoa=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
- if test $ac_cv_lib_nsl_inet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
- 
-    fi
--   echo "$as_me:$LINENO: checking for connect" >&5
--echo $ECHO_N "checking for connect... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
- if test "${ac_cv_func_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23356,52 +25147,59 @@
- 
- #undef connect
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_connect) || defined (__stub___connect)
-+#if defined __stub_connect || defined __stub___connect
- choke me
--#else
--char (*f) () = connect;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != connect;
-+return connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -25586,27 +23986,11 @@
    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
-@@ -23410,17 +25208,18 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_connect=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_connect=no
-+	ac_cv_func_connect=no
+@@ -25615,7 +23999,7 @@
+ 	ac_cv_func_connect=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--echo "${ECHO_T}$ac_cv_func_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
- 
-    if test $ac_cv_func_connect = no; then
--      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23433,39 +25232,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+ { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+@@ -25664,27 +24048,11 @@
    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
-@@ -23474,22 +25286,23 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_socket_connect=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_socket_connect=no
-+	ac_cv_lib_socket_connect=no
+@@ -25693,7 +24061,7 @@
+ 	ac_cv_lib_socket_connect=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
-   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
- 
-    fi
- 
--   echo "$as_me:$LINENO: checking for remove" >&5
--echo $ECHO_N "checking for remove... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
- if test "${ac_cv_func_remove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23516,52 +25329,59 @@
- 
- #undef remove
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char remove ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_remove) || defined (__stub___remove)
-+#if defined __stub_remove || defined __stub___remove
- choke me
--#else
--char (*f) () = remove;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != remove;
-+return remove ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -25768,27 +24136,11 @@
    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
-@@ -23570,17 +25390,18 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_remove=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_remove=no
-+	ac_cv_func_remove=no
+@@ -25797,7 +24149,7 @@
+ 	ac_cv_func_remove=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--echo "${ECHO_T}$ac_cv_func_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
- 
-    if test $ac_cv_func_remove = no; then
--      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_posix_remove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23593,39 +25414,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char remove ();
- int
- main ()
- {
--remove ();
-+return remove ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+ { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+@@ -25846,27 +24198,11 @@
    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
-@@ -23634,14 +25468,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_posix_remove=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_posix_remove=no
-+	ac_cv_lib_posix_remove=no
+@@ -25875,7 +24211,7 @@
+ 	ac_cv_lib_posix_remove=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
- if test $ac_cv_lib_posix_remove = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-@@ -23649,8 +25484,8 @@
-    fi
- 
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--   echo "$as_me:$LINENO: checking for shmat" >&5
--echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
- if test "${ac_cv_func_shmat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23677,52 +25512,59 @@
- 
- #undef shmat
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shmat ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shmat) || defined (__stub___shmat)
-+#if defined __stub_shmat || defined __stub___shmat
- choke me
--#else
--char (*f) () = shmat;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != shmat;
-+return shmat ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -25951,27 +24287,11 @@
    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
-@@ -23731,18 +25573,19 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_shmat=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_shmat=no
-+	ac_cv_func_shmat=no
+@@ -25980,7 +24300,7 @@
+ 	ac_cv_func_shmat=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--echo "${ECHO_T}$ac_cv_func_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
- if test $ac_cv_func_shmat = yes; then
-   :
- else
--  echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23755,39 +25598,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shmat ();
- int
- main ()
- {
--shmat ();
-+return shmat ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+@@ -26030,27 +24350,11 @@
    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
-@@ -23796,14 +25652,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ipc_shmat=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_ipc_shmat=no
-+	ac_cv_lib_ipc_shmat=no
+@@ -26059,7 +24363,7 @@
+ 	ac_cv_lib_ipc_shmat=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
--echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
- if test $ac_cv_lib_ipc_shmat = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-@@ -23817,18 +25674,19 @@
- for ac_header in sys/types.h stdint.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23839,23 +25697,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -26113,27 +24417,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23864,15 +25735,16 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23881,8 +25753,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -26169,17 +24456,10 @@
    rm -f conftest.er1
-@@ -23906,9 +25783,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -23932,25 +25810,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
  else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -23968,18 +25840,19 @@
- for ac_header in sys/bitypes.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23990,23 +25863,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -26279,27 +24559,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24015,15 +25901,16 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24032,8 +25919,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -26335,17 +24598,10 @@
    rm -f conftest.er1
-@@ -24057,9 +25949,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24083,25 +25976,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
  else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24115,8 +26002,8 @@
- 
- 
-    # darwin requires a poll emulation library
--   echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
--echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
-+echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
- if test "${ac_cv_lib_poll_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24129,39 +26016,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char poll ();
- int
- main ()
- {
--poll ();
-+return poll ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -26448,27 +24704,11 @@
    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
-@@ -24170,14 +26070,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_poll_poll=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_poll_poll=no
-+	ac_cv_lib_poll_poll=no
+@@ -26477,7 +24717,7 @@
+ 	ac_cv_lib_poll_poll=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
--echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
-+echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
- if test $ac_cv_lib_poll_poll = yes; then
-   LIB_POLL="-lpoll"
- fi
-@@ -24188,18 +26089,19 @@
- for ac_header in Carbon/Carbon.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24210,23 +26112,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -26528,27 +24768,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24235,15 +26150,16 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24252,8 +26168,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -26584,17 +24807,10 @@
    rm -f conftest.er1
-@@ -24277,9 +26198,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24303,25 +26225,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
  else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24336,17 +26252,17 @@
- 
-    # CoreAudio framework
-    if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
--echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
--echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
--echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-+echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24357,23 +26273,36 @@
- #include <CoreAudio/CoreAudio.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -26689,27 +24905,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24382,15 +26311,16 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
--echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
-+echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24399,8 +26329,13 @@
- /* end confdefs.h.  */
- #include <CoreAudio/CoreAudio.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -26745,17 +24944,10 @@
    rm -f conftest.er1
-@@ -24424,9 +26359,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24450,25 +26386,18 @@
- echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
--echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
  else
-   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
--echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
- 
- fi
- if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24485,8 +26414,8 @@
- 
- 
- 
--  echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
--echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
-+echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
-   kde_libs_safe="$LIBS"
-   LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -24512,30 +26441,43 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -26857,27 +25049,11 @@
    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
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
        LIBRESOLV="-lresolv"
--      echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+      { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
+       { echo "$as_me:$LINENO: result: yes" >&5
+@@ -26897,7 +25073,7 @@
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_RES_INIT 1
-@@ -24546,25 +26488,25 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	 { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$kde_libs_safe
  
- 
- 
--echo "$as_me:$LINENO: checking for res_init" >&5
--echo $ECHO_N "checking for res_init... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for res_init" >&5
-+echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
- if test "${kde_cv_func_res_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24576,9 +26518,6 @@
+@@ -26922,9 +25098,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -46786,7619 +36067,3026 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24604,23 +26543,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -26962,27 +25135,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24629,9 +26581,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_func_res_init=no
-+	kde_cv_func_res_init=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
- ac_ext=c
-@@ -24644,11 +26597,11 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
--echo "${ECHO_T}$kde_cv_func_res_init" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
-+echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
- 
--echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
--echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
-+echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
- if test "${kde_cv_proto_res_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-  (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_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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_res_init=yes
  else
-@@ -24669,8 +26622,7 @@
- if test "x$kde_cv_proto_res_init" = xunknown; then
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24708,23 +26660,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -27079,27 +25235,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24734,10 +26699,11 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+    kde_cv_func_res_init=yes
+   kde_cv_proto_res_init=yes
+ else
+@@ -27110,7 +25250,7 @@
  
--kde_cv_proto_res_init="res_init unavailable"
-+	kde_cv_proto_res_init="res_init unavailable"
- 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -24750,8 +26716,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
--echo "${ECHO_T}$kde_cv_proto_res_init" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
-+echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
- 
- if test "x$kde_cv_func_res_init" = xyes; then
- 
-@@ -24778,8 +26744,8 @@
-    LIBSOCKET="$X_EXTRA_LIBS"
- 
- 
--   echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
--echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
-+echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ucb_killpg+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24792,39 +26758,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char killpg ();
- int
- main ()
- {
--killpg ();
-+return killpg ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27193,27 +25333,11 @@
    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
-@@ -24833,27 +26812,28 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ucb_killpg=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_ucb_killpg=no
-+	ac_cv_lib_ucb_killpg=no
+@@ -27222,7 +25346,7 @@
+ 	ac_cv_lib_ucb_killpg=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
--echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
-+echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
- if test $ac_cv_lib_ucb_killpg = yes; then
-   LIBUCB="-lucb"
- fi
- 
- 
-    case $host in     *-*-lynxos* )
--        echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
--echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
-+echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
-         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
--        echo "$as_me:$LINENO: result: disabled" >&5
--echo "${ECHO_T}disabled" >&6
--        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: result: disabled" >&5
-+echo "${ECHO_T}disabled" >&6; }
-+        { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24866,39 +26846,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27281,27 +25405,11 @@
    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
-@@ -24907,22 +26900,23 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_bsd_gethostbyname=no
-+	ac_cv_lib_bsd_gethostbyname=no
+@@ -27310,7 +25418,7 @@
+ 	ac_cv_lib_bsd_gethostbyname=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
- if test $ac_cv_lib_bsd_gethostbyname = yes; then
-   LIBSOCKET="-lbsd"
- fi
-           ;;
-     esac
- 
--     echo "$as_me:$LINENO: checking for int" >&5
--echo $ECHO_N "checking for int... $ECHO_C" >&6
-+     { echo "$as_me:$LINENO: checking for int" >&5
-+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
- if test "${ac_cv_type_int+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24933,35 +26927,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef int ac__type_new_;
- int
- main ()
- {
--if ((int *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (int))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27359,27 +25467,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24970,23 +26978,23 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_int=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27393,16 +25484,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+ echo "${ECHO_T}$ac_cv_type_int" >&6; }
  
--ac_cv_type_int=no
-+	ac_cv_type_int=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
--echo "${ECHO_T}$ac_cv_type_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-+echo "${ECHO_T}$ac_cv_type_int" >&6; }
- 
--echo "$as_me:$LINENO: checking size of int" >&5
--echo $ECHO_N "checking size of int... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of int" >&5
-+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking size of int" >&5
+ echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  if test "$ac_cv_type_int" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # The cast to long int works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -24996,10 +27004,12 @@
+@@ -27412,7 +25502,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25007,23 +27017,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27436,27 +25526,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25036,10 +27059,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -27466,7 +25539,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25047,23 +27072,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27490,27 +25563,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25072,30 +27110,33 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -27537,51 +25593,34 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
  test_array [0] = 0
- 
-   ;
-@@ -25103,23 +27144,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-
+-  ;
+-  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
++
++  ;
++  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
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 +  (eval "$ac_compile") 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_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25132,10 +27186,12 @@
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -27591,7 +25630,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25143,23 +27199,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27615,27 +25654,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25168,24 +27237,27 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25196,10 +27268,12 @@
+@@ -27672,7 +25694,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25207,23 +27281,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27696,27 +25718,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25232,24 +27319,24 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -27729,11 +25734,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_int=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 +'') if test "$ac_cv_type_int" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
+ echo "$as_me: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_int=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_int=0
++   fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25257,8 +27344,10 @@
+@@ -27743,7 +25752,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (int)); }
--unsigned long ulongval () { return (long) (sizeof (int)); }
-+	        typedef int ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef int ac__type_sizeof_;
++   typedef int ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -25267,35 +27356,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (int))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (int))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (int))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25306,28 +27404,31 @@
+@@ -27802,21 +25811,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 +if test "$ac_cv_type_int" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
+ echo "$as_me: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_int=0
-+	       fi
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_int=0
++   fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_int=0
 -fi
  fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
 +
 +
 +
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
- 
--   echo "$as_me:$LINENO: checking for short" >&5
--echo $ECHO_N "checking for short... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for short" >&5
-+echo $ECHO_N "checking for short... $ECHO_C" >&6; }
- if test "${ac_cv_type_short+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -25338,35 +27439,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef short ac__type_new_;
- int
- main ()
- {
--if ((short *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (short))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27858,27 +25871,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25375,23 +27490,23 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_short=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27892,16 +25888,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+ echo "${ECHO_T}$ac_cv_type_short" >&6; }
  
--ac_cv_type_short=no
-+	ac_cv_type_short=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
--echo "${ECHO_T}$ac_cv_type_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-+echo "${ECHO_T}$ac_cv_type_short" >&6; }
- 
--echo "$as_me:$LINENO: checking size of short" >&5
--echo $ECHO_N "checking size of short... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of short" >&5
-+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking size of short" >&5
+ echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  if test "$ac_cv_type_short" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # The cast to long int works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25401,10 +27516,12 @@
+@@ -27911,7 +25906,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25412,23 +27529,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27935,27 +25930,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25441,10 +27571,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -27965,7 +25943,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25452,23 +27584,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -27989,27 +25967,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25477,30 +27622,33 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -28036,7 +25997,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25508,23 +27656,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28060,27 +26021,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25537,10 +27698,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -28090,7 +26034,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25548,23 +27711,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28114,27 +26058,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25573,24 +27749,27 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25601,10 +27780,12 @@
+@@ -28171,7 +26098,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25612,23 +27793,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28195,27 +26122,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25637,24 +27831,24 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -28228,11 +26138,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_short=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 +'') if test "$ac_cv_type_short" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
+ echo "$as_me: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_short=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_short=0
++   fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25662,8 +27856,10 @@
+@@ -28242,7 +26156,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (short)); }
--unsigned long ulongval () { return (long) (sizeof (short)); }
-+	        typedef short ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef short ac__type_sizeof_;
++   typedef short ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -25672,35 +27868,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (short))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (short))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (short))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25711,28 +27916,31 @@
+@@ -28301,21 +26215,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 +if test "$ac_cv_type_short" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
+ echo "$as_me: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_short=0
-+	       fi
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_short=0
++   fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_short=0
- fi
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
--echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
 +
 +
 +
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SHORT $ac_cv_sizeof_short
  _ACEOF
- 
--  echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -25743,35 +27951,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef long ac__type_new_;
- int
- main ()
- {
--if ((long *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (long))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28357,27 +26275,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25780,23 +28002,23 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_long=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28391,16 +26292,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long" >&6; }
  
--ac_cv_type_long=no
-+	ac_cv_type_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
- 
--echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking size of long" >&5
+ echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  if test "$ac_cv_type_long" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # The cast to long int works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25806,10 +28028,12 @@
+@@ -28410,7 +26310,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25817,23 +28041,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28434,27 +26334,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25846,10 +28083,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -28464,7 +26347,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25857,23 +28096,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28488,27 +26371,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25882,30 +28134,33 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -28535,7 +26401,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25913,23 +28168,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28559,27 +26425,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25942,10 +28210,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -28589,7 +26438,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25953,23 +28223,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28613,27 +26462,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25978,24 +28261,27 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26006,10 +28292,12 @@
+@@ -28670,7 +26502,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26017,23 +28305,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28694,27 +26526,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26042,24 +28343,24 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -28727,11 +26542,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 +'') if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
+ echo "$as_me: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_long=0
++   fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -26067,8 +28368,10 @@
+@@ -28741,7 +26560,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (long)); }
--unsigned long ulongval () { return (long) (sizeof (long)); }
-+	        typedef long ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef long ac__type_sizeof_;
++   typedef long ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -26077,35 +28380,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (long))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (long))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (long))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+rm -f 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>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26116,28 +28428,31 @@
+@@ -28800,21 +26619,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 +if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
+ echo "$as_me: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_long=0
++   fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_long=0
 -fi
  fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
 +
 +
 +
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  _ACEOF
- 
--  echo "$as_me:$LINENO: checking for char *" >&5
--echo $ECHO_N "checking for char *... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for char *" >&5
-+echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
- if test "${ac_cv_type_char_p+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26148,35 +28463,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef char * ac__type_new_;
- int
- main ()
- {
--if ((char * *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (char *))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28856,27 +26679,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26185,23 +28514,23 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_char_p=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28890,16 +26696,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+ echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
  
--ac_cv_type_char_p=no
-+	ac_cv_type_char_p=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
--echo "${ECHO_T}$ac_cv_type_char_p" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-+echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
- 
--echo "$as_me:$LINENO: checking size of char *" >&5
--echo $ECHO_N "checking size of char *... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of char *" >&5
-+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking size of char *" >&5
+ echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  if test "$ac_cv_type_char_p" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # The cast to long int works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -26211,10 +28540,12 @@
+@@ -28909,7 +26714,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26222,23 +28553,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28933,27 +26738,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26251,10 +28595,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -28963,7 +26751,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26262,23 +28608,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -28987,27 +26775,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26287,30 +28646,33 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -29034,7 +26805,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26318,23 +28680,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29058,27 +26829,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26347,10 +28722,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -29088,7 +26842,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26358,23 +28735,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29112,27 +26866,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26383,24 +28773,27 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26411,10 +28804,12 @@
+@@ -29169,7 +26906,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26422,23 +28817,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29193,27 +26930,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26447,24 +28855,24 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -29226,11 +26946,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_char_p=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 +'') if test "$ac_cv_type_char_p" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (char *), 77
-+echo "$as_me: error: cannot compute sizeof (char *)
+ echo "$as_me: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_char_p=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_char_p=0
++   fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -26472,8 +28880,10 @@
+@@ -29240,7 +26964,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (char *)); }
--unsigned long ulongval () { return (long) (sizeof (char *)); }
-+	        typedef char * ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef char * ac__type_sizeof_;
++   typedef char * ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -26482,35 +28892,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (char *))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (char *))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (char *))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26521,30 +28940,33 @@
+@@ -29299,21 +27023,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 +if test "$ac_cv_type_char_p" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (char *), 77
-+echo "$as_me: error: cannot compute sizeof (char *)
+ echo "$as_me: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_char_p=0
-+	       fi
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_char_p=0
++   fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_char_p=0
- fi
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
--echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
 +
 +
 +
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
  _ACEOF
- 
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26557,39 +28979,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29362,27 +27090,11 @@
    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
-@@ -26598,14 +29033,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dl_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dl_dlopen=no
-+	ac_cv_lib_dl_dlopen=no
+@@ -29391,7 +27103,7 @@
+ 	ac_cv_lib_dl_dlopen=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- 
- LIBDL="-ldl"
-@@ -26614,8 +29050,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
--echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
-+echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26628,39 +29064,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shl_unload ();
- int
- main ()
- {
--shl_unload ();
-+return shl_unload ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29447,27 +27159,11 @@
    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
-@@ -26669,14 +29118,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dld_shl_unload=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dld_shl_unload=no
-+	ac_cv_lib_dld_shl_unload=no
+@@ -29476,7 +27172,7 @@
+ 	ac_cv_lib_dld_shl_unload=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
- if test $ac_cv_lib_dld_shl_unload = yes; then
- 
- LIBDL="-ldld"
-@@ -26690,8 +29140,8 @@
- 
- 
- 
--  echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_size_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26702,35 +29152,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef size_t ac__type_new_;
- int
- main ()
- {
--if ((size_t *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (size_t))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29532,27 +27228,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26739,23 +29203,23 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -29566,16 +27245,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
  
--ac_cv_type_size_t=no
-+	ac_cv_type_size_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
- 
--echo "$as_me:$LINENO: checking size of size_t" >&5
--echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of size_t" >&5
-+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking size of size_t" >&5
+ echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  if test "$ac_cv_type_size_t" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # The cast to long int works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -26765,10 +29229,12 @@
+@@ -29585,7 +27263,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26776,23 +29242,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29609,27 +27287,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26805,10 +29284,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -29639,7 +27300,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26816,23 +29297,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29663,27 +27324,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26841,30 +29335,33 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -29710,7 +27354,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26872,23 +29369,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29734,27 +27378,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26901,10 +29411,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -29764,7 +27391,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26912,23 +29424,36 @@
- }
+@@ -29777,38 +27404,21 @@
  _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"
+ 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
 +case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 +  (eval "$ac_compile") 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_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26937,24 +29462,27 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26965,10 +29493,12 @@
+@@ -29845,7 +27455,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26976,23 +29506,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -29869,27 +27479,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27001,24 +29544,24 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -29902,11 +27495,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_size_t=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 +'') if test "$ac_cv_type_size_t" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (size_t), 77
-+echo "$as_me: error: cannot compute sizeof (size_t)
+ echo "$as_me: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_size_t=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_size_t=0
++   fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27026,8 +29569,10 @@
+@@ -29916,7 +27513,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (size_t)); }
--unsigned long ulongval () { return (long) (sizeof (size_t)); }
-+	        typedef size_t ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef size_t ac__type_sizeof_;
++   typedef size_t ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -27036,35 +29581,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (size_t))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (size_t))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (size_t))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27075,29 +29629,32 @@
+@@ -29975,21 +27572,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 +if test "$ac_cv_type_size_t" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (size_t), 77
-+echo "$as_me: error: cannot compute sizeof (size_t)
+ echo "$as_me: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_size_t=0
-+	       fi
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_size_t=0
++   fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_size_t=0
 -fi
  fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
 +
 +
 +
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
  _ACEOF
- 
- 
--  echo "$as_me:$LINENO: checking for unsigned long" >&5
--echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for unsigned long" >&5
-+echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
- if test "${ac_cv_type_unsigned_long+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -27108,35 +29665,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef unsigned long ac__type_new_;
- int
- main ()
- {
--if ((unsigned long *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (unsigned long))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30032,27 +27633,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27145,23 +29716,23 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_unsigned_long=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -30066,16 +27650,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+ echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
  
--ac_cv_type_unsigned_long=no
-+	ac_cv_type_unsigned_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
--echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-+echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
- 
--echo "$as_me:$LINENO: checking size of unsigned long" >&5
--echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
-+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking size of unsigned long" >&5
+ echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  if test "$ac_cv_type_unsigned_long" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # The cast to long int works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -27171,10 +29742,12 @@
+@@ -30085,7 +27668,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -27182,23 +29755,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30109,27 +27692,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27211,10 +29797,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -30139,7 +27705,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27222,23 +29810,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30163,27 +27729,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27247,30 +29848,33 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -30210,7 +27759,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -27278,23 +29882,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30234,27 +27783,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27307,10 +29924,12 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -30264,7 +27796,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27318,23 +29937,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30288,27 +27820,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27343,24 +29975,27 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27371,10 +30006,12 @@
+@@ -30345,7 +27860,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27382,23 +30019,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30369,27 +27884,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27407,24 +30057,24 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -30402,11 +27900,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 +'') if test "$ac_cv_type_unsigned_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+echo "$as_me: error: cannot compute sizeof (unsigned long)
+ echo "$as_me: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_unsigned_long=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_unsigned_long=0
++   fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27432,8 +30082,10 @@
+@@ -30416,7 +27918,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (unsigned long)); }
--unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-+	        typedef unsigned long ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef unsigned long ac__type_sizeof_;
++   typedef unsigned long ac__type_sizeof_;
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -27442,35 +30094,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (unsigned long))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (unsigned long))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (unsigned long))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27481,30 +30142,33 @@
+@@ -30475,21 +27977,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 +if test "$ac_cv_type_unsigned_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+echo "$as_me: error: cannot compute sizeof (unsigned long)
+ echo "$as_me: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_unsigned_long=0
-+	       fi
+    { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_unsigned_long=0
++   fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_unsigned_long=0
- fi
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
 +
 +
 +
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
  _ACEOF
- 
- 
- 
--  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
--echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
-+echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27525,35 +30189,48 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30530,27 +28036,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--      echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+      { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-       { { echo "$as_me:$LINENO: error:
-        Apparently on your system our assumption sizeof size_t == sizeof unsigned long
-        does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27565,18 +30242,18 @@
-    { (exit 1); exit 1; }; }
- 
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--  echo "$as_me:$LINENO: checking for PIE support" >&5
--echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
-+
-+  { echo "$as_me:$LINENO: checking for PIE support" >&5
-+echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
- if test "${kde_cv_val_pie_support+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--     ac_ext=cc
-+     ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27606,23 +30283,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30624,27 +28113,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27631,9 +30321,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   kde_cv_val_pie_support=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_val_pie_support=no
-+	kde_cv_val_pie_support=no
+@@ -30653,7 +28126,7 @@
+ 	kde_cv_val_pie_support=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
      CXXFLAGS=$safe_CXXFLAGS
-@@ -27646,26 +30337,26 @@
- 
- 
- fi
--echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
--echo "${ECHO_T}$kde_cv_val_pie_support" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
-+echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
- 
--  echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
--echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
-+echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
- 
--  # Check whether --enable-pie or --disable-pie was given.
-+  # Check whether --enable-pie was given.
- if test "${enable_pie+set}" = set; then
--  enableval="$enable_pie"
--  kde_has_pie_support=$enableval
-+  enableval=$enable_pie; kde_has_pie_support=$enableval
- else
-   kde_has_pie_support=detect
--fi;
-+fi
-+
- 
-   if test "$kde_has_pie_support" = "detect"; then
-     kde_has_pie_support=$kde_cv_val_pie_support
-   fi
- 
--  echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
--echo "${ECHO_T}$kde_has_pie_support" >&6
-+  { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
-+echo "${ECHO_T}$kde_has_pie_support" >&6; }
- 
-   KDE_USE_FPIE=""
-   KDE_USE_PIE=""
-@@ -27684,18 +30375,19 @@
- for ac_header in crt_externs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27706,23 +30398,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30739,27 +28212,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27731,15 +30436,16 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27748,8 +30454,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -30795,17 +28251,10 @@
    rm -f conftest.er1
-@@ -27773,9 +30484,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27799,25 +30511,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
  else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27829,8 +30535,8 @@
- 
- done
- 
--echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
--echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
-+echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
- if test "${ac_cv_func__NSGetEnviron+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -27857,52 +30563,59 @@
- 
- #undef _NSGetEnviron
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char _NSGetEnviron ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
-+#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
- choke me
--#else
--char (*f) () = _NSGetEnviron;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != _NSGetEnviron;
-+return _NSGetEnviron ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+   echo "$as_me: failed program was:" >&5
+@@ -30927,27 +28376,11 @@
    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
-@@ -27911,13 +30624,14 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func__NSGetEnviron=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func__NSGetEnviron=no
-+	ac_cv_func__NSGetEnviron=no
+@@ -30956,7 +28389,7 @@
+ 	ac_cv_func__NSGetEnviron=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
--echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
-+echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
- if test $ac_cv_func__NSGetEnviron = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -27938,9 +30652,9 @@
- for ac_func in vsnprintf snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -27966,52 +30680,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
+ { echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+@@ -31044,27 +28477,11 @@
    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
-@@ -28020,13 +30741,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
+@@ -31073,7 +28490,7 @@
+ 	eval "$as_ac_var=no"
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        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
-@@ -28043,32 +30766,32 @@
- 
- 
- 
--# Check whether --enable-embedded or --disable-embedded was given.
-+# Check whether --enable-embedded was given.
- if test "${enable_embedded+set}" = set; then
--  enableval="$enable_embedded"
--  kde_use_qt_emb=$enableval
-+  enableval=$enable_embedded; kde_use_qt_emb=$enableval
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -31186,17 +28603,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
  else
-   kde_use_qt_emb=no
- 
--fi;
-+fi
-+
- 
--# Check whether --enable-qtopia or --disable-qtopia was given.
-+# Check whether --enable-qtopia was given.
- if test "${enable_qtopia+set}" = set; then
--  enableval="$enable_qtopia"
--  kde_use_qt_emb_palm=$enableval
-+  enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval
- else
-   kde_use_qt_emb_palm=no
- 
--fi;
-+fi
-+
- 
--# Check whether --enable-mac or --disable-mac was given.
-+# Check whether --enable-mac was given.
- if test "${enable_mac+set}" = set; then
--  enableval="$enable_mac"
--  kde_use_qt_mac=$enableval
-+  enableval=$enable_mac; kde_use_qt_mac=$enableval
- else
-   kde_use_qt_mac=no
- 
--fi;
-+fi
-+
- 
- # used to disable x11-specific stuff on special platforms
- 
-@@ -28084,8 +30807,8 @@
- 
- if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
- 
--echo "$as_me:$LINENO: checking for X" >&5
--echo $ECHO_N "checking for X... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
- 
- if test "${kde_cv_have_x+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28122,8 +30845,13 @@
- /* end confdefs.h.  */
- #include <$x_direct_test_include>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -31289,27 +28699,11 @@
    rm -f conftest.er1
-@@ -28190,6 +30918,7 @@
-     fi
-   done
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi # $ac_x_includes = NO
- 
-@@ -28219,23 +30948,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28246,7 +30988,7 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--LIBS="$ac_save_LIBS"
-+	LIBS="$ac_save_LIBS"
- # First see if replacing the include by lib works.
- # Check X11 before X11Rn because it is often a symlink to the current release.
- for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28294,7 +31036,8 @@
-   done
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+@@ -31366,7 +28760,7 @@
  done
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = NO
  
-@@ -28304,21 +31047,26 @@
- *-*-solaris*)
-   ;;
- *)
--  rm -fr conftest.dir
-+  rm -f -r conftest.dir
- if mkdir conftest.dir; then
-   cd conftest.dir
--  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-   cat >Imakefile <<'_ACEOF'
--acfindx:
--	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-+incroot:
-+	@echo incroot='${INCROOT}'
-+usrlibdir:
-+	@echo usrlibdir='${USRLIBDIR}'
-+libdir:
-+	@echo libdir='${LIBDIR}'
- _ACEOF
--  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-+  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-+    for ac_var in incroot usrlibdir libdir; do
-+      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-+    done
-     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-     for ac_extension in a so sl; do
--      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
--	 test -f $ac_im_libdir/libX11.$ac_extension; then
-+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-+	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
- 	ac_im_usrlibdir=$ac_im_libdir; break
-       fi
-     done
-@@ -28326,7 +31074,7 @@
-     # bogus both because they are the default anyway, and because
-     # using them would break gcc on systems where it needs fixed includes.
-     case $ac_im_incroot in
--	/usr/include) ;;
-+	/usr/include) ac_x_includes= ;;
- 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-     esac
-     case $ac_im_usrlibdir in
-@@ -28335,7 +31083,7 @@
-     esac
-   fi
-   cd ..
--  rm -fr conftest.dir
-+  rm -f -r conftest.dir
- fi
- 
-   if test -z "$ac_x_includes"; then
-@@ -28379,12 +31127,12 @@
- eval "$kde_cv_have_x"
- 
- if test "$have_x" != yes; then
--  echo "$as_me:$LINENO: result: $have_x" >&5
--echo "${ECHO_T}$have_x" >&6
-+  { echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6; }
-   no_x=yes
- else
--  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
--echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
-+  { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
-+echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
- fi
- 
- if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28412,8 +31160,8 @@
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
--echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28426,39 +31174,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char IceConnectionNumber ();
- int
- main ()
- {
--IceConnectionNumber ();
-+return IceConnectionNumber ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -31531,27 +28925,11 @@
    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
-@@ -28467,14 +31228,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_ICE_IceConnectionNumber=no
-+	ac_cv_lib_ICE_IceConnectionNumber=no
+@@ -31560,7 +28938,7 @@
+ 	ac_cv_lib_ICE_IceConnectionNumber=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
--echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
- if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-   LIBSM="-lSM -lICE"
- fi
-@@ -28483,8 +31245,8 @@
- 
- LIB_X11='-lX11 $(LIBSOCKET)'
- 
--echo "$as_me:$LINENO: checking for libXext" >&5
--echo $ECHO_N "checking for libXext... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libXext" >&5
-+echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
- if test "${kde_cv_have_libXext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28518,23 +31280,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -31621,27 +28999,11 @@
    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
-@@ -28543,10 +31318,11 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   kde_cv_have_libXext=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31651,7 +29013,7 @@
  
--kde_cv_have_libXext=no
-+	kde_cv_have_libXext=no
- 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
  LDFLAGS=$kde_ldflags_safe
-@@ -28555,8 +31331,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
--echo "${ECHO_T}$kde_cv_have_libXext" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
-+echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
- 
- if test "$kde_cv_have_libXext" = "no"; then
-   { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28618,8 +31394,8 @@
-     else
-       PTHREAD_LIBS_save="$PTHREAD_LIBS"
-       PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
--      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
--echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
-+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
- 
-      kde_save_LDFLAGS="$LDFLAGS"
-           kde_save_LIBS="$LIBS"
-@@ -28630,9 +31406,9 @@
- 	;;
-      esac
-      as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
--echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -28644,39 +31420,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char pthread_create ();
- int
- main ()
- {
--pthread_create ();
-+return pthread_create ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -31777,27 +29139,11 @@
    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
-@@ -28685,14 +31474,16 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_Lib=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_Lib=no"
-+	eval "$as_ac_Lib=no"
+@@ -31806,7 +29152,7 @@
+ 	eval "$as_ac_Lib=no"
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Lib'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-   LIBPTHREAD="$PTHREAD_LIBS_save"
- fi
-@@ -28705,8 +31496,8 @@
-   fi
- 
-     if test -z "$LIBPTHREAD"; then
--    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28719,39 +31510,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char pthread_create ();
- int
- main ()
- {
--pthread_create ();
-+return pthread_create ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -31867,27 +29213,11 @@
    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
-@@ -28760,14 +31564,15 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_pthread_pthread_create=yes
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_pthread_pthread_create=no
-+	ac_cv_lib_pthread_pthread_create=no
+@@ -31896,7 +29226,7 @@
+ 	ac_cv_lib_pthread_pthread_create=no
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
- if test $ac_cv_lib_pthread_pthread_create = yes; then
-   LIBPTHREAD="-lpthread"
- fi
-@@ -28775,8 +31580,8 @@
-   fi
- 
-     if test -z "$LIBPTHREAD" ; then
--    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-     kde_safe_libs=$LIBS
-     LIBS="$LIBS -lpthread"
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -28795,39 +31600,53 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -31941,27 +29271,11 @@
    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
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
  
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-         LIBPTHREAD="-lpthread"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
+         { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+@@ -31975,7 +29289,7 @@
+ echo "${ECHO_T}no" >&6; }
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      LIBS=$kde_safe_libs
    fi
-@@ -28842,16 +31661,15 @@
-       USE_THREADS=""
-       if test -z "$LIBPTHREAD"; then
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
--echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
-+echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
- kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -28878,23 +31696,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -32037,27 +29351,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28903,8 +31734,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32066,7 +29364,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -28917,13 +31750,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  USE_THREADS="-D_THREAD_SAFE -pthread"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
-@@ -28935,16 +31768,15 @@
-     case $host_os in
-  	solaris*)
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
--echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
-+echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
- kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -28971,23 +31803,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -32144,27 +29442,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28996,8 +31841,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32173,7 +29455,7 @@
  
-+
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29010,13 +31857,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  USE_THREADS="-mt"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
-@@ -29043,17 +31890,17 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for extra includes" >&5
--echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for extra includes" >&5
-+echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
- 
--# Check whether --with-extra-includes or --without-extra-includes was given.
-+# Check whether --with-extra-includes was given.
- if test "${with_extra_includes+set}" = set; then
--  withval="$with_extra_includes"
--  kde_use_extra_includes="$withval"
-+  withval=$with_extra_includes; kde_use_extra_includes="$withval"
- else
-   kde_use_extra_includes=NONE
- 
--fi;
-+fi
-+
- kde_extra_includes=
- if test -n "$kde_use_extra_includes" && \
-    test "$kde_use_extra_includes" != "NONE"; then
-@@ -29071,21 +31918,21 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
--echo "${ECHO_T}$kde_use_extra_includes" >&6
-+{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
-+echo "${ECHO_T}$kde_use_extra_includes" >&6; }
- 
- kde_extra_libs=
--echo "$as_me:$LINENO: checking for extra libs" >&5
--echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for extra libs" >&5
-+echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
- 
--# Check whether --with-extra-libs or --without-extra-libs was given.
-+# Check whether --with-extra-libs was given.
- if test "${with_extra_libs+set}" = set; then
--  withval="$with_extra_libs"
--  kde_use_extra_libs=$withval
-+  withval=$with_extra_libs; kde_use_extra_libs=$withval
- else
-   kde_use_extra_libs=NONE
- 
--fi;
-+fi
-+
- if test -n "$kde_use_extra_libs" && \
-    test "$kde_use_extra_libs" != "NONE"; then
- 
-@@ -29104,14 +31951,14 @@
- 
- 
- 
--echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
--echo "${ECHO_T}$kde_use_extra_libs" >&6
-+{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
-+echo "${ECHO_T}$kde_use_extra_libs" >&6; }
- 
- 
- 
- 
--echo "$as_me:$LINENO: checking for libz" >&5
--echo $ECHO_N "checking for libz... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libz" >&5
-+echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
- if test "${ac_cv_lib_z+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29145,23 +31992,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -32333,27 +29615,11 @@
    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
-@@ -29170,9 +32030,10 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "ac_cv_lib_z='-lz'"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "ac_cv_lib_z=no"
-+	eval "ac_cv_lib_z=no"
+@@ -32362,7 +29628,7 @@
+ 	eval "ac_cv_lib_z=no"
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29185,8 +32046,8 @@
- _ACEOF
- 
-   LIBZ="$ac_cv_lib_z"
--  echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
--echo "${ECHO_T}$ac_cv_lib_z" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
-+echo "${ECHO_T}$ac_cv_lib_z" >&6; }
- else
-   { { echo "$as_me:$LINENO: error: not found.
-           Possibly configure picks up an outdated version
-@@ -29206,8 +32067,8 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for libpng" >&5
--echo $ECHO_N "checking for libpng... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libpng" >&5
-+echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29243,23 +32104,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -32445,27 +29711,11 @@
    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
-@@ -29268,10 +32142,11 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32475,7 +29725,7 @@
  
--eval "ac_cv_lib_png=no"
-+	eval "ac_cv_lib_png=no"
- 
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29285,19 +32160,19 @@
- 
-   LIBPNG="$ac_cv_lib_png"
- 
--  echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
--echo "${ECHO_T}$ac_cv_lib_png" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-+echo "${ECHO_T}$ac_cv_lib_png" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   LIBPNG=""
- 
- fi
- 
- 
- 
--echo "$as_me:$LINENO: checking for libjpeg6b" >&5
--echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-+echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
- if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29330,23 +32205,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -32546,27 +29796,11 @@
    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
-@@ -29355,9 +32243,10 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "ac_cv_lib_jpeg_6b=no"
-+	eval "ac_cv_lib_jpeg_6b=no"
+@@ -32575,7 +29809,7 @@
+ 	eval "ac_cv_lib_jpeg_6b=no"
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29367,14 +32256,14 @@
- 
- if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-   LIBJPEG="$ac_cv_lib_jpeg_6b"
--  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
--echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
--echo "$as_me:$LINENO: checking for libjpeg" >&5
--echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libjpeg" >&5
-+echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
- if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29407,23 +32296,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -32637,27 +29871,11 @@
    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
-@@ -29432,9 +32334,10 @@
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "ac_cv_lib_jpeg_normal=-ljpeg"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "ac_cv_lib_jpeg_normal=no"
-+	eval "ac_cv_lib_jpeg_normal=no"
+@@ -32666,7 +29884,7 @@
+ 	eval "ac_cv_lib_jpeg_normal=no"
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29444,11 +32347,11 @@
- 
- if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-   LIBJPEG="$ac_cv_lib_jpeg_normal"
--  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
--echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
-        LIBJPEG=
- 
-@@ -29468,7 +32371,7 @@
+@@ -32700,7 +29918,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29471: $i/$j" >&5
-+    echo "configure: 32374: $i/$j" >&5
+-    echo "configure: 32703: $i/$j" >&5
++    echo "configure: 29921: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29515,14 +32418,14 @@
- 
- 
- 
--   echo "$as_me:$LINENO: checking for perl" >&5
--echo $ECHO_N "checking for perl... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for perl" >&5
-+echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
-    if test -n "$PERL"; then
-         kde_cv_path="$PERL";
-    else
-         kde_cache=`echo perl | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -29565,8 +32468,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
- 		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
- We need perl to generate some code." >&5
-@@ -29575,8 +32478,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       PERL=$kde_cv_path
- 
-    fi
-@@ -29590,10 +32493,9 @@
- 
- 
- 
--# Check whether --enable-mt or --disable-mt was given.
-+# Check whether --enable-mt was given.
- if test "${enable_mt+set}" = set; then
--  enableval="$enable_mt"
--  kde_use_qt_mt=$enableval
-+  enableval=$enable_mt; kde_use_qt_mt=$enableval
- else
- 
-     if test $kde_qtver = 3; then
-@@ -29603,7 +32505,8 @@
-     fi
- 
- 
--fi;
-+fi
-+
- 
- USING_QT_MT=""
- 
-@@ -29623,13 +32526,13 @@
-   else
-     kde_check_threading_default=yes
-   fi
--  # Check whether --enable-threading or --disable-threading was given.
-+  # Check whether --enable-threading was given.
- if test "${enable_threading+set}" = set; then
--  enableval="$enable_threading"
--  kde_use_threading=$enableval
-+  enableval=$enable_threading; kde_use_threading=$enableval
- else
-   kde_use_threading=$kde_check_threading_default
--fi;
-+fi
-+
-   if test "x$kde_use_threading" = "xyes"; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -29701,8 +32604,8 @@
-   LIBQT="$LIBQT $LIBDL"
- fi
- 
--echo "$as_me:$LINENO: checking for Qt" >&5
--echo $ECHO_N "checking for Qt... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Qt" >&5
-+echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
- 
- if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
- LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29711,34 +32614,34 @@
- qt_libraries=""
- qt_includes=""
- 
--# Check whether --with-qt-dir or --without-qt-dir was given.
-+# Check whether --with-qt-dir was given.
- if test "${with_qt_dir+set}" = set; then
--  withval="$with_qt_dir"
--    ac_qt_includes="$withval"/include
-+  withval=$with_qt_dir;   ac_qt_includes="$withval"/include
-        ac_qt_libraries="$withval"/lib${kdelibsuff}
-        ac_qt_bindir="$withval"/bin
- 
--fi;
-+fi
-+
- 
- 
--# Check whether --with-qt-includes or --without-qt-includes was given.
-+# Check whether --with-qt-includes was given.
- if test "${with_qt_includes+set}" = set; then
--  withval="$with_qt_includes"
--
-+  withval=$with_qt_includes;
-        ac_qt_includes="$withval"
- 
--fi;
-+fi
-+
- 
- kde_qt_libs_given=no
- 
- 
--# Check whether --with-qt-libraries or --without-qt-libraries was given.
-+# Check whether --with-qt-libraries was given.
- if test "${with_qt_libraries+set}" = set; then
--  withval="$with_qt_libraries"
--    ac_qt_libraries="$withval"
-+  withval=$with_qt_libraries;   ac_qt_libraries="$withval"
-        kde_qt_libs_given=yes
- 
--fi;
-+fi
-+
- 
- if test "${ac_cv_have_qt+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -29766,7 +32669,7 @@
+@@ -32998,7 +30216,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29769: $i/$j" >&5
-+    echo "configure: 32672: $i/$j" >&5
+-    echo "configure: 33001: $i/$j" >&5
++    echo "configure: 30219: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -29803,8 +32706,7 @@
- ac_qt_libraries="$qt_libdir"
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29941,13 +32843,13 @@
- eval "$ac_cv_have_qt"
- 
- if test "$have_qt" != yes; then
--  echo "$as_me:$LINENO: result: $have_qt" >&5
--echo "${ECHO_T}$have_qt" >&6;
-+  { echo "$as_me:$LINENO: result: $have_qt" >&5
-+echo "${ECHO_T}$have_qt" >&6; };
- else
-   ac_cv_have_qt="have_qt=yes \
-     ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
--  echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
--echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
-+  { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
-+echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
- 
-   qt_libraries="$ac_qt_libraries"
-   qt_includes="$ac_qt_includes"
-@@ -29956,15 +32858,14 @@
- if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
- 
- 
--echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
--echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
-+echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
- if test "${kde_cv_qt_direct+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30085,12 +32986,12 @@
- 
- 
- if test "$kde_cv_qt_direct" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   qt_libraries=
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
- fi
- 
-@@ -30128,14 +33029,14 @@
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for moc" >&5
--echo $ECHO_N "checking for moc... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for moc" >&5
-+echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
-    if test -n "$MOC"; then
-         kde_cv_path="$MOC";
-    else
-         kde_cache=`echo moc | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -30178,8 +33079,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
- Please check whether you installed Qt correctly.
-@@ -30200,22 +33101,22 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MOC=$kde_cv_path
- 
-    fi
- 
-    if test -z "$UIC_NOT_NEEDED"; then
- 
--   echo "$as_me:$LINENO: checking for uic" >&5
--echo $ECHO_N "checking for uic... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for uic" >&5
-+echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
-    if test -n "$UIC_PATH"; then
-         kde_cv_path="$UIC_PATH";
-    else
-         kde_cache=`echo uic | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -30258,12 +33159,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-       UIC_PATH=""
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       UIC_PATH=$kde_cv_path
- 
-    fi
-@@ -30293,10 +33194,10 @@
- 
-        if test $kde_qtver = 3; then
- 
--    echo "$as_me:$LINENO: checking whether uic supports -L " >&5
--echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
-+echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
-     kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
--    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-+    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -30319,22 +33220,22 @@
- 
- 
-     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-         :
-         ac_uic_supports_libpath=yes
-     else
--        echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+        { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-         :
-         ac_uic_supports_libpath=no
-     fi
- 
- 
--    echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
--echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
-+echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
-     kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
--    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-+    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -30357,13 +33258,13 @@
- 
- 
-     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-         :
-         ac_uic_supports_nounload=yes
-     else
--        echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+        { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-         :
-         ac_uic_supports_nounload=no
-     fi
-@@ -30394,15 +33295,14 @@
- 
- 
- if test -n "$LIBJPEG"; then
--echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
--echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
-+echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
- if test "${kde_cv_qt_jpeg+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30435,23 +33335,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
+@@ -33676,27 +30894,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -30460,9 +33373,10 @@
+-  (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
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "kde_cv_qt_jpeg=no"
+ else
    echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "kde_cv_qt_jpeg=yes"
-+	eval "kde_cv_qt_jpeg=yes"
+@@ -33705,7 +30907,7 @@
+ 	eval "kde_cv_qt_jpeg=yes"
  fi
--rm -f conftest.err conftest.$ac_objext \
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30478,12 +33392,12 @@
- 
- 
- if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   LIBJPEG_QT='$(LIBJPEG)'
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   LIBJPEG_QT=
- fi
- 
-@@ -30514,15 +33428,15 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for rpath" >&5
--echo $ECHO_N "checking for rpath... $ECHO_C" >&6
--# Check whether --enable-rpath or --disable-rpath was given.
-+{ echo "$as_me:$LINENO: checking for rpath" >&5
-+echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
-+# Check whether --enable-rpath was given.
- if test "${enable_rpath+set}" = set; then
--  enableval="$enable_rpath"
--  USE_RPATH=$enableval
-+  enableval=$enable_rpath; USE_RPATH=$enableval
- else
-   USE_RPATH=yes
--fi;
-+fi
-+
- 
- if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
- 
-@@ -30546,11 +33460,11 @@
- 
- 
- 
--echo "$as_me:$LINENO: result: $USE_RPATH" >&5
--echo "${ECHO_T}$USE_RPATH" >&6
-+{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
-+echo "${ECHO_T}$USE_RPATH" >&6; }
- 
--echo "$as_me:$LINENO: checking for KDE" >&5
--echo $ECHO_N "checking for KDE... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE" >&5
-+echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
- 
- if test "${prefix}" != NONE; then
-   kde_includes=${includedir}
-@@ -30602,7 +33516,7 @@
+@@ -33845,7 +31047,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30605: $i/$j" >&5
-+    echo "configure: 33519: $i/$j" >&5
+-    echo "configure: 33848: $i/$j" >&5
++    echo "configure: 31050: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30632,7 +33546,7 @@
+@@ -33875,7 +31077,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30635: $i/$j" >&5
-+    echo "configure: 33549: $i/$j" >&5
+-    echo "configure: 33878: $i/$j" >&5
++    echo "configure: 31080: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30650,7 +33564,7 @@
+@@ -33893,7 +31095,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30653: $i/$j" >&5
-+    echo "configure: 33567: $i/$j" >&5
+-    echo "configure: 33896: $i/$j" >&5
++    echo "configure: 31098: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30709,12 +33623,12 @@
-  fi
-  if test "$exec_prefix" = NONE; then
-   ac_kde_exec_prefix="$ac_kde_prefix"
--  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
--echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
-+  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
-+echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
-  else
-   ac_kde_exec_prefix="$exec_prefix"
--  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
--echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
-+  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
-+echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
-  fi
- 
-  kde_libraries="${libdir}"
-@@ -30723,8 +33637,8 @@
- else
-   ac_cv_have_kde="have_kde=yes \
-     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
--  echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
--echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
-+  { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
-+echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
- 
-   kde_libraries="$ac_kde_libraries"
-   kde_includes="$ac_kde_includes"
-@@ -30762,8 +33676,8 @@
- 
- if test x$ac_uic_supports_libpath = xyes; then
- 
--echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
--echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
-+echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
- if test "${kde_cv_uic_plugins+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -30806,8 +33720,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
--echo "${ECHO_T}$kde_cv_uic_plugins" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
-+echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
- if test "$kde_cv_uic_plugins" != yes; then
- 	{ { echo "$as_me:$LINENO: error:
- you need to install kdelibs first.
-@@ -30839,10 +33753,9 @@
- 
- 
- 
--  # Check whether --enable-path-check or --disable-path-check was given.
-+  # Check whether --enable-path-check was given.
- if test "${enable_path_check+set}" = set; then
--  enableval="$enable_path_check"
--
-+  enableval=$enable_path_check;
-   if test "$enableval" = "no";
-     then ac_use_path_checking="default"
-     else ac_use_path_checking=""
-@@ -30856,13 +33769,14 @@
-   fi
- 
- 
--fi;
-+fi
-+
- 
- 
- 
- 
--echo "$as_me:$LINENO: checking for KDE paths" >&5
--echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE paths" >&5
-+echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
- kde_result=""
- kde_cached_paths=yes
- if test "${kde_cv_all_paths+set}" = set; then
-@@ -30973,15 +33887,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'
-@@ -31033,8 +33946,8 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--   echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+   { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  else
-    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
- Check, if you installed the KDE header files correctly.
-@@ -31073,8 +33986,8 @@
-      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-   fi
- 
--echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
--echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
- ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
- 
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31082,8 +33995,8 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
- Check, if your compiler is installed correctly and if you have used the
-@@ -31276,15 +34189,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'
-@@ -31336,8 +34248,8 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--   echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+   { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  else
-    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
- Check, if you installed the KDE header files correctly.
-@@ -31376,8 +34288,8 @@
-      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-   fi
- 
--echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
--echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
- ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
- 
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31385,8 +34297,8 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
- Check, if your compiler is installed correctly and if you have used the
-@@ -31478,22 +34390,22 @@
-    { (exit 1); exit 1; }; }
- else
-   rm -f conftest*
--  echo "$as_me:$LINENO: result: $kde_result" >&5
--echo "${ECHO_T}$kde_result" >&6
-+  { echo "$as_me:$LINENO: result: $kde_result" >&5
-+echo "${ECHO_T}$kde_result" >&6; }
- fi
- 
- bindir=$kde_bindir
- 
- 
- 
--# Check whether --with-arts or --without-arts was given.
-+# Check whether --with-arts was given.
- if test "${with_arts+set}" = set; then
--  withval="$with_arts"
--  build_arts=$withval
-+  withval=$with_arts; build_arts=$withval
- else
-   build_arts=yes
- 
--fi;
-+fi
-+
- 
- 
- if test "$build_arts" '!=' "no"; then
-@@ -31526,14 +34438,14 @@
- 
-         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
- 
--   echo "$as_me:$LINENO: checking for dcopidl" >&5
--echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dcopidl" >&5
-+echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
-    if test -n "$DCOPIDL"; then
-         kde_cv_path="$DCOPIDL";
-    else
-         kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31576,8 +34488,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
- Please check whether you installed KDE correctly.
-@@ -31588,21 +34500,21 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DCOPIDL=$kde_cv_path
- 
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
--echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
-+echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
-    if test -n "$DCOPIDL2CPP"; then
-         kde_cv_path="$DCOPIDL2CPP";
-    else
-         kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31645,8 +34557,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
- Please check whether you installed KDE correctly.
-@@ -31657,22 +34569,22 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DCOPIDL2CPP=$kde_cv_path
- 
-    fi
- 
-         if test "$build_arts" '!=' "no"; then
- 
--   echo "$as_me:$LINENO: checking for mcopidl" >&5
--echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for mcopidl" >&5
-+echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
-    if test -n "$MCOPIDL"; then
-         kde_cv_path="$MCOPIDL";
-    else
-         kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31715,8 +34627,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
- Please check whether you installed aRts correctly or use
-@@ -31729,21 +34641,21 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MCOPIDL=$kde_cv_path
- 
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for artsc-config" >&5
--echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for artsc-config" >&5
-+echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
-    if test -n "$ARTSCCONFIG"; then
-         kde_cv_path="$ARTSCCONFIG";
-    else
-         kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31786,8 +34698,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
- Please check whether you installed aRts correctly or use
-@@ -31800,22 +34712,22 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       ARTSCCONFIG=$kde_cv_path
- 
-    fi
- 
-         fi
- 
--   echo "$as_me:$LINENO: checking for meinproc" >&5
--echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for meinproc" >&5
-+echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
-    if test -n "$MEINPROC"; then
-         kde_cv_path="$MEINPROC";
-    else
-         kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31858,12 +34770,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MEINPROC=$kde_cv_path
- 
-    fi
-@@ -31892,14 +34804,14 @@
- 
-         if test -n "$kde32ornewer"; then
- 
--   echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
--echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
-+echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
-    if test -n "$KCONFIG_COMPILER"; then
-         kde_cv_path="$KCONFIG_COMPILER";
-    else
-         kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31942,8 +34854,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
- Please check whether you installed KDE correctly.
-@@ -31954,21 +34866,21 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       KCONFIG_COMPILER=$kde_cv_path
- 
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for dcopidlng" >&5
--echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dcopidlng" >&5
-+echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
-    if test -n "$DCOPIDLNG"; then
-         kde_cv_path="$DCOPIDLNG";
-    else
-         kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32011,8 +34923,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
- Please check whether you installed KDE correctly.
-@@ -32023,8 +34935,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DCOPIDLNG=$kde_cv_path
- 
-    fi
-@@ -32032,14 +34944,14 @@
-         fi
-         if test -n "$kde33ornewer"; then
- 
--   echo "$as_me:$LINENO: checking for makekdewidgets" >&5
--echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
-+echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
-    if test -n "$MAKEKDEWIDGETS"; then
-         kde_cv_path="$MAKEKDEWIDGETS";
-    else
-         kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32082,8 +34994,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
- Please check whether you installed KDE correctly.
-@@ -32094,8 +35006,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MAKEKDEWIDGETS=$kde_cv_path
- 
-    fi
-@@ -32103,14 +35015,14 @@
- 
-         fi
- 
--   echo "$as_me:$LINENO: checking for xmllint" >&5
--echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for xmllint" >&5
-+echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
-    if test -n "$XMLLINT"; then
-         kde_cv_path="$XMLLINT";
-    else
-         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32153,12 +35065,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-       XMLLINT=""
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       XMLLINT=$kde_cv_path
- 
-    fi
-@@ -32173,7 +35085,7 @@
+@@ -35414,7 +32616,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32176: $i/$j" >&5
-+    echo "configure: 35088: $i/$j" >&5
+-    echo "configure: 35417: $i/$j" >&5
++    echo "configure: 32619: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32343,8 +35255,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking for Qt docs" >&5
--echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Qt docs" >&5
-+echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
- kde_qtdir=
- if test "${with_qt_dir+set}" = set; then
-   kde_qtdir="$with_qt_dir"
-@@ -32356,7 +35268,7 @@
+@@ -35597,7 +32799,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 32359: $i/$j" >&5
-+    echo "configure: 35271: $i/$j" >&5
+-    echo "configure: 35600: $i/$j" >&5
++    echo "configure: 32802: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -32365,20 +35277,20 @@
-   done
- done
- 
--echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
--echo "${ECHO_T}$QTDOCDIR" >&6
-+{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
-+echo "${ECHO_T}$QTDOCDIR" >&6; }
- 
- 
- 
- 
--   echo "$as_me:$LINENO: checking for dot" >&5
--echo $ECHO_N "checking for dot... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dot" >&5
-+echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
-    if test -n "$DOT"; then
-         kde_cv_path="$DOT";
-    else
-         kde_cache=`echo dot | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32421,12 +35333,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DOT=$kde_cv_path
- 
-    fi
-@@ -32438,14 +35350,14 @@
- fi
- 
- 
--   echo "$as_me:$LINENO: checking for doxygen" >&5
--echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for doxygen" >&5
-+echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
-    if test -n "$DOXYGEN"; then
-         kde_cv_path="$DOXYGEN";
-    else
-         kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32488,12 +35400,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DOXYGEN=$kde_cv_path
- 
-    fi
-@@ -32534,8 +35446,8 @@
- fi
- 
- for i in $ac_topsubdirs; do
--  echo "$as_me:$LINENO: checking if $i should be compiled" >&5
--echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
-+echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
-   if test -d $srcdir/$i; then
-     install_it="yes"
-     for j in $DO_NOT_COMPILE; do
-@@ -32546,8 +35458,8 @@
-   else
-     install_it="no"
-   fi
--  echo "$as_me:$LINENO: result: $install_it" >&5
--echo "${ECHO_T}$install_it" >&6
-+  { echo "$as_me:$LINENO: result: $install_it" >&5
-+echo "${ECHO_T}$install_it" >&6; }
-   vari=`echo $i | sed -e 's,[-+.@],_,g'`
-   if test $install_it = "yes"; then
-     TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -33049,223 +35961,223 @@
-   zu_SUBDIR_included_FALSE=
- fi
- 
--          ac_config_files="$ac_config_files Makefile"
-+ac_config_files="$ac_config_files Makefile"
- 
--          ac_config_files="$ac_config_files ar/Makefile"
-+ac_config_files="$ac_config_files ar/Makefile"
- 
--          ac_config_files="$ac_config_files ar/messages/Makefile"
-+ac_config_files="$ac_config_files ar/messages/Makefile"
- 
--          ac_config_files="$ac_config_files az/Makefile"
-+ac_config_files="$ac_config_files az/Makefile"
- 
--          ac_config_files="$ac_config_files az/messages/Makefile"
-+ac_config_files="$ac_config_files az/messages/Makefile"
- 
--          ac_config_files="$ac_config_files bg/Makefile"
-+ac_config_files="$ac_config_files bg/Makefile"
- 
--          ac_config_files="$ac_config_files bg/messages/Makefile"
-+ac_config_files="$ac_config_files bg/messages/Makefile"
- 
--          ac_config_files="$ac_config_files br/Makefile"
-+ac_config_files="$ac_config_files br/Makefile"
- 
--          ac_config_files="$ac_config_files br/messages/Makefile"
-+ac_config_files="$ac_config_files br/messages/Makefile"
- 
--          ac_config_files="$ac_config_files ca/Makefile"
-+ac_config_files="$ac_config_files ca/Makefile"
- 
--          ac_config_files="$ac_config_files ca/messages/Makefile"
-+ac_config_files="$ac_config_files ca/messages/Makefile"
- 
--          ac_config_files="$ac_config_files cs/Makefile"
-+ac_config_files="$ac_config_files cs/Makefile"
- 
--          ac_config_files="$ac_config_files cs/messages/Makefile"
-+ac_config_files="$ac_config_files cs/messages/Makefile"
- 
--          ac_config_files="$ac_config_files cy/Makefile"
-+ac_config_files="$ac_config_files cy/Makefile"
- 
--          ac_config_files="$ac_config_files cy/messages/Makefile"
-+ac_config_files="$ac_config_files cy/messages/Makefile"
- 
--          ac_config_files="$ac_config_files da/Makefile"
-+ac_config_files="$ac_config_files da/Makefile"
- 
--          ac_config_files="$ac_config_files da/doc/Makefile"
-+ac_config_files="$ac_config_files da/doc/Makefile"
- 
--          ac_config_files="$ac_config_files da/messages/Makefile"
-+ac_config_files="$ac_config_files da/messages/Makefile"
- 
--          ac_config_files="$ac_config_files de/Makefile"
-+ac_config_files="$ac_config_files de/Makefile"
- 
--          ac_config_files="$ac_config_files de/doc/Makefile"
-+ac_config_files="$ac_config_files de/doc/Makefile"
- 
--          ac_config_files="$ac_config_files de/messages/Makefile"
-+ac_config_files="$ac_config_files de/messages/Makefile"
- 
--          ac_config_files="$ac_config_files el/Makefile"
-+ac_config_files="$ac_config_files el/Makefile"
- 
--          ac_config_files="$ac_config_files el/messages/Makefile"
-+ac_config_files="$ac_config_files el/messages/Makefile"
- 
--          ac_config_files="$ac_config_files en_GB/Makefile"
-+ac_config_files="$ac_config_files en_GB/Makefile"
- 
--          ac_config_files="$ac_config_files en_GB/messages/Makefile"
-+ac_config_files="$ac_config_files en_GB/messages/Makefile"
- 
--          ac_config_files="$ac_config_files es/Makefile"
-+ac_config_files="$ac_config_files es/Makefile"
- 
--          ac_config_files="$ac_config_files es/messages/Makefile"
-+ac_config_files="$ac_config_files es/messages/Makefile"
- 
--          ac_config_files="$ac_config_files et/Makefile"
-+ac_config_files="$ac_config_files et/Makefile"
- 
--          ac_config_files="$ac_config_files et/doc/Makefile"
-+ac_config_files="$ac_config_files et/doc/Makefile"
- 
--          ac_config_files="$ac_config_files et/messages/Makefile"
-+ac_config_files="$ac_config_files et/messages/Makefile"
- 
--          ac_config_files="$ac_config_files fi/Makefile"
-+ac_config_files="$ac_config_files fi/Makefile"
- 
--          ac_config_files="$ac_config_files fi/messages/Makefile"
-+ac_config_files="$ac_config_files fi/messages/Makefile"
- 
--          ac_config_files="$ac_config_files fo/Makefile"
-+ac_config_files="$ac_config_files fo/Makefile"
- 
--          ac_config_files="$ac_config_files fo/messages/Makefile"
-+ac_config_files="$ac_config_files fo/messages/Makefile"
- 
--          ac_config_files="$ac_config_files fr/Makefile"
-+ac_config_files="$ac_config_files fr/Makefile"
- 
--          ac_config_files="$ac_config_files fr/doc/Makefile"
-+ac_config_files="$ac_config_files fr/doc/Makefile"
- 
--          ac_config_files="$ac_config_files fr/messages/Makefile"
-+ac_config_files="$ac_config_files fr/messages/Makefile"
- 
--          ac_config_files="$ac_config_files ga/Makefile"
-+ac_config_files="$ac_config_files ga/Makefile"
- 
--          ac_config_files="$ac_config_files ga/messages/Makefile"
-+ac_config_files="$ac_config_files ga/messages/Makefile"
- 
--          ac_config_files="$ac_config_files gl/Makefile"
-+ac_config_files="$ac_config_files gl/Makefile"
- 
--          ac_config_files="$ac_config_files gl/messages/Makefile"
-+ac_config_files="$ac_config_files gl/messages/Makefile"
- 
--          ac_config_files="$ac_config_files he/Makefile"
-+ac_config_files="$ac_config_files he/Makefile"
- 
--          ac_config_files="$ac_config_files he/messages/Makefile"
-+ac_config_files="$ac_config_files he/messages/Makefile"
- 
--          ac_config_files="$ac_config_files hi/Makefile"
-+ac_config_files="$ac_config_files hi/Makefile"
- 
--          ac_config_files="$ac_config_files hi/messages/Makefile"
-+ac_config_files="$ac_config_files hi/messages/Makefile"
- 
--          ac_config_files="$ac_config_files hu/Makefile"
-+ac_config_files="$ac_config_files hu/Makefile"
- 
--          ac_config_files="$ac_config_files hu/messages/Makefile"
-+ac_config_files="$ac_config_files hu/messages/Makefile"
- 
--          ac_config_files="$ac_config_files is/Makefile"
-+ac_config_files="$ac_config_files is/Makefile"
- 
--          ac_config_files="$ac_config_files is/messages/Makefile"
-+ac_config_files="$ac_config_files is/messages/Makefile"
- 
--          ac_config_files="$ac_config_files it/Makefile"
-+ac_config_files="$ac_config_files it/Makefile"
- 
--          ac_config_files="$ac_config_files it/doc/Makefile"
-+ac_config_files="$ac_config_files it/doc/Makefile"
- 
--          ac_config_files="$ac_config_files it/messages/Makefile"
-+ac_config_files="$ac_config_files it/messages/Makefile"
- 
--          ac_config_files="$ac_config_files ja/Makefile"
-+ac_config_files="$ac_config_files ja/Makefile"
- 
--          ac_config_files="$ac_config_files ja/messages/Makefile"
-+ac_config_files="$ac_config_files ja/messages/Makefile"
- 
--          ac_config_files="$ac_config_files ka/Makefile"
-+ac_config_files="$ac_config_files ka/Makefile"
- 
--          ac_config_files="$ac_config_files ka/messages/Makefile"
-+ac_config_files="$ac_config_files ka/messages/Makefile"
- 
--          ac_config_files="$ac_config_files ko/Makefile"
-+ac_config_files="$ac_config_files ko/Makefile"
- 
--          ac_config_files="$ac_config_files ko/messages/Makefile"
-+ac_config_files="$ac_config_files ko/messages/Makefile"
- 
--          ac_config_files="$ac_config_files lt/Makefile"
-+ac_config_files="$ac_config_files lt/Makefile"
- 
--          ac_config_files="$ac_config_files lt/messages/Makefile"
-+ac_config_files="$ac_config_files lt/messages/Makefile"
- 
--          ac_config_files="$ac_config_files nb/Makefile"
-+ac_config_files="$ac_config_files nb/Makefile"
- 
--          ac_config_files="$ac_config_files nb/messages/Makefile"
-+ac_config_files="$ac_config_files nb/messages/Makefile"
- 
--          ac_config_files="$ac_config_files nl/Makefile"
-+ac_config_files="$ac_config_files nl/Makefile"
- 
--          ac_config_files="$ac_config_files nl/doc/Makefile"
-+ac_config_files="$ac_config_files nl/doc/Makefile"
- 
--          ac_config_files="$ac_config_files nl/messages/Makefile"
-+ac_config_files="$ac_config_files nl/messages/Makefile"
- 
--          ac_config_files="$ac_config_files nso/Makefile"
-+ac_config_files="$ac_config_files nso/Makefile"
- 
--          ac_config_files="$ac_config_files nso/messages/Makefile"
-+ac_config_files="$ac_config_files nso/messages/Makefile"
- 
--          ac_config_files="$ac_config_files pa/Makefile"
-+ac_config_files="$ac_config_files pa/Makefile"
- 
--          ac_config_files="$ac_config_files pa/messages/Makefile"
-+ac_config_files="$ac_config_files pa/messages/Makefile"
- 
--          ac_config_files="$ac_config_files pl/Makefile"
-+ac_config_files="$ac_config_files pl/Makefile"
- 
--          ac_config_files="$ac_config_files pl/messages/Makefile"
-+ac_config_files="$ac_config_files pl/messages/Makefile"
- 
--          ac_config_files="$ac_config_files pt/Makefile"
-+ac_config_files="$ac_config_files pt/Makefile"
- 
--          ac_config_files="$ac_config_files pt/doc/Makefile"
-+ac_config_files="$ac_config_files pt/doc/Makefile"
- 
--          ac_config_files="$ac_config_files pt/messages/Makefile"
-+ac_config_files="$ac_config_files pt/messages/Makefile"
- 
--          ac_config_files="$ac_config_files pt_BR/Makefile"
-+ac_config_files="$ac_config_files pt_BR/Makefile"
- 
--          ac_config_files="$ac_config_files pt_BR/doc/Makefile"
-+ac_config_files="$ac_config_files pt_BR/doc/Makefile"
- 
--          ac_config_files="$ac_config_files pt_BR/messages/Makefile"
-+ac_config_files="$ac_config_files pt_BR/messages/Makefile"
- 
--          ac_config_files="$ac_config_files ro/Makefile"
-+ac_config_files="$ac_config_files ro/Makefile"
- 
--          ac_config_files="$ac_config_files ro/messages/Makefile"
-+ac_config_files="$ac_config_files ro/messages/Makefile"
- 
--          ac_config_files="$ac_config_files ru/Makefile"
-+ac_config_files="$ac_config_files ru/Makefile"
- 
--          ac_config_files="$ac_config_files ru/doc/Makefile"
-+ac_config_files="$ac_config_files ru/doc/Makefile"
- 
--          ac_config_files="$ac_config_files ru/messages/Makefile"
-+ac_config_files="$ac_config_files ru/messages/Makefile"
- 
--          ac_config_files="$ac_config_files rw/Makefile"
-+ac_config_files="$ac_config_files rw/Makefile"
- 
--          ac_config_files="$ac_config_files rw/messages/Makefile"
-+ac_config_files="$ac_config_files rw/messages/Makefile"
- 
--          ac_config_files="$ac_config_files sk/Makefile"
-+ac_config_files="$ac_config_files sk/Makefile"
- 
--          ac_config_files="$ac_config_files sk/messages/Makefile"
-+ac_config_files="$ac_config_files sk/messages/Makefile"
- 
--          ac_config_files="$ac_config_files sr/Makefile"
-+ac_config_files="$ac_config_files sr/Makefile"
- 
--          ac_config_files="$ac_config_files sr/messages/Makefile"
-+ac_config_files="$ac_config_files sr/messages/Makefile"
- 
--          ac_config_files="$ac_config_files sr at Latn/Makefile"
-+ac_config_files="$ac_config_files sr at Latn/Makefile"
- 
--          ac_config_files="$ac_config_files sr at Latn/messages/Makefile"
-+ac_config_files="$ac_config_files sr at Latn/messages/Makefile"
- 
--          ac_config_files="$ac_config_files sv/Makefile"
-+ac_config_files="$ac_config_files sv/Makefile"
- 
--          ac_config_files="$ac_config_files sv/doc/Makefile"
-+ac_config_files="$ac_config_files sv/doc/Makefile"
- 
--          ac_config_files="$ac_config_files sv/messages/Makefile"
-+ac_config_files="$ac_config_files sv/messages/Makefile"
- 
--          ac_config_files="$ac_config_files ta/Makefile"
-+ac_config_files="$ac_config_files ta/Makefile"
- 
--          ac_config_files="$ac_config_files ta/messages/Makefile"
-+ac_config_files="$ac_config_files ta/messages/Makefile"
- 
--          ac_config_files="$ac_config_files tr/Makefile"
-+ac_config_files="$ac_config_files tr/Makefile"
- 
--          ac_config_files="$ac_config_files tr/messages/Makefile"
-+ac_config_files="$ac_config_files tr/messages/Makefile"
- 
--          ac_config_files="$ac_config_files uk/Makefile"
-+ac_config_files="$ac_config_files uk/Makefile"
- 
--          ac_config_files="$ac_config_files uk/messages/Makefile"
-+ac_config_files="$ac_config_files uk/messages/Makefile"
- 
--          ac_config_files="$ac_config_files ven/Makefile"
-+ac_config_files="$ac_config_files ven/Makefile"
- 
--          ac_config_files="$ac_config_files ven/messages/Makefile"
-+ac_config_files="$ac_config_files ven/messages/Makefile"
- 
--          ac_config_files="$ac_config_files xh/Makefile"
-+ac_config_files="$ac_config_files xh/Makefile"
- 
--          ac_config_files="$ac_config_files xh/messages/Makefile"
-+ac_config_files="$ac_config_files xh/messages/Makefile"
- 
--          ac_config_files="$ac_config_files zh_CN/Makefile"
-+ac_config_files="$ac_config_files zh_CN/Makefile"
- 
--          ac_config_files="$ac_config_files zh_CN/messages/Makefile"
-+ac_config_files="$ac_config_files zh_CN/messages/Makefile"
- 
--          ac_config_files="$ac_config_files zh_TW/Makefile"
-+ac_config_files="$ac_config_files zh_TW/Makefile"
- 
--          ac_config_files="$ac_config_files zh_TW/messages/Makefile"
-+ac_config_files="$ac_config_files zh_TW/messages/Makefile"
- 
--          ac_config_files="$ac_config_files zu/Makefile"
-+ac_config_files="$ac_config_files zu/Makefile"
- 
--          ac_config_files="$ac_config_files zu/messages/Makefile"
-+ac_config_files="$ac_config_files zu/messages/Makefile"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -33285,39 +36197,58 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-       # `set' does not quote correctly, so add quotes (double-quote
-       # substitution turns \\\\ into \\, and sed turns \\ into \).
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -33326,38 +36257,31 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- 
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
--  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[	 ]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[	 ]*$//;
--}'
--fi
--
- DEFS=-DHAVE_CONFIG_H
- 
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
--  ac_i=`echo "$ac_i" |
--	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
--  # 2. Add them.
--  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
--  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  ac_i=`echo "$ac_i" | sed "$ac_script"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
- 
+@@ -36618,6 +33820,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -54412,440 +39100,83 @@
  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
-@@ -33774,11 +36698,35 @@
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
+@@ -37034,7 +34243,8 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
  
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -37043,10 +34253,13 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
 +
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
-@@ -33787,8 +36735,43 @@
  fi
- 
- 
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
 +
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
 +
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -33802,18 +36785,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
  
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
  
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
-@@ -33821,159 +36805,120 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
-+# CDPATH.
-+$as_unset CDPATH
- 
- 
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
- 
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- 
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-     sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-       N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
-+      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+  chmod +x "$as_me.lineno" ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
- esac
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
+ # PATH needs CR
+@@ -37270,19 +34483,28 @@
+   as_mkdir_p=false
  fi
  
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
+-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
  else
-   as_ln_s='cp -p'
+-  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
  fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
+-rm -f conf$$.file
++as_executable_p=$as_test_x
  
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
-@@ -33982,7 +36927,19 @@
-   as_mkdir_p=false
- fi
- 
--as_executable_p="test -f"
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
- 
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -33991,31 +36948,14 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- exec 6>&1
- 
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# Save the log message, to keep $[0] and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling.  Logging --version etc. is OK.
--exec 5>>config.log
--{
--  echo
--  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
+@@ -37298,7 +34520,7 @@
+ # values after options handling.
+ ac_log="
  This file was extended by $as_me, which was
--generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.60a.  Invocation command line was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -34023,30 +36963,20 @@
-   CONFIG_COMMANDS = $CONFIG_COMMANDS
-   $ $0 $@
- 
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
- 
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
--  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
--  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
--  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
- 
--if test -n "$ac_config_commands"; then
--  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -34054,7 +36984,7 @@
+@@ -37327,7 +34549,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -54854,2261 +39185,125 @@
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -34073,19 +37003,21 @@
- $config_commands
- 
- Report bugs to <bug-autoconf at gnu.org>."
--_ACEOF
- 
-+_ACEOF
+@@ -37351,7 +34573,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  config.status
--configured by $0, generated by GNU Autoconf 2.59,
--  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60a,
-+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+-configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.61,
+   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
- _ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -34096,39 +37028,24 @@
- do
-   case $1 in
-   --*=*)
--    ac_option=`expr "x$1" : 'x\([^=]*\)='`
--    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
--  -*)
-+  *)
-     ac_option=$1
-     ac_optarg=$2
-     ac_shift=shift
-     ;;
--  *) # This is not an option, so the user has probably given explicit
--     # arguments.
--     ac_option=$1
--     ac_need_defaults=false;;
-   esac
- 
-   case $ac_option in
-   # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     ac_cs_recheck=: ;;
--  --version | --vers* | -V )
--    echo "$ac_cs_version"; exit 0 ;;
--  --he | --h)
--    # Conflict between --help and --header
--    { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; };;
--  --help | --hel | -h )
--    echo "$ac_cs_usage"; exit 0 ;;
--  --debug | --d* | -d )
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    echo "$ac_cs_version"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
-@@ -34138,18 +37055,24 @@
-     $ac_shift
-     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-     ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; };;
-+  --help | --hel | -h )
-+    echo "$ac_cs_usage"; exit ;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil | --si | --s)
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+  -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
- 
--  *) ac_config_targets="$ac_config_targets $1" ;;
-+  *) ac_config_targets="$ac_config_targets $1"
-+     ac_need_defaults=false ;;
- 
-   esac
-   shift
-@@ -34165,145 +37088,157 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
--  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
--  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+  CONFIG_SHELL=$SHELL
-+  export CONFIG_SHELL
-+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
- 
- _ACEOF
--
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+  echo "$ac_log"
-+} >&5
-+
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- #
--# INIT-COMMANDS section.
-+# INIT-COMMANDS
- #
--
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
- _ACEOF
- 
--
--
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
--  case "$ac_config_target" in
--  # Handling of arguments.
--  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--  "ar/Makefile" ) CONFIG_FILES="$CONFIG_FILES ar/Makefile" ;;
--  "ar/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ar/messages/Makefile" ;;
--  "az/Makefile" ) CONFIG_FILES="$CONFIG_FILES az/Makefile" ;;
--  "az/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES az/messages/Makefile" ;;
--  "bg/Makefile" ) CONFIG_FILES="$CONFIG_FILES bg/Makefile" ;;
--  "bg/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES bg/messages/Makefile" ;;
--  "br/Makefile" ) CONFIG_FILES="$CONFIG_FILES br/Makefile" ;;
--  "br/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES br/messages/Makefile" ;;
--  "ca/Makefile" ) CONFIG_FILES="$CONFIG_FILES ca/Makefile" ;;
--  "ca/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ca/messages/Makefile" ;;
--  "cs/Makefile" ) CONFIG_FILES="$CONFIG_FILES cs/Makefile" ;;
--  "cs/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES cs/messages/Makefile" ;;
--  "cy/Makefile" ) CONFIG_FILES="$CONFIG_FILES cy/Makefile" ;;
--  "cy/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES cy/messages/Makefile" ;;
--  "da/Makefile" ) CONFIG_FILES="$CONFIG_FILES da/Makefile" ;;
--  "da/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES da/doc/Makefile" ;;
--  "da/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES da/messages/Makefile" ;;
--  "de/Makefile" ) CONFIG_FILES="$CONFIG_FILES de/Makefile" ;;
--  "de/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES de/doc/Makefile" ;;
--  "de/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES de/messages/Makefile" ;;
--  "el/Makefile" ) CONFIG_FILES="$CONFIG_FILES el/Makefile" ;;
--  "el/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES el/messages/Makefile" ;;
--  "en_GB/Makefile" ) CONFIG_FILES="$CONFIG_FILES en_GB/Makefile" ;;
--  "en_GB/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES en_GB/messages/Makefile" ;;
--  "es/Makefile" ) CONFIG_FILES="$CONFIG_FILES es/Makefile" ;;
--  "es/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES es/messages/Makefile" ;;
--  "et/Makefile" ) CONFIG_FILES="$CONFIG_FILES et/Makefile" ;;
--  "et/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES et/doc/Makefile" ;;
--  "et/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES et/messages/Makefile" ;;
--  "fi/Makefile" ) CONFIG_FILES="$CONFIG_FILES fi/Makefile" ;;
--  "fi/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES fi/messages/Makefile" ;;
--  "fo/Makefile" ) CONFIG_FILES="$CONFIG_FILES fo/Makefile" ;;
--  "fo/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES fo/messages/Makefile" ;;
--  "fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES fr/Makefile" ;;
--  "fr/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES fr/doc/Makefile" ;;
--  "fr/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES fr/messages/Makefile" ;;
--  "ga/Makefile" ) CONFIG_FILES="$CONFIG_FILES ga/Makefile" ;;
--  "ga/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ga/messages/Makefile" ;;
--  "gl/Makefile" ) CONFIG_FILES="$CONFIG_FILES gl/Makefile" ;;
--  "gl/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES gl/messages/Makefile" ;;
--  "he/Makefile" ) CONFIG_FILES="$CONFIG_FILES he/Makefile" ;;
--  "he/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES he/messages/Makefile" ;;
--  "hi/Makefile" ) CONFIG_FILES="$CONFIG_FILES hi/Makefile" ;;
--  "hi/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES hi/messages/Makefile" ;;
--  "hu/Makefile" ) CONFIG_FILES="$CONFIG_FILES hu/Makefile" ;;
--  "hu/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES hu/messages/Makefile" ;;
--  "is/Makefile" ) CONFIG_FILES="$CONFIG_FILES is/Makefile" ;;
--  "is/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES is/messages/Makefile" ;;
--  "it/Makefile" ) CONFIG_FILES="$CONFIG_FILES it/Makefile" ;;
--  "it/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES it/doc/Makefile" ;;
--  "it/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES it/messages/Makefile" ;;
--  "ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES ja/Makefile" ;;
--  "ja/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ja/messages/Makefile" ;;
--  "ka/Makefile" ) CONFIG_FILES="$CONFIG_FILES ka/Makefile" ;;
--  "ka/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ka/messages/Makefile" ;;
--  "ko/Makefile" ) CONFIG_FILES="$CONFIG_FILES ko/Makefile" ;;
--  "ko/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ko/messages/Makefile" ;;
--  "lt/Makefile" ) CONFIG_FILES="$CONFIG_FILES lt/Makefile" ;;
--  "lt/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES lt/messages/Makefile" ;;
--  "nb/Makefile" ) CONFIG_FILES="$CONFIG_FILES nb/Makefile" ;;
--  "nb/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES nb/messages/Makefile" ;;
--  "nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES nl/Makefile" ;;
--  "nl/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES nl/doc/Makefile" ;;
--  "nl/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES nl/messages/Makefile" ;;
--  "nso/Makefile" ) CONFIG_FILES="$CONFIG_FILES nso/Makefile" ;;
--  "nso/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES nso/messages/Makefile" ;;
--  "pa/Makefile" ) CONFIG_FILES="$CONFIG_FILES pa/Makefile" ;;
--  "pa/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES pa/messages/Makefile" ;;
--  "pl/Makefile" ) CONFIG_FILES="$CONFIG_FILES pl/Makefile" ;;
--  "pl/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES pl/messages/Makefile" ;;
--  "pt/Makefile" ) CONFIG_FILES="$CONFIG_FILES pt/Makefile" ;;
--  "pt/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES pt/doc/Makefile" ;;
--  "pt/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES pt/messages/Makefile" ;;
--  "pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES pt_BR/Makefile" ;;
--  "pt_BR/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES pt_BR/doc/Makefile" ;;
--  "pt_BR/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES pt_BR/messages/Makefile" ;;
--  "ro/Makefile" ) CONFIG_FILES="$CONFIG_FILES ro/Makefile" ;;
--  "ro/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ro/messages/Makefile" ;;
--  "ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES ru/Makefile" ;;
--  "ru/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES ru/doc/Makefile" ;;
--  "ru/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ru/messages/Makefile" ;;
--  "rw/Makefile" ) CONFIG_FILES="$CONFIG_FILES rw/Makefile" ;;
--  "rw/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES rw/messages/Makefile" ;;
--  "sk/Makefile" ) CONFIG_FILES="$CONFIG_FILES sk/Makefile" ;;
--  "sk/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES sk/messages/Makefile" ;;
--  "sr/Makefile" ) CONFIG_FILES="$CONFIG_FILES sr/Makefile" ;;
--  "sr/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES sr/messages/Makefile" ;;
--  "sr at Latn/Makefile" ) CONFIG_FILES="$CONFIG_FILES sr at Latn/Makefile" ;;
--  "sr at Latn/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES sr at Latn/messages/Makefile" ;;
--  "sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES sv/Makefile" ;;
--  "sv/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES sv/doc/Makefile" ;;
--  "sv/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES sv/messages/Makefile" ;;
--  "ta/Makefile" ) CONFIG_FILES="$CONFIG_FILES ta/Makefile" ;;
--  "ta/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ta/messages/Makefile" ;;
--  "tr/Makefile" ) CONFIG_FILES="$CONFIG_FILES tr/Makefile" ;;
--  "tr/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES tr/messages/Makefile" ;;
--  "uk/Makefile" ) CONFIG_FILES="$CONFIG_FILES uk/Makefile" ;;
--  "uk/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES uk/messages/Makefile" ;;
--  "ven/Makefile" ) CONFIG_FILES="$CONFIG_FILES ven/Makefile" ;;
--  "ven/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES ven/messages/Makefile" ;;
--  "xh/Makefile" ) CONFIG_FILES="$CONFIG_FILES xh/Makefile" ;;
--  "xh/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES xh/messages/Makefile" ;;
--  "zh_CN/Makefile" ) CONFIG_FILES="$CONFIG_FILES zh_CN/Makefile" ;;
--  "zh_CN/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES zh_CN/messages/Makefile" ;;
--  "zh_TW/Makefile" ) CONFIG_FILES="$CONFIG_FILES zh_TW/Makefile" ;;
--  "zh_TW/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES zh_TW/messages/Makefile" ;;
--  "zu/Makefile" ) CONFIG_FILES="$CONFIG_FILES zu/Makefile" ;;
--  "zu/messages/Makefile" ) CONFIG_FILES="$CONFIG_FILES zu/messages/Makefile" ;;
--  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
--  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+  case $ac_config_target in
-+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "ar/Makefile") CONFIG_FILES="$CONFIG_FILES ar/Makefile" ;;
-+    "ar/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ar/messages/Makefile" ;;
-+    "az/Makefile") CONFIG_FILES="$CONFIG_FILES az/Makefile" ;;
-+    "az/messages/Makefile") CONFIG_FILES="$CONFIG_FILES az/messages/Makefile" ;;
-+    "bg/Makefile") CONFIG_FILES="$CONFIG_FILES bg/Makefile" ;;
-+    "bg/messages/Makefile") CONFIG_FILES="$CONFIG_FILES bg/messages/Makefile" ;;
-+    "br/Makefile") CONFIG_FILES="$CONFIG_FILES br/Makefile" ;;
-+    "br/messages/Makefile") CONFIG_FILES="$CONFIG_FILES br/messages/Makefile" ;;
-+    "ca/Makefile") CONFIG_FILES="$CONFIG_FILES ca/Makefile" ;;
-+    "ca/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ca/messages/Makefile" ;;
-+    "cs/Makefile") CONFIG_FILES="$CONFIG_FILES cs/Makefile" ;;
-+    "cs/messages/Makefile") CONFIG_FILES="$CONFIG_FILES cs/messages/Makefile" ;;
-+    "cy/Makefile") CONFIG_FILES="$CONFIG_FILES cy/Makefile" ;;
-+    "cy/messages/Makefile") CONFIG_FILES="$CONFIG_FILES cy/messages/Makefile" ;;
-+    "da/Makefile") CONFIG_FILES="$CONFIG_FILES da/Makefile" ;;
-+    "da/doc/Makefile") CONFIG_FILES="$CONFIG_FILES da/doc/Makefile" ;;
-+    "da/messages/Makefile") CONFIG_FILES="$CONFIG_FILES da/messages/Makefile" ;;
-+    "de/Makefile") CONFIG_FILES="$CONFIG_FILES de/Makefile" ;;
-+    "de/doc/Makefile") CONFIG_FILES="$CONFIG_FILES de/doc/Makefile" ;;
-+    "de/messages/Makefile") CONFIG_FILES="$CONFIG_FILES de/messages/Makefile" ;;
-+    "el/Makefile") CONFIG_FILES="$CONFIG_FILES el/Makefile" ;;
-+    "el/messages/Makefile") CONFIG_FILES="$CONFIG_FILES el/messages/Makefile" ;;
-+    "en_GB/Makefile") CONFIG_FILES="$CONFIG_FILES en_GB/Makefile" ;;
-+    "en_GB/messages/Makefile") CONFIG_FILES="$CONFIG_FILES en_GB/messages/Makefile" ;;
-+    "es/Makefile") CONFIG_FILES="$CONFIG_FILES es/Makefile" ;;
-+    "es/messages/Makefile") CONFIG_FILES="$CONFIG_FILES es/messages/Makefile" ;;
-+    "et/Makefile") CONFIG_FILES="$CONFIG_FILES et/Makefile" ;;
-+    "et/doc/Makefile") CONFIG_FILES="$CONFIG_FILES et/doc/Makefile" ;;
-+    "et/messages/Makefile") CONFIG_FILES="$CONFIG_FILES et/messages/Makefile" ;;
-+    "fi/Makefile") CONFIG_FILES="$CONFIG_FILES fi/Makefile" ;;
-+    "fi/messages/Makefile") CONFIG_FILES="$CONFIG_FILES fi/messages/Makefile" ;;
-+    "fo/Makefile") CONFIG_FILES="$CONFIG_FILES fo/Makefile" ;;
-+    "fo/messages/Makefile") CONFIG_FILES="$CONFIG_FILES fo/messages/Makefile" ;;
-+    "fr/Makefile") CONFIG_FILES="$CONFIG_FILES fr/Makefile" ;;
-+    "fr/doc/Makefile") CONFIG_FILES="$CONFIG_FILES fr/doc/Makefile" ;;
-+    "fr/messages/Makefile") CONFIG_FILES="$CONFIG_FILES fr/messages/Makefile" ;;
-+    "ga/Makefile") CONFIG_FILES="$CONFIG_FILES ga/Makefile" ;;
-+    "ga/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ga/messages/Makefile" ;;
-+    "gl/Makefile") CONFIG_FILES="$CONFIG_FILES gl/Makefile" ;;
-+    "gl/messages/Makefile") CONFIG_FILES="$CONFIG_FILES gl/messages/Makefile" ;;
-+    "he/Makefile") CONFIG_FILES="$CONFIG_FILES he/Makefile" ;;
-+    "he/messages/Makefile") CONFIG_FILES="$CONFIG_FILES he/messages/Makefile" ;;
-+    "hi/Makefile") CONFIG_FILES="$CONFIG_FILES hi/Makefile" ;;
-+    "hi/messages/Makefile") CONFIG_FILES="$CONFIG_FILES hi/messages/Makefile" ;;
-+    "hu/Makefile") CONFIG_FILES="$CONFIG_FILES hu/Makefile" ;;
-+    "hu/messages/Makefile") CONFIG_FILES="$CONFIG_FILES hu/messages/Makefile" ;;
-+    "is/Makefile") CONFIG_FILES="$CONFIG_FILES is/Makefile" ;;
-+    "is/messages/Makefile") CONFIG_FILES="$CONFIG_FILES is/messages/Makefile" ;;
-+    "it/Makefile") CONFIG_FILES="$CONFIG_FILES it/Makefile" ;;
-+    "it/doc/Makefile") CONFIG_FILES="$CONFIG_FILES it/doc/Makefile" ;;
-+    "it/messages/Makefile") CONFIG_FILES="$CONFIG_FILES it/messages/Makefile" ;;
-+    "ja/Makefile") CONFIG_FILES="$CONFIG_FILES ja/Makefile" ;;
-+    "ja/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ja/messages/Makefile" ;;
-+    "ka/Makefile") CONFIG_FILES="$CONFIG_FILES ka/Makefile" ;;
-+    "ka/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ka/messages/Makefile" ;;
-+    "ko/Makefile") CONFIG_FILES="$CONFIG_FILES ko/Makefile" ;;
-+    "ko/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ko/messages/Makefile" ;;
-+    "lt/Makefile") CONFIG_FILES="$CONFIG_FILES lt/Makefile" ;;
-+    "lt/messages/Makefile") CONFIG_FILES="$CONFIG_FILES lt/messages/Makefile" ;;
-+    "nb/Makefile") CONFIG_FILES="$CONFIG_FILES nb/Makefile" ;;
-+    "nb/messages/Makefile") CONFIG_FILES="$CONFIG_FILES nb/messages/Makefile" ;;
-+    "nl/Makefile") CONFIG_FILES="$CONFIG_FILES nl/Makefile" ;;
-+    "nl/doc/Makefile") CONFIG_FILES="$CONFIG_FILES nl/doc/Makefile" ;;
-+    "nl/messages/Makefile") CONFIG_FILES="$CONFIG_FILES nl/messages/Makefile" ;;
-+    "nso/Makefile") CONFIG_FILES="$CONFIG_FILES nso/Makefile" ;;
-+    "nso/messages/Makefile") CONFIG_FILES="$CONFIG_FILES nso/messages/Makefile" ;;
-+    "pa/Makefile") CONFIG_FILES="$CONFIG_FILES pa/Makefile" ;;
-+    "pa/messages/Makefile") CONFIG_FILES="$CONFIG_FILES pa/messages/Makefile" ;;
-+    "pl/Makefile") CONFIG_FILES="$CONFIG_FILES pl/Makefile" ;;
-+    "pl/messages/Makefile") CONFIG_FILES="$CONFIG_FILES pl/messages/Makefile" ;;
-+    "pt/Makefile") CONFIG_FILES="$CONFIG_FILES pt/Makefile" ;;
-+    "pt/doc/Makefile") CONFIG_FILES="$CONFIG_FILES pt/doc/Makefile" ;;
-+    "pt/messages/Makefile") CONFIG_FILES="$CONFIG_FILES pt/messages/Makefile" ;;
-+    "pt_BR/Makefile") CONFIG_FILES="$CONFIG_FILES pt_BR/Makefile" ;;
-+    "pt_BR/doc/Makefile") CONFIG_FILES="$CONFIG_FILES pt_BR/doc/Makefile" ;;
-+    "pt_BR/messages/Makefile") CONFIG_FILES="$CONFIG_FILES pt_BR/messages/Makefile" ;;
-+    "ro/Makefile") CONFIG_FILES="$CONFIG_FILES ro/Makefile" ;;
-+    "ro/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ro/messages/Makefile" ;;
-+    "ru/Makefile") CONFIG_FILES="$CONFIG_FILES ru/Makefile" ;;
-+    "ru/doc/Makefile") CONFIG_FILES="$CONFIG_FILES ru/doc/Makefile" ;;
-+    "ru/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ru/messages/Makefile" ;;
-+    "rw/Makefile") CONFIG_FILES="$CONFIG_FILES rw/Makefile" ;;
-+    "rw/messages/Makefile") CONFIG_FILES="$CONFIG_FILES rw/messages/Makefile" ;;
-+    "sk/Makefile") CONFIG_FILES="$CONFIG_FILES sk/Makefile" ;;
-+    "sk/messages/Makefile") CONFIG_FILES="$CONFIG_FILES sk/messages/Makefile" ;;
-+    "sr/Makefile") CONFIG_FILES="$CONFIG_FILES sr/Makefile" ;;
-+    "sr/messages/Makefile") CONFIG_FILES="$CONFIG_FILES sr/messages/Makefile" ;;
-+    "sr at Latn/Makefile") CONFIG_FILES="$CONFIG_FILES sr at Latn/Makefile" ;;
-+    "sr at Latn/messages/Makefile") CONFIG_FILES="$CONFIG_FILES sr at Latn/messages/Makefile" ;;
-+    "sv/Makefile") CONFIG_FILES="$CONFIG_FILES sv/Makefile" ;;
-+    "sv/doc/Makefile") CONFIG_FILES="$CONFIG_FILES sv/doc/Makefile" ;;
-+    "sv/messages/Makefile") CONFIG_FILES="$CONFIG_FILES sv/messages/Makefile" ;;
-+    "ta/Makefile") CONFIG_FILES="$CONFIG_FILES ta/Makefile" ;;
-+    "ta/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ta/messages/Makefile" ;;
-+    "tr/Makefile") CONFIG_FILES="$CONFIG_FILES tr/Makefile" ;;
-+    "tr/messages/Makefile") CONFIG_FILES="$CONFIG_FILES tr/messages/Makefile" ;;
-+    "uk/Makefile") CONFIG_FILES="$CONFIG_FILES uk/Makefile" ;;
-+    "uk/messages/Makefile") CONFIG_FILES="$CONFIG_FILES uk/messages/Makefile" ;;
-+    "ven/Makefile") CONFIG_FILES="$CONFIG_FILES ven/Makefile" ;;
-+    "ven/messages/Makefile") CONFIG_FILES="$CONFIG_FILES ven/messages/Makefile" ;;
-+    "xh/Makefile") CONFIG_FILES="$CONFIG_FILES xh/Makefile" ;;
-+    "xh/messages/Makefile") CONFIG_FILES="$CONFIG_FILES xh/messages/Makefile" ;;
-+    "zh_CN/Makefile") CONFIG_FILES="$CONFIG_FILES zh_CN/Makefile" ;;
-+    "zh_CN/messages/Makefile") CONFIG_FILES="$CONFIG_FILES zh_CN/messages/Makefile" ;;
-+    "zh_TW/Makefile") CONFIG_FILES="$CONFIG_FILES zh_TW/Makefile" ;;
-+    "zh_TW/messages/Makefile") CONFIG_FILES="$CONFIG_FILES zh_TW/messages/Makefile" ;;
-+    "zu/Makefile") CONFIG_FILES="$CONFIG_FILES zu/Makefile" ;;
-+    "zu/messages/Makefile") CONFIG_FILES="$CONFIG_FILES zu/messages/Makefile" ;;
-+
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
- done
- 
-+
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used.  Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -34315,596 +37250,790 @@
- fi
- 
- # Have a temporary directory for convenience.  Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
--  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-   trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
- 
- {
--  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-   test -n "$tmp" && test -d "$tmp"
- }  ||
- {
--  tmp=./confstat$$-$RANDOM
--  (umask 077 && mkdir $tmp)
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
- } ||
- {
-    echo "$me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
- 
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
--  # Protect against being on the right side of a sed subst in config.status.
--  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
--   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s, at SHELL@,$SHELL,;t t
--s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s, at exec_prefix@,$exec_prefix,;t t
--s, at prefix@,$prefix,;t t
--s, at program_transform_name@,$program_transform_name,;t t
--s, at bindir@,$bindir,;t t
--s, at sbindir@,$sbindir,;t t
--s, at libexecdir@,$libexecdir,;t t
--s, at datadir@,$datadir,;t t
--s, at sysconfdir@,$sysconfdir,;t t
--s, at sharedstatedir@,$sharedstatedir,;t t
--s, at localstatedir@,$localstatedir,;t t
--s, at libdir@,$libdir,;t t
--s, at includedir@,$includedir,;t t
--s, at oldincludedir@,$oldincludedir,;t t
--s, at infodir@,$infodir,;t t
--s, at mandir@,$mandir,;t t
--s, at build_alias@,$build_alias,;t t
--s, at host_alias@,$host_alias,;t t
--s, at target_alias@,$target_alias,;t t
--s, at DEFS@,$DEFS,;t t
--s, at ECHO_C@,$ECHO_C,;t t
--s, at ECHO_N@,$ECHO_N,;t t
--s, at ECHO_T@,$ECHO_T,;t t
--s, at LIBS@,$LIBS,;t t
--s, at build@,$build,;t t
--s, at build_cpu@,$build_cpu,;t t
--s, at build_vendor@,$build_vendor,;t t
--s, at build_os@,$build_os,;t t
--s, at host@,$host,;t t
--s, at host_cpu@,$host_cpu,;t t
--s, at host_vendor@,$host_vendor,;t t
--s, at host_os@,$host_os,;t t
--s, at target@,$target,;t t
--s, at target_cpu@,$target_cpu,;t t
--s, at target_vendor@,$target_vendor,;t t
--s, at target_os@,$target_os,;t t
--s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s, at INSTALL_DATA@,$INSTALL_DATA,;t t
--s, at CYGPATH_W@,$CYGPATH_W,;t t
--s, at PACKAGE@,$PACKAGE,;t t
--s, at VERSION@,$VERSION,;t t
--s, at ACLOCAL@,$ACLOCAL,;t t
--s, at AUTOCONF@,$AUTOCONF,;t t
--s, at AUTOMAKE@,$AUTOMAKE,;t t
--s, at AUTOHEADER@,$AUTOHEADER,;t t
--s, at MAKEINFO@,$MAKEINFO,;t t
--s, at AMTAR@,$AMTAR,;t t
--s, at install_sh@,$install_sh,;t t
--s, at STRIP@,$STRIP,;t t
--s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
--s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
--s, at AWK@,$AWK,;t t
--s, at SET_MAKE@,$SET_MAKE,;t t
--s, at am__leading_dot@,$am__leading_dot,;t t
--s, at KDECONFIG@,$KDECONFIG,;t t
--s, at kde_libs_prefix@,$kde_libs_prefix,;t t
--s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
--s, at CONF_FILES@,$CONF_FILES,;t t
--s, at CC@,$CC,;t t
--s, at CFLAGS@,$CFLAGS,;t t
--s, at LDFLAGS@,$LDFLAGS,;t t
--s, at CPPFLAGS@,$CPPFLAGS,;t t
--s, at ac_ct_CC@,$ac_ct_CC,;t t
--s, at EXEEXT@,$EXEEXT,;t t
--s, at OBJEXT@,$OBJEXT,;t t
--s, at DEPDIR@,$DEPDIR,;t t
--s, at am__include@,$am__include,;t t
--s, at am__quote@,$am__quote,;t t
--s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
--s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
--s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
--s, at CCDEPMODE@,$CCDEPMODE,;t t
--s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
--s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
--s, at CPP@,$CPP,;t t
--s, at CXX@,$CXX,;t t
--s, at CXXFLAGS@,$CXXFLAGS,;t t
--s, at ac_ct_CXX@,$ac_ct_CXX,;t t
--s, at CXXDEPMODE@,$CXXDEPMODE,;t t
--s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
--s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
--s, at WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t
--s, at HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t
--s, at unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t
--s, at unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t
--s, at USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t
--s, at USE_RTTI@,$USE_RTTI,;t t
--s, at CXXCPP@,$CXXCPP,;t t
--s, at NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t
--s, at NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t
--s, at ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t
--s, at LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t
--s, at LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t
--s, at KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t
--s, at KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t
--s, at KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t
--s, at KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t
--s, at KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t
--s, at KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t
--s, at KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t
--s, at EGREP@,$EGREP,;t t
--s, at LN_S@,$LN_S,;t t
--s, at ECHO@,$ECHO,;t t
--s, at AR@,$AR,;t t
--s, at ac_ct_AR@,$ac_ct_AR,;t t
--s, at RANLIB@,$RANLIB,;t t
--s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s, at F77@,$F77,;t t
--s, at FFLAGS@,$FFLAGS,;t t
--s, at ac_ct_F77@,$ac_ct_F77,;t t
--s, at LIBTOOL@,$LIBTOOL,;t t
--s, at KDE_PLUGIN@,$KDE_PLUGIN,;t t
--s, at KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t
--s, at MSGFMT@,$MSGFMT,;t t
--s, at GMSGFMT@,$GMSGFMT,;t t
--s, at XGETTEXT@,$XGETTEXT,;t t
--s, at LIBUTIL@,$LIBUTIL,;t t
--s, at LIBCOMPAT@,$LIBCOMPAT,;t t
--s, at LIBCRYPT@,$LIBCRYPT,;t t
--s, at LIBRESOLV@,$LIBRESOLV,;t t
--s, at LIB_POLL@,$LIB_POLL,;t t
--s, at FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t
--s, at LIBSOCKET@,$LIBSOCKET,;t t
--s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
--s, at LIBUCB@,$LIBUCB,;t t
--s, at LIBDL@,$LIBDL,;t t
--s, at KDE_USE_FPIE@,$KDE_USE_FPIE,;t t
--s, at KDE_USE_PIE@,$KDE_USE_PIE,;t t
--s, at include_x11_TRUE@,$include_x11_TRUE,;t t
--s, at include_x11_FALSE@,$include_x11_FALSE,;t t
--s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
--s, at LIB_X11@,$LIB_X11,;t t
--s, at LIB_XRENDER@,$LIB_XRENDER,;t t
--s, at LIBSM@,$LIBSM,;t t
--s, at X_INCLUDES@,$X_INCLUDES,;t t
--s, at X_LDFLAGS@,$X_LDFLAGS,;t t
--s, at x_includes@,$x_includes,;t t
--s, at x_libraries@,$x_libraries,;t t
--s, at QTE_NORTTI@,$QTE_NORTTI,;t t
--s, at LIB_XEXT@,$LIB_XEXT,;t t
--s, at LIBPTHREAD@,$LIBPTHREAD,;t t
--s, at USE_THREADS@,$USE_THREADS,;t t
--s, at KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t
--s, at KDE_MT_LIBS@,$KDE_MT_LIBS,;t t
--s, at USER_INCLUDES@,$USER_INCLUDES,;t t
--s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
--s, at LIBZ@,$LIBZ,;t t
--s, at LIBPNG@,$LIBPNG,;t t
--s, at LIBJPEG@,$LIBJPEG,;t t
--s, at qt_libraries@,$qt_libraries,;t t
--s, at qt_includes@,$qt_includes,;t t
--s, at QT_INCLUDES@,$QT_INCLUDES,;t t
--s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
--s, at PERL@,$PERL,;t t
--s, at MOC@,$MOC,;t t
--s, at UIC@,$UIC,;t t
--s, at UIC_TR@,$UIC_TR,;t t
--s, at LIB_QT@,$LIB_QT,;t t
--s, at LIB_QPE@,$LIB_QPE,;t t
--s, at kde_qtver@,$kde_qtver,;t t
--s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
--s, at KDE_RPATH@,$KDE_RPATH,;t t
--s, at X_RPATH@,$X_RPATH,;t t
--s, at kde_libraries@,$kde_libraries,;t t
--s, at kde_includes@,$kde_includes,;t t
--s, at KDE_LDFLAGS@,$KDE_LDFLAGS,;t t
--s, at KDE_INCLUDES@,$KDE_INCLUDES,;t t
--s, at all_includes@,$all_includes,;t t
--s, at all_libraries@,$all_libraries,;t t
--s, at AUTODIRS@,$AUTODIRS,;t t
--s, at include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
--s, at include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
--s, at MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t
--s, at KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
--s, at KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
--s, at DCOPIDLNG@,$DCOPIDLNG,;t t
--s, at DCOPIDL@,$DCOPIDL,;t t
--s, at DCOPIDL2CPP@,$DCOPIDL2CPP,;t t
--s, at DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t
--s, at MCOPIDL@,$MCOPIDL,;t t
--s, at ARTSCCONFIG@,$ARTSCCONFIG,;t t
--s, at MEINPROC@,$MEINPROC,;t t
--s, at KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t
--s, at XMLLINT@,$XMLLINT,;t t
--s, at kde_htmldir@,$kde_htmldir,;t t
--s, at kde_appsdir@,$kde_appsdir,;t t
--s, at kde_icondir@,$kde_icondir,;t t
--s, at kde_sounddir@,$kde_sounddir,;t t
--s, at kde_datadir@,$kde_datadir,;t t
--s, at kde_locale@,$kde_locale,;t t
--s, at kde_confdir@,$kde_confdir,;t t
--s, at kde_kcfgdir@,$kde_kcfgdir,;t t
--s, at kde_mimedir@,$kde_mimedir,;t t
--s, at kde_wallpaperdir@,$kde_wallpaperdir,;t t
--s, at kde_bindir@,$kde_bindir,;t t
--s, at xdg_appsdir@,$xdg_appsdir,;t t
--s, at xdg_menudir@,$xdg_menudir,;t t
--s, at xdg_directorydir@,$xdg_directorydir,;t t
--s, at kde_templatesdir@,$kde_templatesdir,;t t
--s, at kde_servicesdir@,$kde_servicesdir,;t t
--s, at kde_servicetypesdir@,$kde_servicetypesdir,;t t
--s, at kde_moduledir@,$kde_moduledir,;t t
--s, at kdeinitdir@,$kdeinitdir,;t t
--s, at kde_styledir@,$kde_styledir,;t t
--s, at kde_widgetdir@,$kde_widgetdir,;t t
--s, at LIB_KDED@,$LIB_KDED,;t t
--s, at LIB_KDECORE@,$LIB_KDECORE,;t t
--s, at LIB_KDEUI@,$LIB_KDEUI,;t t
--s, at LIB_KIO@,$LIB_KIO,;t t
--s, at LIB_KJS@,$LIB_KJS,;t t
--s, at LIB_SMB@,$LIB_SMB,;t t
--s, at LIB_KAB@,$LIB_KAB,;t t
--s, at LIB_KABC@,$LIB_KABC,;t t
--s, at LIB_KHTML@,$LIB_KHTML,;t t
--s, at LIB_KSPELL@,$LIB_KSPELL,;t t
--s, at LIB_KPARTS@,$LIB_KPARTS,;t t
--s, at LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
--s, at LIB_KUTILS@,$LIB_KUTILS,;t t
--s, at LIB_KDEPIM@,$LIB_KDEPIM,;t t
--s, at LIB_KIMPROXY@,$LIB_KIMPROXY,;t t
--s, at LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
--s, at LIB_KDNSSD@,$LIB_KDNSSD,;t t
--s, at LIB_KUNITTEST@,$LIB_KUNITTEST,;t t
--s, at LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
--s, at LIB_KFILE@,$LIB_KFILE,;t t
--s, at LIB_KFM@,$LIB_KFM,;t t
--s, at LIB_ARTS@,$LIB_ARTS,;t t
--s, at QTDOCDIR@,$QTDOCDIR,;t t
--s, at KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t
--s, at DOXYGEN@,$DOXYGEN,;t t
--s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
--s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
--s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
--s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
--s, at ar_SUBDIR_included_TRUE@,$ar_SUBDIR_included_TRUE,;t t
--s, at ar_SUBDIR_included_FALSE@,$ar_SUBDIR_included_FALSE,;t t
--s, at az_SUBDIR_included_TRUE@,$az_SUBDIR_included_TRUE,;t t
--s, at az_SUBDIR_included_FALSE@,$az_SUBDIR_included_FALSE,;t t
--s, at bg_SUBDIR_included_TRUE@,$bg_SUBDIR_included_TRUE,;t t
--s, at bg_SUBDIR_included_FALSE@,$bg_SUBDIR_included_FALSE,;t t
--s, at br_SUBDIR_included_TRUE@,$br_SUBDIR_included_TRUE,;t t
--s, at br_SUBDIR_included_FALSE@,$br_SUBDIR_included_FALSE,;t t
--s, at ca_SUBDIR_included_TRUE@,$ca_SUBDIR_included_TRUE,;t t
--s, at ca_SUBDIR_included_FALSE@,$ca_SUBDIR_included_FALSE,;t t
--s, at cs_SUBDIR_included_TRUE@,$cs_SUBDIR_included_TRUE,;t t
--s, at cs_SUBDIR_included_FALSE@,$cs_SUBDIR_included_FALSE,;t t
--s, at cy_SUBDIR_included_TRUE@,$cy_SUBDIR_included_TRUE,;t t
--s, at cy_SUBDIR_included_FALSE@,$cy_SUBDIR_included_FALSE,;t t
--s, at da_SUBDIR_included_TRUE@,$da_SUBDIR_included_TRUE,;t t
--s, at da_SUBDIR_included_FALSE@,$da_SUBDIR_included_FALSE,;t t
--s, at de_SUBDIR_included_TRUE@,$de_SUBDIR_included_TRUE,;t t
--s, at de_SUBDIR_included_FALSE@,$de_SUBDIR_included_FALSE,;t t
--s, at el_SUBDIR_included_TRUE@,$el_SUBDIR_included_TRUE,;t t
--s, at el_SUBDIR_included_FALSE@,$el_SUBDIR_included_FALSE,;t t
--s, at en_GB_SUBDIR_included_TRUE@,$en_GB_SUBDIR_included_TRUE,;t t
--s, at en_GB_SUBDIR_included_FALSE@,$en_GB_SUBDIR_included_FALSE,;t t
--s, at es_SUBDIR_included_TRUE@,$es_SUBDIR_included_TRUE,;t t
--s, at es_SUBDIR_included_FALSE@,$es_SUBDIR_included_FALSE,;t t
--s, at et_SUBDIR_included_TRUE@,$et_SUBDIR_included_TRUE,;t t
--s, at et_SUBDIR_included_FALSE@,$et_SUBDIR_included_FALSE,;t t
--s, at fi_SUBDIR_included_TRUE@,$fi_SUBDIR_included_TRUE,;t t
--s, at fi_SUBDIR_included_FALSE@,$fi_SUBDIR_included_FALSE,;t t
--s, at fo_SUBDIR_included_TRUE@,$fo_SUBDIR_included_TRUE,;t t
--s, at fo_SUBDIR_included_FALSE@,$fo_SUBDIR_included_FALSE,;t t
--s, at fr_SUBDIR_included_TRUE@,$fr_SUBDIR_included_TRUE,;t t
--s, at fr_SUBDIR_included_FALSE@,$fr_SUBDIR_included_FALSE,;t t
--s, at ga_SUBDIR_included_TRUE@,$ga_SUBDIR_included_TRUE,;t t
--s, at ga_SUBDIR_included_FALSE@,$ga_SUBDIR_included_FALSE,;t t
--s, at gl_SUBDIR_included_TRUE@,$gl_SUBDIR_included_TRUE,;t t
--s, at gl_SUBDIR_included_FALSE@,$gl_SUBDIR_included_FALSE,;t t
--s, at he_SUBDIR_included_TRUE@,$he_SUBDIR_included_TRUE,;t t
--s, at he_SUBDIR_included_FALSE@,$he_SUBDIR_included_FALSE,;t t
--s, at hi_SUBDIR_included_TRUE@,$hi_SUBDIR_included_TRUE,;t t
--s, at hi_SUBDIR_included_FALSE@,$hi_SUBDIR_included_FALSE,;t t
--s, at hu_SUBDIR_included_TRUE@,$hu_SUBDIR_included_TRUE,;t t
--s, at hu_SUBDIR_included_FALSE@,$hu_SUBDIR_included_FALSE,;t t
--s, at is_SUBDIR_included_TRUE@,$is_SUBDIR_included_TRUE,;t t
--s, at is_SUBDIR_included_FALSE@,$is_SUBDIR_included_FALSE,;t t
--s, at it_SUBDIR_included_TRUE@,$it_SUBDIR_included_TRUE,;t t
--s, at it_SUBDIR_included_FALSE@,$it_SUBDIR_included_FALSE,;t t
--s, at ja_SUBDIR_included_TRUE@,$ja_SUBDIR_included_TRUE,;t t
--s, at ja_SUBDIR_included_FALSE@,$ja_SUBDIR_included_FALSE,;t t
--s, at ka_SUBDIR_included_TRUE@,$ka_SUBDIR_included_TRUE,;t t
--s, at ka_SUBDIR_included_FALSE@,$ka_SUBDIR_included_FALSE,;t t
--s, at ko_SUBDIR_included_TRUE@,$ko_SUBDIR_included_TRUE,;t t
--s, at ko_SUBDIR_included_FALSE@,$ko_SUBDIR_included_FALSE,;t t
--s, at lt_SUBDIR_included_TRUE@,$lt_SUBDIR_included_TRUE,;t t
--s, at lt_SUBDIR_included_FALSE@,$lt_SUBDIR_included_FALSE,;t t
--s, at nb_SUBDIR_included_TRUE@,$nb_SUBDIR_included_TRUE,;t t
--s, at nb_SUBDIR_included_FALSE@,$nb_SUBDIR_included_FALSE,;t t
--s, at nl_SUBDIR_included_TRUE@,$nl_SUBDIR_included_TRUE,;t t
--s, at nl_SUBDIR_included_FALSE@,$nl_SUBDIR_included_FALSE,;t t
--s, at nso_SUBDIR_included_TRUE@,$nso_SUBDIR_included_TRUE,;t t
--s, at nso_SUBDIR_included_FALSE@,$nso_SUBDIR_included_FALSE,;t t
--s, at pa_SUBDIR_included_TRUE@,$pa_SUBDIR_included_TRUE,;t t
--s, at pa_SUBDIR_included_FALSE@,$pa_SUBDIR_included_FALSE,;t t
--s, at pl_SUBDIR_included_TRUE@,$pl_SUBDIR_included_TRUE,;t t
--s, at pl_SUBDIR_included_FALSE@,$pl_SUBDIR_included_FALSE,;t t
--s, at pt_SUBDIR_included_TRUE@,$pt_SUBDIR_included_TRUE,;t t
--s, at pt_SUBDIR_included_FALSE@,$pt_SUBDIR_included_FALSE,;t t
--s, at pt_BR_SUBDIR_included_TRUE@,$pt_BR_SUBDIR_included_TRUE,;t t
--s, at pt_BR_SUBDIR_included_FALSE@,$pt_BR_SUBDIR_included_FALSE,;t t
--s, at ro_SUBDIR_included_TRUE@,$ro_SUBDIR_included_TRUE,;t t
--s, at ro_SUBDIR_included_FALSE@,$ro_SUBDIR_included_FALSE,;t t
--s, at ru_SUBDIR_included_TRUE@,$ru_SUBDIR_included_TRUE,;t t
--s, at ru_SUBDIR_included_FALSE@,$ru_SUBDIR_included_FALSE,;t t
--s, at rw_SUBDIR_included_TRUE@,$rw_SUBDIR_included_TRUE,;t t
--s, at rw_SUBDIR_included_FALSE@,$rw_SUBDIR_included_FALSE,;t t
--s, at sk_SUBDIR_included_TRUE@,$sk_SUBDIR_included_TRUE,;t t
--s, at sk_SUBDIR_included_FALSE@,$sk_SUBDIR_included_FALSE,;t t
--s, at sr_SUBDIR_included_TRUE@,$sr_SUBDIR_included_TRUE,;t t
--s, at sr_SUBDIR_included_FALSE@,$sr_SUBDIR_included_FALSE,;t t
--s, at sr_Latn_SUBDIR_included_TRUE@,$sr_Latn_SUBDIR_included_TRUE,;t t
--s, at sr_Latn_SUBDIR_included_FALSE@,$sr_Latn_SUBDIR_included_FALSE,;t t
--s, at sv_SUBDIR_included_TRUE@,$sv_SUBDIR_included_TRUE,;t t
--s, at sv_SUBDIR_included_FALSE@,$sv_SUBDIR_included_FALSE,;t t
--s, at ta_SUBDIR_included_TRUE@,$ta_SUBDIR_included_TRUE,;t t
--s, at ta_SUBDIR_included_FALSE@,$ta_SUBDIR_included_FALSE,;t t
--s, at tr_SUBDIR_included_TRUE@,$tr_SUBDIR_included_TRUE,;t t
--s, at tr_SUBDIR_included_FALSE@,$tr_SUBDIR_included_FALSE,;t t
--s, at uk_SUBDIR_included_TRUE@,$uk_SUBDIR_included_TRUE,;t t
--s, at uk_SUBDIR_included_FALSE@,$uk_SUBDIR_included_FALSE,;t t
--s, at ven_SUBDIR_included_TRUE@,$ven_SUBDIR_included_TRUE,;t t
--s, at ven_SUBDIR_included_FALSE@,$ven_SUBDIR_included_FALSE,;t t
--s, at xh_SUBDIR_included_TRUE@,$xh_SUBDIR_included_TRUE,;t t
--s, at xh_SUBDIR_included_FALSE@,$xh_SUBDIR_included_FALSE,;t t
--s, at zh_CN_SUBDIR_included_TRUE@,$zh_CN_SUBDIR_included_TRUE,;t t
--s, at zh_CN_SUBDIR_included_FALSE@,$zh_CN_SUBDIR_included_FALSE,;t t
--s, at zh_TW_SUBDIR_included_TRUE@,$zh_TW_SUBDIR_included_TRUE,;t t
--s, at zh_TW_SUBDIR_included_FALSE@,$zh_TW_SUBDIR_included_FALSE,;t t
--s, at zu_SUBDIR_included_TRUE@,$zu_SUBDIR_included_TRUE,;t t
--s, at zu_SUBDIR_included_FALSE@,$zu_SUBDIR_included_FALSE,;t t
--s, at LIBOBJS@,$LIBOBJS,;t t
--s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
--
--_ACEOF
--
--  cat >>$CONFIG_STATUS <<\_ACEOF
--  # Split the substitutions into bite-sized pieces for seds with
--  # small command number limits, like on Digital OSF/1 and HP-UX.
--  ac_max_sed_lines=48
--  ac_sed_frag=1 # Number of current file.
--  ac_beg=1 # First line for current file.
--  ac_end=$ac_max_sed_lines # Line after last line for current file.
--  ac_more_lines=:
--  ac_sed_cmds=
--  while $ac_more_lines; do
--    if test $ac_beg -gt 1; then
--      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    else
--      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    fi
--    if test ! -s $tmp/subs.frag; then
--      ac_more_lines=false
--    else
--      # The purpose of the label and of the branching condition is to
--      # speed up the sed processing (if there are no `@' at all, there
--      # is no need to browse any of the substitutions).
--      # These are the two extra sed commands mentioned above.
--      (echo ':t
--  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
--      if test -z "$ac_sed_cmds"; then
--	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
--      else
--	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
--      fi
--      ac_sed_frag=`expr $ac_sed_frag + 1`
--      ac_beg=$ac_end
--      ac_end=`expr $ac_end + $ac_max_sed_lines`
--    fi
--  done
--  if test -z "$ac_sed_cmds"; then
--    ac_sed_cmds=cat
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+target!$target$ac_delim
-+target_cpu!$target_cpu$ac_delim
-+target_vendor!$target_vendor$ac_delim
-+target_os!$target_os$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+ Copyright (C) 2006 Free Software Foundation, Inc.
+@@ -37698,13 +34920,19 @@
+ AUTOMAKE!$AUTOMAKE$ac_delim
+ AUTOHEADER!$AUTOHEADER$ac_delim
+ MAKEINFO!$MAKEINFO$ac_delim
+-AMTAR!$AMTAR$ac_delim
+ install_sh!$install_sh$ac_delim
+ STRIP!$STRIP$ac_delim
+ INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
 +mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
+ AWK!$AWK$ac_delim
+ SET_MAKE!$SET_MAKE$ac_delim
+ am__leading_dot!$am__leading_dot$ac_delim
 +AMTAR!$AMTAR$ac_delim
 +am__tar!$am__tar$ac_delim
 +am__untar!$am__untar$ac_delim
 +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
 +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
 +MAINT!$MAINT$ac_delim
-+KDECONFIG!$KDECONFIG$ac_delim
-+kde_libs_prefix!$kde_libs_prefix$ac_delim
-+kde_libs_htmldir!$kde_libs_htmldir$ac_delim
-+CONF_FILES!$CONF_FILES$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+CPP!$CPP$ac_delim
-+CXX!$CXX$ac_delim
-+CXXFLAGS!$CXXFLAGS$ac_delim
-+ac_ct_CXX!$ac_ct_CXX$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
--fi # test -n "$CONFIG_FILES"
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
+ KDECONFIG!$KDECONFIG$ac_delim
+ kde_libs_prefix!$kde_libs_prefix$ac_delim
+ kde_libs_htmldir!$kde_libs_htmldir$ac_delim
+@@ -37729,12 +34957,6 @@
+ CXX!$CXX$ac_delim
+ CXXFLAGS!$CXXFLAGS$ac_delim
+ ac_ct_CXX!$ac_ct_CXX$ac_delim
+-CXXDEPMODE!$CXXDEPMODE$ac_delim
+-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+-WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
+-HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
+-unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -37776,6 +34998,12 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
 +CXXDEPMODE!$CXXDEPMODE$ac_delim
 +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
 +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
 +WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
 +HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
 +unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
-+unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
-+USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
-+USE_RTTI!$USE_RTTI$ac_delim
-+CXXCPP!$CXXCPP$ac_delim
-+NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
-+NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
-+ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
-+LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
-+LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
-+KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
-+KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
-+KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
-+KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
-+KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
-+KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
-+KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+LN_S!$LN_S$ac_delim
-+ECHO!$ECHO$ac_delim
-+AR!$AR$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+F77!$F77$ac_delim
-+FFLAGS!$FFLAGS$ac_delim
-+ac_ct_F77!$ac_ct_F77$ac_delim
-+LIBTOOL!$LIBTOOL$ac_delim
-+KDE_PLUGIN!$KDE_PLUGIN$ac_delim
-+KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
-+GMSGFMT!$GMSGFMT$ac_delim
-+XGETTEXT!$XGETTEXT$ac_delim
-+LIBUTIL!$LIBUTIL$ac_delim
-+LIBCOMPAT!$LIBCOMPAT$ac_delim
-+LIBCRYPT!$LIBCRYPT$ac_delim
-+LIBRESOLV!$LIBRESOLV$ac_delim
-+LIB_POLL!$LIB_POLL$ac_delim
-+FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
-+LIBSOCKET!$LIBSOCKET$ac_delim
-+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-+LIBUCB!$LIBUCB$ac_delim
-+LIBDL!$LIBDL$ac_delim
-+KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
-+KDE_USE_PIE!$KDE_USE_PIE$ac_delim
-+include_x11_TRUE!$include_x11_TRUE$ac_delim
-+include_x11_FALSE!$include_x11_FALSE$ac_delim
-+XMKMF!$XMKMF$ac_delim
-+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-+LIB_X11!$LIB_X11$ac_delim
-+LIB_XRENDER!$LIB_XRENDER$ac_delim
-+LIBSM!$LIBSM$ac_delim
-+X_INCLUDES!$X_INCLUDES$ac_delim
-+X_LDFLAGS!$X_LDFLAGS$ac_delim
-+x_includes!$x_includes$ac_delim
-+x_libraries!$x_libraries$ac_delim
-+QTE_NORTTI!$QTE_NORTTI$ac_delim
-+LIB_XEXT!$LIB_XEXT$ac_delim
-+LIBPTHREAD!$LIBPTHREAD$ac_delim
-+USE_THREADS!$USE_THREADS$ac_delim
-+KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
-+KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
-+USER_INCLUDES!$USER_INCLUDES$ac_delim
-+USER_LDFLAGS!$USER_LDFLAGS$ac_delim
-+LIBZ!$LIBZ$ac_delim
-+LIBPNG!$LIBPNG$ac_delim
-+LIBJPEG!$LIBJPEG$ac_delim
-+qt_libraries!$qt_libraries$ac_delim
-+qt_includes!$qt_includes$ac_delim
-+QT_INCLUDES!$QT_INCLUDES$ac_delim
-+QT_LDFLAGS!$QT_LDFLAGS$ac_delim
-+PERL!$PERL$ac_delim
-+MOC!$MOC$ac_delim
-+UIC!$UIC$ac_delim
-+UIC_TR!$UIC_TR$ac_delim
-+LIB_QT!$LIB_QT$ac_delim
-+LIB_QPE!$LIB_QPE$ac_delim
-+kde_qtver!$kde_qtver$ac_delim
-+KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
-+KDE_RPATH!$KDE_RPATH$ac_delim
-+X_RPATH!$X_RPATH$ac_delim
-+kde_libraries!$kde_libraries$ac_delim
-+kde_includes!$kde_includes$ac_delim
-+KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
-+KDE_INCLUDES!$KDE_INCLUDES$ac_delim
-+all_includes!$all_includes$ac_delim
-+all_libraries!$all_libraries$ac_delim
-+AUTODIRS!$AUTODIRS$ac_delim
-+include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
-+include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
-+MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
-+KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
-+KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
+ unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
+ USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
+ USE_RTTI!$USE_RTTI$ac_delim
+@@ -37867,12 +35095,6 @@
+ MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
+ KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
+ KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
+-DCOPIDLNG!$DCOPIDLNG$ac_delim
+-DCOPIDL!$DCOPIDL$ac_delim
+-DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
+-DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
+-MCOPIDL!$MCOPIDL$ac_delim
+-ARTSCCONFIG!$ARTSCCONFIG$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -37914,6 +35136,12 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
 +DCOPIDLNG!$DCOPIDLNG$ac_delim
 +DCOPIDL!$DCOPIDL$ac_delim
 +DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
 +DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
 +MCOPIDL!$MCOPIDL$ac_delim
 +ARTSCCONFIG!$ARTSCCONFIG$ac_delim
-+MEINPROC!$MEINPROC$ac_delim
-+KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
-+XMLLINT!$XMLLINT$ac_delim
-+kde_htmldir!$kde_htmldir$ac_delim
-+kde_appsdir!$kde_appsdir$ac_delim
-+kde_icondir!$kde_icondir$ac_delim
-+kde_sounddir!$kde_sounddir$ac_delim
-+kde_datadir!$kde_datadir$ac_delim
-+kde_locale!$kde_locale$ac_delim
-+kde_confdir!$kde_confdir$ac_delim
-+kde_kcfgdir!$kde_kcfgdir$ac_delim
-+kde_mimedir!$kde_mimedir$ac_delim
-+kde_wallpaperdir!$kde_wallpaperdir$ac_delim
-+kde_bindir!$kde_bindir$ac_delim
-+xdg_appsdir!$xdg_appsdir$ac_delim
-+xdg_menudir!$xdg_menudir$ac_delim
-+xdg_directorydir!$xdg_directorydir$ac_delim
-+kde_templatesdir!$kde_templatesdir$ac_delim
-+kde_servicesdir!$kde_servicesdir$ac_delim
-+kde_servicetypesdir!$kde_servicetypesdir$ac_delim
-+kde_moduledir!$kde_moduledir$ac_delim
-+kdeinitdir!$kdeinitdir$ac_delim
-+kde_styledir!$kde_styledir$ac_delim
-+kde_widgetdir!$kde_widgetdir$ac_delim
-+LIB_KDED!$LIB_KDED$ac_delim
-+LIB_KDECORE!$LIB_KDECORE$ac_delim
-+LIB_KDEUI!$LIB_KDEUI$ac_delim
-+LIB_KIO!$LIB_KIO$ac_delim
-+LIB_KJS!$LIB_KJS$ac_delim
-+LIB_SMB!$LIB_SMB$ac_delim
-+LIB_KAB!$LIB_KAB$ac_delim
-+LIB_KABC!$LIB_KABC$ac_delim
-+LIB_KHTML!$LIB_KHTML$ac_delim
-+LIB_KSPELL!$LIB_KSPELL$ac_delim
-+LIB_KPARTS!$LIB_KPARTS$ac_delim
-+LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
-+LIB_KUTILS!$LIB_KUTILS$ac_delim
-+LIB_KDEPIM!$LIB_KDEPIM$ac_delim
-+LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
-+LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
-+LIB_KDNSSD!$LIB_KDNSSD$ac_delim
-+LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
-+LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
-+LIB_KFILE!$LIB_KFILE$ac_delim
-+LIB_KFM!$LIB_KFM$ac_delim
-+LIB_ARTS!$LIB_ARTS$ac_delim
-+QTDOCDIR!$QTDOCDIR$ac_delim
-+KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
-+DOXYGEN!$DOXYGEN$ac_delim
-+DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
-+DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
-+KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
-+TOPSUBDIRS!$TOPSUBDIRS$ac_delim
-+ar_SUBDIR_included_TRUE!$ar_SUBDIR_included_TRUE$ac_delim
-+ar_SUBDIR_included_FALSE!$ar_SUBDIR_included_FALSE$ac_delim
-+az_SUBDIR_included_TRUE!$az_SUBDIR_included_TRUE$ac_delim
-+az_SUBDIR_included_FALSE!$az_SUBDIR_included_FALSE$ac_delim
-+bg_SUBDIR_included_TRUE!$bg_SUBDIR_included_TRUE$ac_delim
-+bg_SUBDIR_included_FALSE!$bg_SUBDIR_included_FALSE$ac_delim
-+br_SUBDIR_included_TRUE!$br_SUBDIR_included_TRUE$ac_delim
-+br_SUBDIR_included_FALSE!$br_SUBDIR_included_FALSE$ac_delim
-+ca_SUBDIR_included_TRUE!$ca_SUBDIR_included_TRUE$ac_delim
-+ca_SUBDIR_included_FALSE!$ca_SUBDIR_included_FALSE$ac_delim
-+cs_SUBDIR_included_TRUE!$cs_SUBDIR_included_TRUE$ac_delim
-+cs_SUBDIR_included_FALSE!$cs_SUBDIR_included_FALSE$ac_delim
-+cy_SUBDIR_included_TRUE!$cy_SUBDIR_included_TRUE$ac_delim
-+cy_SUBDIR_included_FALSE!$cy_SUBDIR_included_FALSE$ac_delim
-+da_SUBDIR_included_TRUE!$da_SUBDIR_included_TRUE$ac_delim
-+da_SUBDIR_included_FALSE!$da_SUBDIR_included_FALSE$ac_delim
-+de_SUBDIR_included_TRUE!$de_SUBDIR_included_TRUE$ac_delim
-+de_SUBDIR_included_FALSE!$de_SUBDIR_included_FALSE$ac_delim
-+el_SUBDIR_included_TRUE!$el_SUBDIR_included_TRUE$ac_delim
-+el_SUBDIR_included_FALSE!$el_SUBDIR_included_FALSE$ac_delim
-+en_GB_SUBDIR_included_TRUE!$en_GB_SUBDIR_included_TRUE$ac_delim
-+en_GB_SUBDIR_included_FALSE!$en_GB_SUBDIR_included_FALSE$ac_delim
-+es_SUBDIR_included_TRUE!$es_SUBDIR_included_TRUE$ac_delim
-+es_SUBDIR_included_FALSE!$es_SUBDIR_included_FALSE$ac_delim
-+et_SUBDIR_included_TRUE!$et_SUBDIR_included_TRUE$ac_delim
-+et_SUBDIR_included_FALSE!$et_SUBDIR_included_FALSE$ac_delim
-+fi_SUBDIR_included_TRUE!$fi_SUBDIR_included_TRUE$ac_delim
-+fi_SUBDIR_included_FALSE!$fi_SUBDIR_included_FALSE$ac_delim
-+fo_SUBDIR_included_TRUE!$fo_SUBDIR_included_TRUE$ac_delim
-+fo_SUBDIR_included_FALSE!$fo_SUBDIR_included_FALSE$ac_delim
-+fr_SUBDIR_included_TRUE!$fr_SUBDIR_included_TRUE$ac_delim
-+fr_SUBDIR_included_FALSE!$fr_SUBDIR_included_FALSE$ac_delim
-+ga_SUBDIR_included_TRUE!$ga_SUBDIR_included_TRUE$ac_delim
-+ga_SUBDIR_included_FALSE!$ga_SUBDIR_included_FALSE$ac_delim
-+gl_SUBDIR_included_TRUE!$gl_SUBDIR_included_TRUE$ac_delim
-+gl_SUBDIR_included_FALSE!$gl_SUBDIR_included_FALSE$ac_delim
-+he_SUBDIR_included_TRUE!$he_SUBDIR_included_TRUE$ac_delim
-+he_SUBDIR_included_FALSE!$he_SUBDIR_included_FALSE$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
+ MEINPROC!$MEINPROC$ac_delim
+ KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
+ XMLLINT!$XMLLINT$ac_delim
+@@ -38005,12 +35233,6 @@
+ gl_SUBDIR_included_FALSE!$gl_SUBDIR_included_FALSE$ac_delim
+ he_SUBDIR_included_TRUE!$he_SUBDIR_included_TRUE$ac_delim
+ he_SUBDIR_included_FALSE!$he_SUBDIR_included_FALSE$ac_delim
+-hi_SUBDIR_included_TRUE!$hi_SUBDIR_included_TRUE$ac_delim
+-hi_SUBDIR_included_FALSE!$hi_SUBDIR_included_FALSE$ac_delim
+-hu_SUBDIR_included_TRUE!$hu_SUBDIR_included_TRUE$ac_delim
+-hu_SUBDIR_included_FALSE!$hu_SUBDIR_included_FALSE$ac_delim
+-is_SUBDIR_included_TRUE!$is_SUBDIR_included_TRUE$ac_delim
+-is_SUBDIR_included_FALSE!$is_SUBDIR_included_FALSE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -38052,6 +35274,12 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
 +hi_SUBDIR_included_TRUE!$hi_SUBDIR_included_TRUE$ac_delim
 +hi_SUBDIR_included_FALSE!$hi_SUBDIR_included_FALSE$ac_delim
 +hu_SUBDIR_included_TRUE!$hu_SUBDIR_included_TRUE$ac_delim
 +hu_SUBDIR_included_FALSE!$hu_SUBDIR_included_FALSE$ac_delim
 +is_SUBDIR_included_TRUE!$is_SUBDIR_included_TRUE$ac_delim
 +is_SUBDIR_included_FALSE!$is_SUBDIR_included_FALSE$ac_delim
-+it_SUBDIR_included_TRUE!$it_SUBDIR_included_TRUE$ac_delim
-+it_SUBDIR_included_FALSE!$it_SUBDIR_included_FALSE$ac_delim
-+ja_SUBDIR_included_TRUE!$ja_SUBDIR_included_TRUE$ac_delim
-+ja_SUBDIR_included_FALSE!$ja_SUBDIR_included_FALSE$ac_delim
-+ka_SUBDIR_included_TRUE!$ka_SUBDIR_included_TRUE$ac_delim
-+ka_SUBDIR_included_FALSE!$ka_SUBDIR_included_FALSE$ac_delim
-+ko_SUBDIR_included_TRUE!$ko_SUBDIR_included_TRUE$ac_delim
-+ko_SUBDIR_included_FALSE!$ko_SUBDIR_included_FALSE$ac_delim
-+lt_SUBDIR_included_TRUE!$lt_SUBDIR_included_TRUE$ac_delim
-+lt_SUBDIR_included_FALSE!$lt_SUBDIR_included_FALSE$ac_delim
-+nb_SUBDIR_included_TRUE!$nb_SUBDIR_included_TRUE$ac_delim
-+nb_SUBDIR_included_FALSE!$nb_SUBDIR_included_FALSE$ac_delim
-+nl_SUBDIR_included_TRUE!$nl_SUBDIR_included_TRUE$ac_delim
-+nl_SUBDIR_included_FALSE!$nl_SUBDIR_included_FALSE$ac_delim
-+nso_SUBDIR_included_TRUE!$nso_SUBDIR_included_TRUE$ac_delim
-+nso_SUBDIR_included_FALSE!$nso_SUBDIR_included_FALSE$ac_delim
-+pa_SUBDIR_included_TRUE!$pa_SUBDIR_included_TRUE$ac_delim
-+pa_SUBDIR_included_FALSE!$pa_SUBDIR_included_FALSE$ac_delim
-+pl_SUBDIR_included_TRUE!$pl_SUBDIR_included_TRUE$ac_delim
-+pl_SUBDIR_included_FALSE!$pl_SUBDIR_included_FALSE$ac_delim
-+pt_SUBDIR_included_TRUE!$pt_SUBDIR_included_TRUE$ac_delim
-+pt_SUBDIR_included_FALSE!$pt_SUBDIR_included_FALSE$ac_delim
-+pt_BR_SUBDIR_included_TRUE!$pt_BR_SUBDIR_included_TRUE$ac_delim
-+pt_BR_SUBDIR_included_FALSE!$pt_BR_SUBDIR_included_FALSE$ac_delim
-+ro_SUBDIR_included_TRUE!$ro_SUBDIR_included_TRUE$ac_delim
-+ro_SUBDIR_included_FALSE!$ro_SUBDIR_included_FALSE$ac_delim
-+ru_SUBDIR_included_TRUE!$ru_SUBDIR_included_TRUE$ac_delim
-+ru_SUBDIR_included_FALSE!$ru_SUBDIR_included_FALSE$ac_delim
-+rw_SUBDIR_included_TRUE!$rw_SUBDIR_included_TRUE$ac_delim
-+rw_SUBDIR_included_FALSE!$rw_SUBDIR_included_FALSE$ac_delim
-+sk_SUBDIR_included_TRUE!$sk_SUBDIR_included_TRUE$ac_delim
-+sk_SUBDIR_included_FALSE!$sk_SUBDIR_included_FALSE$ac_delim
-+sr_SUBDIR_included_TRUE!$sr_SUBDIR_included_TRUE$ac_delim
-+sr_SUBDIR_included_FALSE!$sr_SUBDIR_included_FALSE$ac_delim
-+sr_Latn_SUBDIR_included_TRUE!$sr_Latn_SUBDIR_included_TRUE$ac_delim
-+sr_Latn_SUBDIR_included_FALSE!$sr_Latn_SUBDIR_included_FALSE$ac_delim
-+sv_SUBDIR_included_TRUE!$sv_SUBDIR_included_TRUE$ac_delim
-+sv_SUBDIR_included_FALSE!$sv_SUBDIR_included_FALSE$ac_delim
-+ta_SUBDIR_included_TRUE!$ta_SUBDIR_included_TRUE$ac_delim
-+ta_SUBDIR_included_FALSE!$ta_SUBDIR_included_FALSE$ac_delim
-+tr_SUBDIR_included_TRUE!$tr_SUBDIR_included_TRUE$ac_delim
-+tr_SUBDIR_included_FALSE!$tr_SUBDIR_included_FALSE$ac_delim
-+uk_SUBDIR_included_TRUE!$uk_SUBDIR_included_TRUE$ac_delim
-+uk_SUBDIR_included_FALSE!$uk_SUBDIR_included_FALSE$ac_delim
-+ven_SUBDIR_included_TRUE!$ven_SUBDIR_included_TRUE$ac_delim
-+ven_SUBDIR_included_FALSE!$ven_SUBDIR_included_FALSE$ac_delim
-+xh_SUBDIR_included_TRUE!$xh_SUBDIR_included_TRUE$ac_delim
-+xh_SUBDIR_included_FALSE!$xh_SUBDIR_included_FALSE$ac_delim
-+zh_CN_SUBDIR_included_TRUE!$zh_CN_SUBDIR_included_TRUE$ac_delim
-+zh_CN_SUBDIR_included_FALSE!$zh_CN_SUBDIR_included_FALSE$ac_delim
-+zh_TW_SUBDIR_included_TRUE!$zh_TW_SUBDIR_included_TRUE$ac_delim
-+zh_TW_SUBDIR_included_FALSE!$zh_TW_SUBDIR_included_FALSE$ac_delim
-+zu_SUBDIR_included_TRUE!$zu_SUBDIR_included_TRUE$ac_delim
-+zu_SUBDIR_included_FALSE!$zu_SUBDIR_included_FALSE$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
- 
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
+ it_SUBDIR_included_TRUE!$it_SUBDIR_included_TRUE$ac_delim
+ it_SUBDIR_included_FALSE!$it_SUBDIR_included_FALSE$ac_delim
+ ja_SUBDIR_included_TRUE!$ja_SUBDIR_included_TRUE$ac_delim
+@@ -38112,7 +35340,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
- cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+   { (exit 1); exit 1; }; };;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+   { (exit 1); exit 1; }; };;
-+      esac
-+      ac_file_inputs="$ac_file_inputs $ac_f"
-+    done
-+
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input="Generated from "`IFS=:
-+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin";;
-+    esac
-+    ;;
-   esac
  
--  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+  ac_dir=`$as_dirname -- "$ac_file" ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$ac_file" : 'X\(//\)[^/]' \| \
- 	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  { as_dir="$ac_dir"
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-     done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
--
-   ac_builddir=.
- 
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
-+  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-     ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
- 
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
- 
-   case $INSTALL in
-   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
--  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-   esac
-+_ACEOF
- 
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    configure_input=
--  else
--    configure_input="$ac_file.  "
--  fi
--  configure_input=$configure_input"Generated from `echo $ac_file_in |
--				     sed 's,.*/,,'` by configure."
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-+case `sed -n '/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+    s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
- _ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
- $extrasub
-@@ -34912,248 +38041,130 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s, at configure_input@,$configure_input,;t t
--s, at srcdir@,$ac_srcdir,;t t
--s, at abs_srcdir@,$ac_abs_srcdir,;t t
--s, at top_srcdir@,$ac_top_srcdir,;t t
--s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s, at builddir@,$ac_builddir,;t t
--s, at abs_builddir@,$ac_abs_builddir,;t t
--s, at top_builddir@,$ac_top_builddir,;t t
--s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--s, at INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
--  rm -f $tmp/stdin
--  if test x"$ac_file" != x-; then
--    mv $tmp/out $ac_file
--  else
--    cat $tmp/out
--    rm -f $tmp/out
--  fi
--
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_HEADER section.
--#
--
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
--ac_dB='[	 ].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
- 
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  rm -f "$tmp/stdin"
-   case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
-+  -) cat "$tmp/out"; rm -f "$tmp/out";;
-+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-   esac
--
--  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 # Do quote $f, to prevent DOS paths from being IFS'd.
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--  # Remove the trailing spaces.
--  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
--
-+ ;;
-+  :H)
-+  #
-+  # CONFIG_HEADER
-+  #
- _ACEOF
- 
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h.  The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status.  Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless.  Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status.  If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless.  But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-+ac_dB='\\)[	 (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
- 
--# This sed command replaces #undef with comments.  This is necessary, for
-+uniq confdefs.h |
-+  sed -n '
-+	t rset
-+	:rset
-+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-+	t ok
-+	d
-+	:ok
-+	s/[\\&,]/\\&/g
-+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+  ' >>conftest.defines
-+
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments.  This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[	 #]*u.*,/* & */,' >>conftest.defines
-+
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
- 
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo '  :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
-+while :
- do
--  # Write a limited-size here document to $tmp/defines.sed.
--  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#define' lines.
--  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+  # Write a here document:
-+    cat >>$CONFIG_STATUS <<_ACEOF
-+    # First, check the format of the line:
-+    cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-+b
-+:def
-+_ACEOF
-+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-   echo 'CEOF
--  sed -f $tmp/defines.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+  grep . conftest.tail >/dev/null || break
-   rm -f conftest.defines
-   mv conftest.tail conftest.defines
- done
--rm -f conftest.defines
--echo '  fi # grep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
--
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
--do
--  # Write a limited-size here document to $tmp/undefs.sed.
--  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#undef'
--  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
--  echo 'CEOF
--  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
--  rm -f conftest.undefs
--  mv conftest.tail conftest.undefs
--done
--rm -f conftest.undefs
-+rm -f conftest.defines conftest.tail
- 
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    echo "/* Generated by configure.  */" >$tmp/config.h
--  else
--    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
--  fi
--  cat $tmp/in >>$tmp/config.h
--  rm -f $tmp/in
-   if test x"$ac_file" != x-; then
--    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+    echo "/* $configure_input  */" >"$tmp/config.h"
-+    cat "$ac_result" >>"$tmp/config.h"
-+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
--      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_file" : 'X\(//\)[^/]' \| \
--	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--      { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
--
-       rm -f $ac_file
--      mv $tmp/config.h $ac_file
-+      mv "$tmp/config.h" $ac_file
-     fi
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -38584,27 +35812,21 @@
    else
--    cat $tmp/config.h
--    rm -f $tmp/config.h
-+    echo "/* $configure_input  */"
-+    cat "$ac_result"
-   fi
-+  rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
- _am_stamp_count=1
- for _am_header in $config_headers :; do
-@@ -35164,135 +38175,39 @@
-       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-   esac
- done
--echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X$ac_file : 'X\(//\)[^/]' \| \
- 	 X$ac_file : 'X\(//\)$' \| \
--	 X$ac_file : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
- echo X$ac_file |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`/stamp-h$_am_stamp_count
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_COMMANDS section.
--#
--for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
--  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
--  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
--  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_dest" : 'X\(//\)[^/]' \| \
--	 X"$ac_dest" : 'X\(//\)$' \| \
--	 X"$ac_dest" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_dest" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
--
--  ac_builddir=.
--
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
--
--case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
--    ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
--    ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
- 
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
-+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+  esac
- 
- 
--  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--echo "$as_me: executing $ac_dest commands" >&6;}
--  case $ac_dest in
--    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  case $ac_file$ac_mode in
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-   # Strip MF so we end up with the name of the file.
-   mf=`echo "$mf" | sed -e 's/:.*$//'`
-   # Check whether this is an Automake generated Makefile or not.
-@@ -35302,92 +38217,123 @@
-   # each Makefile.in and add a new line on top of each file to say so.
-   # So let's grep whole file.
-   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
--    dirpart=`(dirname "$mf") 2>/dev/null ||
-+    dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$mf" : 'X\(//\)[^/]' \| \
- 	 X"$mf" : 'X\(//\)$' \| \
--	 X"$mf" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$mf" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-   else
      continue
    fi
 -  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
@@ -57148,116 +39343,11 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
--    fdir=`(dirname "$file") 2>/dev/null ||
-+    fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$file" : 'X\(//\)[^/]' \| \
- 	 X"$file" : 'X\(//\)$' \| \
--	 X"$file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    { if $as_mkdir_p; then
--    mkdir -p $dirpart/$fdir
--  else
--    as_dir=$dirpart/$fdir
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+    { as_dir=$dirpart/$fdir
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-     done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
--echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
--
-     # echo "creating $dirpart/$file"
-     echo '# dummy' > "$dirpart/$file"
-   done
- done
-  ;;
-+
-   esac
--done
--_ACEOF
-+done # for ac_tag
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
- 
- { (exit 0); exit 0; }
- _ACEOF
 --- configure.in
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(gwenview-i18n-1.4.0, "3.5.4") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(gwenview-i18n-1.4.1, "3.5.5") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -57333,15 +39423,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57351,27 +39433,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -57380,32 +39442,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -57413,20 +39450,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -57506,7 +39530,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -57521,7 +39545,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -57530,7 +39554,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -57545,7 +39569,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -57554,7 +39578,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -57569,7 +39593,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -57594,7 +39618,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -57610,7 +39634,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -57623,7 +39647,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -57632,7 +39656,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -57655,7 +39679,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -57663,7 +39687,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -57672,7 +39696,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -57681,7 +39705,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -57814,15 +39838,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57832,27 +39848,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -57861,32 +39857,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -57894,20 +39865,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -57987,7 +39945,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -58002,7 +39960,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58011,7 +39969,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -58026,7 +39984,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58035,7 +39993,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -58050,7 +40008,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -58075,7 +40033,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -58091,7 +40049,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -58106,7 +40064,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -58115,7 +40073,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -58138,7 +40096,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -58146,7 +40104,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -58155,7 +40113,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -58164,7 +40122,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -58206,7 +40164,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -58298,15 +40256,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58316,27 +40266,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -58345,32 +40275,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -58378,20 +40283,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -58471,7 +40363,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -58486,7 +40378,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58495,7 +40387,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -58510,7 +40402,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58519,7 +40411,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -58534,7 +40426,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -58559,7 +40451,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -58575,7 +40467,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -58588,7 +40480,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -58597,7 +40489,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -58620,7 +40512,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -58628,7 +40520,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -58637,7 +40529,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -58646,7 +40538,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -58779,15 +40671,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58797,27 +40681,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -58826,32 +40690,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -58859,20 +40698,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -58952,7 +40778,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -58967,7 +40793,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58976,7 +40802,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -58991,7 +40817,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -59000,7 +40826,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -59015,7 +40841,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -59040,7 +40866,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -59056,7 +40882,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -59071,7 +40897,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -59080,7 +40906,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -59103,7 +40929,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -59111,7 +40937,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -59120,7 +40946,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -59129,7 +40955,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -59171,7 +40997,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -59247,15 +41073,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59265,27 +41083,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -59294,32 +41092,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -59327,20 +41100,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = da
  KDE_DOCS = gwenview
@@ -59407,7 +41167,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -59420,7 +41180,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -59429,7 +41189,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -59437,7 +41197,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -59446,7 +41206,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -59455,7 +41215,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -59470,7 +41230,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,10 +596,10 @@
+@@ -558,10 +598,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -59483,7 +41243,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -580,27 +626,36 @@
+@@ -588,27 +628,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -59595,15 +41355,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59613,27 +41365,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -59642,32 +41374,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -59675,20 +41382,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -59768,7 +41462,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -59783,7 +41477,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -59792,7 +41486,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -59807,7 +41501,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -59816,7 +41510,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -59831,7 +41525,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -59856,7 +41550,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -59872,7 +41566,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -59885,7 +41579,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -59894,7 +41588,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -59917,7 +41611,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -59925,7 +41619,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -59934,7 +41628,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -59943,7 +41637,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -60076,15 +41770,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60094,27 +41780,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -60123,32 +41789,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -60156,20 +41797,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -60249,7 +41877,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -60264,7 +41892,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -60273,7 +41901,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -60288,7 +41916,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -60297,7 +41925,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -60312,7 +41940,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -60337,7 +41965,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -60353,7 +41981,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -60368,7 +41996,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -60377,7 +42005,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -60400,7 +42028,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -60408,7 +42036,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -60417,7 +42045,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -60426,7 +42054,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -60468,7 +42096,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -60544,15 +42172,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60562,27 +42182,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -60591,32 +42191,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -60624,20 +42199,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = de
  KDE_DOCS = gwenview
@@ -60704,7 +42266,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -60717,7 +42279,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -60726,7 +42288,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -60734,7 +42296,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -60743,7 +42305,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -60752,7 +42314,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -60767,7 +42329,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,10 +596,10 @@
+@@ -558,10 +598,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -60780,7 +42342,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -580,27 +626,36 @@
+@@ -588,27 +628,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -60892,15 +42454,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60910,27 +42464,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -60939,32 +42473,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -60972,20 +42481,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -61065,7 +42561,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -61080,7 +42576,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -61089,7 +42585,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -61104,7 +42600,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -61113,7 +42609,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -61128,7 +42624,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -61153,7 +42649,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -61169,7 +42665,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -61182,7 +42678,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -61191,7 +42687,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -61214,7 +42710,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -61222,7 +42718,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -61231,7 +42727,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -61240,7 +42736,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -61373,15 +42869,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61391,27 +42879,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -61420,32 +42888,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -61453,20 +42896,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -61546,7 +42976,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -61561,7 +42991,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -61570,7 +43000,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -61585,7 +43015,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -61594,7 +43024,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -61609,7 +43039,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -61634,7 +43064,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -61650,7 +43080,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -61665,7 +43095,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -61674,7 +43104,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -61697,7 +43127,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -61705,7 +43135,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -61714,7 +43144,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -61723,7 +43153,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -61765,7 +43195,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -61857,15 +43287,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61875,27 +43297,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -61904,32 +43306,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -61937,20 +43314,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -62030,7 +43394,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -62045,7 +43409,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -62054,7 +43418,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -62069,7 +43433,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -62078,7 +43442,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -62093,7 +43457,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -62118,7 +43482,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -62134,7 +43498,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -62147,7 +43511,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -62156,7 +43520,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -62179,7 +43543,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -62187,7 +43551,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -62196,7 +43560,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -62205,7 +43569,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -62338,15 +43702,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62356,27 +43712,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -62385,32 +43721,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -62418,20 +43729,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -62511,7 +43809,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -62526,7 +43824,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -62535,7 +43833,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -62550,7 +43848,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -62559,7 +43857,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -62574,7 +43872,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -62599,7 +43897,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -62615,7 +43913,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -62630,7 +43928,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -62639,7 +43937,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -62662,7 +43960,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -62670,7 +43968,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -62679,7 +43977,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -62688,7 +43986,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -62730,7 +44028,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -62822,15 +44120,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62840,27 +44130,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -62869,32 +44139,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -62902,20 +44147,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -62995,7 +44227,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -63010,7 +44242,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -63019,7 +44251,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -63034,7 +44266,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -63043,7 +44275,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -63058,7 +44290,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -63083,7 +44315,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -63099,7 +44331,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -63112,7 +44344,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -63121,7 +44353,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -63144,7 +44376,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -63152,7 +44384,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -63161,7 +44393,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -63170,7 +44402,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -63303,15 +44535,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63321,27 +44545,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -63350,32 +44554,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -63383,20 +44562,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -63476,7 +44642,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -63491,7 +44657,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -63500,7 +44666,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -63515,7 +44681,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -63524,7 +44690,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -63539,7 +44705,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -63564,7 +44730,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -63580,7 +44746,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -63595,7 +44761,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -63604,7 +44770,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -63627,7 +44793,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -63635,7 +44801,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -63644,7 +44810,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -63653,7 +44819,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -63695,7 +44861,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -63787,15 +44953,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63805,27 +44963,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -63834,32 +44972,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -63867,20 +44980,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -63960,7 +45060,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -63975,7 +45075,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -63984,7 +45084,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -63999,7 +45099,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -64008,7 +45108,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -64023,7 +45123,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -64048,7 +45148,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -64064,7 +45164,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -64077,7 +45177,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -64086,7 +45186,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -64109,7 +45209,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -64117,7 +45217,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -64126,7 +45226,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -64135,7 +45235,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -64268,15 +45368,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64286,27 +45378,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -64315,32 +45387,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -64348,20 +45395,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -64441,7 +45475,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -64456,7 +45490,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -64465,7 +45499,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -64480,7 +45514,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -64489,7 +45523,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -64504,7 +45538,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -64529,7 +45563,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -64545,7 +45579,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -64560,7 +45594,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -64569,7 +45603,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -64592,7 +45626,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -64600,7 +45634,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -64609,7 +45643,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -64618,7 +45652,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -64660,7 +45694,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -64736,15 +45770,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64754,27 +45780,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -64783,32 +45789,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -64816,20 +45797,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = et
  KDE_DOCS = gwenview
@@ -64896,7 +45864,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -64909,7 +45877,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -64918,7 +45886,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -64926,7 +45894,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -64935,7 +45903,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -64944,7 +45912,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -64959,7 +45927,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,10 +596,10 @@
+@@ -558,10 +598,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -64972,7 +45940,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -580,27 +626,36 @@
+@@ -588,27 +628,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -65084,15 +46052,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65102,27 +46062,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -65131,32 +46071,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -65164,20 +46079,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -65257,7 +46159,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -65272,7 +46174,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65281,7 +46183,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -65296,7 +46198,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65305,7 +46207,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -65320,7 +46222,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -65345,7 +46247,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -65361,7 +46263,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -65374,7 +46276,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -65383,7 +46285,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -65406,7 +46308,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -65414,7 +46316,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -65423,7 +46325,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -65432,7 +46334,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -65565,15 +46467,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65583,27 +46477,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -65612,32 +46486,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -65645,20 +46494,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -65738,7 +46574,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -65753,7 +46589,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65762,7 +46598,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -65777,7 +46613,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65786,7 +46622,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -65801,7 +46637,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -65826,7 +46662,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -65842,7 +46678,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -65857,7 +46693,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -65866,7 +46702,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -65889,7 +46725,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -65897,7 +46733,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -65906,7 +46742,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -65915,7 +46751,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -65957,7 +46793,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -66049,15 +46885,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66067,27 +46895,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -66096,32 +46904,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -66129,20 +46912,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -66222,7 +46992,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -66237,7 +47007,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -66246,7 +47016,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -66261,7 +47031,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -66270,7 +47040,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -66285,7 +47055,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -66310,7 +47080,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -66326,7 +47096,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -66339,7 +47109,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -66348,7 +47118,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -66371,7 +47141,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -66379,7 +47149,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -66388,7 +47158,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -66397,7 +47167,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -66530,15 +47300,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66548,27 +47310,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -66577,32 +47319,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -66610,20 +47327,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -66703,7 +47407,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -66718,7 +47422,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -66727,7 +47431,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -66742,7 +47446,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -66751,7 +47455,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -66766,7 +47470,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -66791,7 +47495,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -66807,7 +47511,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -66822,7 +47526,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -66831,7 +47535,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -66854,7 +47558,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -66862,7 +47566,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -66871,7 +47575,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -66880,7 +47584,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -66922,7 +47626,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -67014,15 +47718,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67032,27 +47728,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -67061,32 +47737,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -67094,20 +47745,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -67187,7 +47825,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -67202,7 +47840,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -67211,7 +47849,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -67226,7 +47864,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -67235,7 +47873,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -67250,7 +47888,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -67275,7 +47913,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -67291,7 +47929,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -67304,7 +47942,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -67313,7 +47951,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -67336,7 +47974,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -67344,7 +47982,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -67353,7 +47991,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -67362,7 +48000,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -67495,15 +48133,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67513,27 +48143,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -67542,32 +48152,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -67575,20 +48160,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -67668,7 +48240,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -67683,7 +48255,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -67692,7 +48264,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -67707,7 +48279,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -67716,7 +48288,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -67731,7 +48303,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -67756,7 +48328,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -67772,7 +48344,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -67787,7 +48359,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -67796,7 +48368,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -67819,7 +48391,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -67827,7 +48399,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -67836,7 +48408,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -67845,7 +48417,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -67887,7 +48459,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -67963,15 +48535,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67981,27 +48545,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -68010,32 +48554,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -68043,20 +48562,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = fr
  KDE_DOCS = gwenview
@@ -68123,7 +48629,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -68136,7 +48642,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -68145,7 +48651,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -68153,7 +48659,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -68162,7 +48668,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -68171,7 +48677,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -68186,7 +48692,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,7 +596,7 @@
+@@ -558,7 +598,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -68195,7 +48701,7 @@
  
  #>+ 24
  index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
-@@ -597,10 +643,19 @@
+@@ -605,10 +645,19 @@
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -68287,15 +48793,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68305,27 +48803,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -68334,32 +48812,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -68367,20 +48820,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -68460,7 +48900,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -68475,7 +48915,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68484,7 +48924,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -68499,7 +48939,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68508,7 +48948,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -68523,7 +48963,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -68548,7 +48988,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -68564,7 +49004,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -68577,7 +49017,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -68586,7 +49026,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -68609,7 +49049,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -68617,7 +49057,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -68626,7 +49066,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -68635,7 +49075,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -68768,15 +49208,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68786,27 +49218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -68815,32 +49227,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -68848,20 +49235,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -68941,7 +49315,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -68956,7 +49330,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68965,7 +49339,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -68980,7 +49354,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68989,7 +49363,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -69004,7 +49378,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -69029,7 +49403,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -69045,7 +49419,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -69060,7 +49434,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -69069,7 +49443,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -69092,7 +49466,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -69100,7 +49474,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -69109,7 +49483,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -69118,7 +49492,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -69160,7 +49534,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -69252,15 +49626,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69270,27 +49636,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -69299,32 +49645,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -69332,20 +49653,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -69425,7 +49733,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -69440,7 +49748,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69449,7 +49757,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -69464,7 +49772,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69473,7 +49781,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -69488,7 +49796,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -69513,7 +49821,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -69529,7 +49837,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -69542,7 +49850,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -69551,7 +49859,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -69574,7 +49882,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -69582,7 +49890,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -69591,7 +49899,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -69600,7 +49908,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -69733,15 +50041,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69751,27 +50051,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -69780,32 +50060,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -69813,20 +50068,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -69906,7 +50148,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -69921,7 +50163,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69930,7 +50172,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -69945,7 +50187,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69954,7 +50196,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -69969,7 +50211,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -69994,7 +50236,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -70010,7 +50252,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -70025,7 +50267,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -70034,7 +50276,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -70057,7 +50299,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -70065,7 +50307,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -70074,7 +50316,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -70083,7 +50325,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -70125,7 +50367,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -70217,15 +50459,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70235,27 +50469,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -70264,32 +50478,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -70297,20 +50486,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -70390,7 +50566,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -70405,7 +50581,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70414,7 +50590,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -70429,7 +50605,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70438,7 +50614,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -70453,7 +50629,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -70478,7 +50654,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -70494,7 +50670,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -70507,7 +50683,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -70516,7 +50692,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -70539,7 +50715,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -70547,7 +50723,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -70556,7 +50732,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -70565,7 +50741,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -70698,15 +50874,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70716,27 +50884,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -70745,32 +50893,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -70778,20 +50901,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -70871,7 +50981,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -70886,7 +50996,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70895,7 +51005,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -70910,7 +51020,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70919,7 +51029,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -70934,7 +51044,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -70959,7 +51069,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -70975,7 +51085,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -70990,7 +51100,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -70999,7 +51109,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -71022,7 +51132,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -71030,7 +51140,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -71039,7 +51149,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -71048,7 +51158,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -71090,7 +51200,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -71182,15 +51292,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71200,27 +51302,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -71229,32 +51311,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -71262,20 +51319,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -71355,7 +51399,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -71370,7 +51414,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -71379,7 +51423,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -71394,7 +51438,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -71403,7 +51447,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -71418,7 +51462,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -71443,7 +51487,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -71459,7 +51503,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -71472,7 +51516,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -71481,7 +51525,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -71504,7 +51548,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -71512,7 +51556,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -71521,7 +51565,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -71530,7 +51574,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -71663,15 +51707,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71681,27 +51717,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -71710,32 +51726,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -71743,20 +51734,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -71836,7 +51814,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -71851,7 +51829,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -71860,7 +51838,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -71875,7 +51853,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -71884,7 +51862,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -71899,7 +51877,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -71924,7 +51902,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -71940,7 +51918,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -71955,7 +51933,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -71964,7 +51942,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -71987,7 +51965,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -71995,7 +51973,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -72004,7 +51982,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -72013,7 +51991,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -72055,7 +52033,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -72147,15 +52125,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72165,27 +52135,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -72194,32 +52144,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -72227,20 +52152,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -72320,7 +52232,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -72335,7 +52247,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -72344,7 +52256,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -72359,7 +52271,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -72368,7 +52280,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -72383,7 +52295,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -72408,7 +52320,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -72424,7 +52336,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -72437,7 +52349,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -72446,7 +52358,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -72469,7 +52381,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -72477,7 +52389,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -72486,7 +52398,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -72495,7 +52407,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -72628,15 +52540,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72646,27 +52550,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -72675,32 +52559,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -72708,20 +52567,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -72801,7 +52647,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -72816,7 +52662,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -72825,7 +52671,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -72840,7 +52686,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -72849,7 +52695,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -72864,7 +52710,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -72889,7 +52735,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -72905,7 +52751,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -72920,7 +52766,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -72929,7 +52775,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -72952,7 +52798,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -72960,7 +52806,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -72969,7 +52815,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -72978,7 +52824,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -73020,7 +52866,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -73112,15 +52958,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73130,27 +52968,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -73159,32 +52977,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -73192,20 +52985,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -73285,7 +53065,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -73300,7 +53080,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -73309,7 +53089,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -73324,7 +53104,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -73333,7 +53113,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -73348,7 +53128,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -73373,7 +53153,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -73389,7 +53169,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -73402,7 +53182,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -73411,7 +53191,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -73434,7 +53214,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -73442,7 +53222,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -73451,7 +53231,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -73460,7 +53240,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -73593,15 +53373,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73611,27 +53383,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -73640,32 +53392,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -73673,20 +53400,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -73766,7 +53480,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -73781,7 +53495,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -73790,7 +53504,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -73805,7 +53519,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -73814,7 +53528,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -73829,7 +53543,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -73854,7 +53568,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -73870,7 +53584,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -73885,7 +53599,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -73894,7 +53608,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -73917,7 +53631,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -73925,7 +53639,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -73934,7 +53648,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -73943,7 +53657,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -73985,7 +53699,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -74077,15 +53791,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74095,27 +53801,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -74124,32 +53810,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -74157,20 +53818,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -74250,7 +53898,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -74265,7 +53913,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -74274,7 +53922,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -74289,7 +53937,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -74298,7 +53946,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -74313,7 +53961,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -74338,7 +53986,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -74354,7 +54002,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -74367,7 +54015,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -74376,7 +54024,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -74399,7 +54047,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -74407,7 +54055,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -74416,7 +54064,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -74425,7 +54073,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -74558,15 +54206,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74576,27 +54216,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -74605,32 +54225,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -74638,20 +54233,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -74731,7 +54313,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -74746,7 +54328,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -74755,7 +54337,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -74770,7 +54352,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -74779,7 +54361,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -74794,7 +54376,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -74819,7 +54401,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -74835,7 +54417,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -74850,7 +54432,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -74859,7 +54441,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -74882,7 +54464,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -74890,7 +54472,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -74899,7 +54481,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -74908,7 +54490,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -74950,7 +54532,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -75026,15 +54608,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75044,27 +54618,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -75073,32 +54627,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -75106,20 +54635,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = it
  KDE_DOCS = gwenview
@@ -75186,7 +54702,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -75199,7 +54715,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -75208,7 +54724,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -75216,7 +54732,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -75225,7 +54741,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -75234,7 +54750,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -75249,7 +54765,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,10 +596,10 @@
+@@ -558,10 +598,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -75262,7 +54778,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -580,27 +626,36 @@
+@@ -588,27 +628,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -75374,15 +54890,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75392,27 +54900,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -75421,32 +54909,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -75454,20 +54917,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -75547,7 +54997,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -75562,7 +55012,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -75571,7 +55021,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -75586,7 +55036,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -75595,7 +55045,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -75610,7 +55060,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -75635,7 +55085,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -75651,7 +55101,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -75664,7 +55114,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -75673,7 +55123,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -75696,7 +55146,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -75704,7 +55154,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -75713,7 +55163,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -75722,7 +55172,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -75855,15 +55305,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75873,27 +55315,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -75902,32 +55324,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -75935,20 +55332,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -76028,7 +55412,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -76043,7 +55427,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -76052,7 +55436,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -76067,7 +55451,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -76076,7 +55460,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -76091,7 +55475,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -76116,7 +55500,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -76132,7 +55516,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -76147,7 +55531,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -76156,7 +55540,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -76179,7 +55563,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -76187,7 +55571,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -76196,7 +55580,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -76205,7 +55589,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -76247,7 +55631,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -76339,15 +55723,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76357,27 +55733,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -76386,32 +55742,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -76419,20 +55750,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -76512,7 +55830,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -76527,7 +55845,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -76536,7 +55854,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -76551,7 +55869,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -76560,7 +55878,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -76575,7 +55893,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -76600,7 +55918,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -76616,7 +55934,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -76629,7 +55947,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -76638,7 +55956,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -76661,7 +55979,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -76669,7 +55987,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -76678,7 +55996,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -76687,7 +56005,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -76820,15 +56138,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76838,27 +56148,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -76867,32 +56157,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -76900,20 +56165,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -76993,7 +56245,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -77008,7 +56260,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -77017,7 +56269,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -77032,7 +56284,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -77041,7 +56293,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -77056,7 +56308,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -77081,7 +56333,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -77097,7 +56349,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -77112,7 +56364,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -77121,7 +56373,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -77144,7 +56396,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -77152,7 +56404,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -77161,7 +56413,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -77170,7 +56422,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -77212,7 +56464,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -77304,15 +56556,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77322,27 +56566,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -77351,32 +56575,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -77384,20 +56583,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -77477,7 +56663,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -77492,7 +56678,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -77501,7 +56687,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -77516,7 +56702,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -77525,7 +56711,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -77540,7 +56726,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -77565,7 +56751,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -77581,7 +56767,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -77594,7 +56780,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -77603,7 +56789,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -77626,7 +56812,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -77634,7 +56820,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -77643,7 +56829,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -77652,7 +56838,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -77785,15 +56971,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77803,27 +56981,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -77832,32 +56990,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -77865,20 +56998,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -77958,7 +57078,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -77973,7 +57093,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -77982,7 +57102,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -77997,7 +57117,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -78006,7 +57126,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -78021,7 +57141,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -78046,7 +57166,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -78062,7 +57182,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -78077,7 +57197,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -78086,7 +57206,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -78109,7 +57229,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -78117,7 +57237,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -78126,7 +57246,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -78135,7 +57255,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -78177,7 +57297,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -78269,15 +57389,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78287,27 +57399,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -78316,32 +57408,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -78349,20 +57416,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -78442,7 +57496,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -78457,7 +57511,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -78466,7 +57520,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -78481,7 +57535,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -78490,7 +57544,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -78505,7 +57559,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -78530,7 +57584,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -78546,7 +57600,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -78559,7 +57613,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -78568,7 +57622,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -78591,7 +57645,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -78599,7 +57653,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -78608,7 +57662,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -78617,7 +57671,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -78750,15 +57804,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78768,27 +57814,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -78797,32 +57823,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -78830,20 +57831,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -78923,7 +57911,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -78938,7 +57926,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -78947,7 +57935,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -78962,7 +57950,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -78971,7 +57959,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -78986,7 +57974,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -79011,7 +57999,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -79027,7 +58015,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -79042,7 +58030,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -79051,7 +58039,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -79074,7 +58062,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -79082,7 +58070,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -79091,7 +58079,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -79100,7 +58088,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -79142,7 +58130,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -79234,15 +58222,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79252,27 +58232,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -79281,32 +58241,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -79314,20 +58249,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -79407,7 +58329,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -79422,7 +58344,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -79431,7 +58353,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -79446,7 +58368,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -79455,7 +58377,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -79470,7 +58392,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -79495,7 +58417,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -79511,7 +58433,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -79524,7 +58446,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -79533,7 +58455,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -79556,7 +58478,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -79564,7 +58486,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -79573,7 +58495,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -79582,7 +58504,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -79715,15 +58637,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79733,27 +58647,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -79762,32 +58656,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -79795,20 +58664,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -79888,7 +58744,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -79903,7 +58759,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -79912,7 +58768,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -79927,7 +58783,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -79936,7 +58792,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -79951,7 +58807,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -79976,7 +58832,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -79992,7 +58848,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -80007,7 +58863,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -80016,7 +58872,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -80039,7 +58895,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -80047,7 +58903,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -80056,7 +58912,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -80065,7 +58921,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -80107,7 +58963,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -80165,11 +59021,11 @@
  build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
-+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
++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 \
-+	admin/compile admin/config.guess admin/config.sub \
++	$(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 = .
@@ -80217,15 +59073,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -83,6 +130,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -159,6 +207,9 @@
+@@ -160,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80235,27 +59083,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -195,18 +246,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -216,6 +265,8 @@
+@@ -215,6 +265,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -80264,32 +59092,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -239,8 +290,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -269,6 +323,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -313,10 +368,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -321,6 +373,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -80297,20 +59100,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -326,10 +383,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,63 +440,64 @@
+@@ -389,63 +442,64 @@
  zh_TW_SUBDIR_included_TRUE = @zh_TW_SUBDIR_included_TRUE@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
@@ -80337,7 +59127,7 @@
 -	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 TODO acinclude.m4 aclocal.m4 \
+-	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 \
@@ -80413,7 +59203,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -449,10 +509,10 @@
+@@ -457,10 +511,10 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -80427,7 +59217,7 @@
  
  distclean-hdr:
  	-rm -f config.h stamp-h1
-@@ -474,7 +534,13 @@
+@@ -482,7 +536,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):
@@ -80442,7 +59232,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -486,7 +552,7 @@
+@@ -494,7 +554,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -80451,7 +59241,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -494,7 +560,13 @@
+@@ -502,7 +562,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -80466,7 +59256,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -515,7 +587,7 @@
+@@ -523,7 +589,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -80475,7 +59265,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -526,14 +598,6 @@
+@@ -534,14 +600,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -80490,7 +59280,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -542,19 +606,22 @@
+@@ -550,19 +608,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -80515,7 +59305,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -564,10 +631,11 @@
+@@ -572,10 +633,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -80531,7 +59321,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -590,26 +658,11 @@
+@@ -598,26 +660,11 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -80559,7 +59349,7 @@
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  	list='$(DISTFILES)'; for file in $$list; do \
-@@ -621,7 +674,7 @@
+@@ -629,7 +676,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -80568,7 +59358,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -636,15 +689,17 @@
+@@ -644,15 +691,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -80591,7 +59381,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -655,19 +710,46 @@
+@@ -663,19 +712,46 @@
  	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
  	|| chmod -R a+r $(distdir)
  dist-gzip: distdir
@@ -80642,7 +59432,7 @@
  	chmod -R a-w $(distdir); chmod a+w $(distdir)
  	mkdir $(distdir)/_build
  	mkdir $(distdir)/_inst
-@@ -687,19 +769,20 @@
+@@ -695,19 +771,20 @@
  	        distuninstallcheck \
  	  && chmod -R a-w "$$dc_install_base" \
  	  && ({ \
@@ -80668,7 +59458,7 @@
  distuninstallcheck:
  	@cd $(distuninstallcheck_dir) \
  	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -723,7 +806,6 @@
+@@ -731,7 +808,6 @@
  all-am: Makefile config.h
  installdirs: installdirs-recursive
  installdirs-am:
@@ -80676,7 +59466,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -743,7 +825,7 @@
+@@ -751,7 +827,7 @@
  clean-generic:
  
  distclean-generic:
@@ -80685,7 +59475,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -759,13 +841,15 @@
+@@ -767,13 +843,15 @@
  distclean: distclean-recursive
  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
  	-rm -f Makefile
@@ -80703,7 +59493,7 @@
  info: info-recursive
  
  info-am:
-@@ -802,24 +886,21 @@
+@@ -810,24 +888,21 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -80741,12 +59531,12 @@
  
  $(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
-@@ -938,15 +1019,16 @@
+@@ -946,15 +1021,16 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=Mainpage.dox subdirs Makefile.in configure.in.bot configure.files Makefile.am.in.wo Makefile.cvs configure.in.in Makefile.am.in 
-+KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
+-KDE_DIST=Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files Makefile.am.in.wo Makefile.cvs configure.in.in Makefile.am.in 
++KDE_DIST=stamp-h.in Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:
@@ -80831,15 +59621,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80849,27 +59631,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -80878,32 +59640,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -80911,20 +59648,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -81004,7 +59728,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -81019,7 +59743,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -81028,7 +59752,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -81043,7 +59767,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -81052,7 +59776,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -81067,7 +59791,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -81092,7 +59816,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -81108,7 +59832,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -81121,7 +59845,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -81130,7 +59854,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -81153,7 +59877,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -81161,7 +59885,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -81170,7 +59894,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -81179,7 +59903,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -81312,15 +60036,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81330,27 +60046,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -81359,32 +60055,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -81392,20 +60063,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -81485,7 +60143,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -81500,7 +60158,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -81509,7 +60167,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -81524,7 +60182,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -81533,7 +60191,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -81548,7 +60206,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -81573,7 +60231,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -81589,7 +60247,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -81604,7 +60262,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -81613,7 +60271,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -81636,7 +60294,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -81644,7 +60302,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -81653,7 +60311,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -81662,7 +60320,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -81704,7 +60362,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -81780,15 +60438,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81798,27 +60448,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -81827,32 +60457,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -81860,20 +60465,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = nl
  KDE_DOCS = gwenview
@@ -81940,7 +60532,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -81953,7 +60545,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -81962,7 +60554,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -81970,7 +60562,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -81979,7 +60571,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -81988,7 +60580,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -82003,7 +60595,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,10 +596,10 @@
+@@ -558,10 +598,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -82016,7 +60608,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -580,27 +626,36 @@
+@@ -588,27 +628,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -82128,15 +60720,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82146,27 +60730,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -82175,32 +60739,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -82208,20 +60747,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -82301,7 +60827,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -82316,7 +60842,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -82325,7 +60851,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -82340,7 +60866,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -82349,7 +60875,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -82364,7 +60890,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -82389,7 +60915,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -82405,7 +60931,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -82418,7 +60944,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -82427,7 +60953,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -82450,7 +60976,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -82458,7 +60984,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -82467,7 +60993,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -82476,7 +61002,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -82609,15 +61135,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82627,27 +61145,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -82656,32 +61154,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -82689,20 +61162,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -82782,7 +61242,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -82797,7 +61257,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -82806,7 +61266,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -82821,7 +61281,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -82830,7 +61290,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -82845,7 +61305,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -82870,7 +61330,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -82886,7 +61346,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -82901,7 +61361,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -82910,7 +61370,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -82933,7 +61393,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -82941,7 +61401,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -82950,7 +61410,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -82959,7 +61419,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -83001,7 +61461,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -83093,15 +61553,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83111,27 +61563,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -83140,32 +61572,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -83173,20 +61580,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -83266,7 +61660,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -83281,7 +61675,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -83290,7 +61684,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -83305,7 +61699,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -83314,7 +61708,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -83329,7 +61723,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -83354,7 +61748,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -83370,7 +61764,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -83383,7 +61777,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -83392,7 +61786,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -83415,7 +61809,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -83423,7 +61817,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -83432,7 +61826,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -83441,7 +61835,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -83574,15 +61968,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83592,27 +61978,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -83621,32 +61987,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -83654,20 +61995,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -83747,7 +62075,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -83762,7 +62090,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -83771,7 +62099,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -83786,7 +62114,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -83795,7 +62123,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -83810,7 +62138,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -83835,7 +62163,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -83851,7 +62179,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -83866,7 +62194,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -83875,7 +62203,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -83898,7 +62226,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -83906,7 +62234,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -83915,7 +62243,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -83924,7 +62252,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -83966,7 +62294,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -84058,15 +62386,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84076,27 +62396,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -84105,32 +62405,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -84138,20 +62413,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -84231,7 +62493,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -84246,7 +62508,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -84255,7 +62517,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -84270,7 +62532,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -84279,7 +62541,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -84294,7 +62556,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -84319,7 +62581,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -84335,7 +62597,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -84348,7 +62610,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -84357,7 +62619,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -84380,7 +62642,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -84388,7 +62650,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -84397,7 +62659,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -84406,7 +62668,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -84539,15 +62801,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84557,27 +62811,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -84586,32 +62820,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -84619,20 +62828,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -84712,7 +62908,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -84727,7 +62923,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -84736,7 +62932,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -84751,7 +62947,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -84760,7 +62956,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -84775,7 +62971,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -84800,7 +62996,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -84816,7 +63012,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -84831,7 +63027,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -84840,7 +63036,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -84863,7 +63059,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -84871,7 +63067,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -84880,7 +63076,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -84889,7 +63085,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -84931,7 +63127,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -85023,15 +63219,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85041,27 +63229,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -85070,32 +63238,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -85103,20 +63246,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -85196,7 +63326,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -85211,7 +63341,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -85220,7 +63350,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -85235,7 +63365,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -85244,7 +63374,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -85259,7 +63389,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -85284,7 +63414,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -85300,7 +63430,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -85313,7 +63443,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -85322,7 +63452,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -85345,7 +63475,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -85353,7 +63483,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -85362,7 +63492,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -85371,7 +63501,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -85504,15 +63634,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85522,27 +63644,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -85551,32 +63653,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -85584,20 +63661,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -85677,7 +63741,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -85692,7 +63756,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -85701,7 +63765,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -85716,7 +63780,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -85725,7 +63789,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -85740,7 +63804,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -85765,7 +63829,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -85781,7 +63845,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -85796,7 +63860,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -85805,7 +63869,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -85828,7 +63892,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -85836,7 +63900,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -85845,7 +63909,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -85854,7 +63918,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -85896,7 +63960,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -85972,15 +64036,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85990,27 +64046,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -86019,32 +64055,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -86052,20 +64063,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = pt
  KDE_DOCS = gwenview
@@ -86132,7 +64130,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -86145,7 +64143,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -86154,7 +64152,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -86162,7 +64160,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -86171,7 +64169,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -86180,7 +64178,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -86195,7 +64193,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,10 +596,10 @@
+@@ -558,10 +598,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -86208,7 +64206,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -580,27 +626,36 @@
+@@ -588,27 +628,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -86320,15 +64318,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86338,27 +64328,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -86367,32 +64337,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -86400,20 +64345,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -86493,7 +64425,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -86508,7 +64440,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -86517,7 +64449,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -86532,7 +64464,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -86541,7 +64473,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -86556,7 +64488,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -86581,7 +64513,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -86597,7 +64529,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -86610,7 +64542,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -86619,7 +64551,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -86642,7 +64574,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -86650,7 +64582,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -86659,7 +64591,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -86668,7 +64600,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -86801,15 +64733,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86819,27 +64743,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -86848,32 +64752,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -86881,20 +64760,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -86974,7 +64840,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -86989,7 +64855,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -86998,7 +64864,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -87013,7 +64879,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -87022,7 +64888,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -87037,7 +64903,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -87062,7 +64928,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -87078,7 +64944,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -87093,7 +64959,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -87102,7 +64968,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -87125,7 +64991,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -87133,7 +64999,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -87142,7 +65008,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -87151,7 +65017,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -87193,7 +65059,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -87269,15 +65135,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87287,27 +65145,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -87316,32 +65154,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -87349,20 +65162,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = pt_BR
  KDE_DOCS = gwenview
@@ -87429,7 +65229,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -87442,7 +65242,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -87451,7 +65251,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -87459,7 +65259,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -87468,7 +65268,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -87477,7 +65277,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -87492,7 +65292,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,10 +596,10 @@
+@@ -558,10 +598,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -87505,7 +65305,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -580,27 +626,36 @@
+@@ -588,27 +628,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -87617,15 +65417,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87635,27 +65427,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -87664,32 +65436,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -87697,20 +65444,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -87790,7 +65524,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -87805,7 +65539,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -87814,7 +65548,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -87829,7 +65563,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -87838,7 +65572,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -87853,7 +65587,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -87878,7 +65612,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -87894,7 +65628,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -87907,7 +65641,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -87916,7 +65650,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -87939,7 +65673,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -87947,7 +65681,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -87956,7 +65690,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -87965,7 +65699,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -88098,15 +65832,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88116,27 +65842,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -88145,32 +65851,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -88178,20 +65859,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -88271,7 +65939,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -88286,7 +65954,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -88295,7 +65963,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -88310,7 +65978,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -88319,7 +65987,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -88334,7 +66002,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -88359,7 +66027,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -88375,7 +66043,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -88390,7 +66058,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -88399,7 +66067,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -88422,7 +66090,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -88430,7 +66098,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -88439,7 +66107,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -88448,7 +66116,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -88490,7 +66158,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -88582,15 +66250,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88600,27 +66260,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -88629,32 +66269,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -88662,20 +66277,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -88755,7 +66357,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -88770,7 +66372,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -88779,7 +66381,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -88794,7 +66396,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -88803,7 +66405,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -88818,7 +66420,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -88843,7 +66445,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -88859,7 +66461,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -88872,7 +66474,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -88881,7 +66483,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -88904,7 +66506,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -88912,7 +66514,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -88921,7 +66523,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -88930,7 +66532,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -89063,15 +66665,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89081,27 +66675,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -89110,32 +66684,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -89143,20 +66692,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -89236,7 +66772,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -89251,7 +66787,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -89260,7 +66796,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -89275,7 +66811,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -89284,7 +66820,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -89299,7 +66835,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -89324,7 +66860,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -89340,7 +66876,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -89355,7 +66891,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -89364,7 +66900,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -89387,7 +66923,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -89395,7 +66931,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -89404,7 +66940,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -89413,7 +66949,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -89455,7 +66991,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -89531,15 +67067,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89549,27 +67077,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -89578,32 +67086,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -89611,20 +67094,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = ru
  KDE_DOCS = gwenview
@@ -89691,7 +67161,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -89704,7 +67174,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -89713,7 +67183,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -89721,7 +67191,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -89730,7 +67200,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -89739,7 +67209,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -89754,7 +67224,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,10 +596,10 @@
+@@ -558,10 +598,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -89767,7 +67237,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -580,27 +626,36 @@
+@@ -588,27 +628,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -89879,15 +67349,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89897,27 +67359,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -89926,32 +67368,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -89959,20 +67376,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -90052,7 +67456,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -90067,7 +67471,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -90076,7 +67480,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -90091,7 +67495,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -90100,7 +67504,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -90115,7 +67519,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -90140,7 +67544,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -90156,7 +67560,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -90169,7 +67573,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -90178,7 +67582,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -90201,7 +67605,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -90209,7 +67613,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -90218,7 +67622,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -90227,7 +67631,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -90360,15 +67764,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90378,27 +67774,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -90407,32 +67783,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -90440,20 +67791,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -90533,7 +67871,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -90548,7 +67886,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -90557,7 +67895,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -90572,7 +67910,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -90581,7 +67919,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -90596,7 +67934,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -90621,7 +67959,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -90637,7 +67975,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -90652,7 +67990,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -90661,7 +67999,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -90684,7 +68022,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -90692,7 +68030,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -90701,7 +68039,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -90710,7 +68048,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -90752,7 +68090,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -90844,15 +68182,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90862,27 +68192,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -90891,32 +68201,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -90924,20 +68209,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -91017,7 +68289,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -91032,7 +68304,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -91041,7 +68313,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -91056,7 +68328,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -91065,7 +68337,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -91080,7 +68352,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -91105,7 +68377,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -91121,7 +68393,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -91134,7 +68406,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -91143,7 +68415,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -91166,7 +68438,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -91174,7 +68446,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -91183,7 +68455,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -91192,7 +68464,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -91325,15 +68597,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91343,27 +68607,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -91372,32 +68616,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -91405,20 +68624,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -91498,7 +68704,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -91513,7 +68719,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -91522,7 +68728,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -91537,7 +68743,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -91546,7 +68752,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -91561,7 +68767,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -91586,7 +68792,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -91602,7 +68808,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -91617,7 +68823,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -91626,7 +68832,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -91649,7 +68855,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -91657,7 +68863,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -91666,7 +68872,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -91675,7 +68881,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -91717,7 +68923,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -91809,15 +69015,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91827,27 +69025,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -91856,32 +69034,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -91889,20 +69042,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -91982,7 +69122,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -91997,7 +69137,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -92006,7 +69146,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -92021,7 +69161,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -92030,7 +69170,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -92045,7 +69185,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -92070,7 +69210,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -92086,7 +69226,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -92099,7 +69239,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -92108,7 +69248,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -92131,7 +69271,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -92139,7 +69279,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -92148,7 +69288,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -92157,7 +69297,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -92290,15 +69430,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92308,27 +69440,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -92337,32 +69449,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -92370,20 +69457,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -92463,7 +69537,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -92478,7 +69552,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -92487,7 +69561,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -92502,7 +69576,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -92511,7 +69585,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -92526,7 +69600,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -92551,7 +69625,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -92567,7 +69641,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -92582,7 +69656,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -92591,7 +69665,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -92614,7 +69688,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -92622,7 +69696,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -92631,7 +69705,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -92640,7 +69714,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -92682,7 +69756,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -92774,15 +69848,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92792,27 +69858,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -92821,32 +69867,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -92854,20 +69875,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -92947,7 +69955,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -92962,7 +69970,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -92971,7 +69979,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -92986,7 +69994,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -92995,7 +70003,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -93010,7 +70018,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -93035,7 +70043,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -93051,7 +70059,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -93064,7 +70072,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -93073,7 +70081,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -93096,7 +70104,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -93104,7 +70112,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -93113,7 +70121,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -93122,7 +70130,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -93255,15 +70263,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93273,27 +70273,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -93302,32 +70282,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -93335,20 +70290,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -93428,7 +70370,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -93443,7 +70385,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -93452,7 +70394,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -93467,7 +70409,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -93476,7 +70418,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -93491,7 +70433,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -93516,7 +70458,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -93532,7 +70474,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -93547,7 +70489,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -93556,7 +70498,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -93579,7 +70521,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -93587,7 +70529,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -93596,7 +70538,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -93605,7 +70547,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -93647,7 +70589,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -93739,15 +70681,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93757,27 +70691,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -93786,32 +70700,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -93819,20 +70708,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -93912,7 +70788,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -93927,7 +70803,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -93936,7 +70812,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -93951,7 +70827,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -93960,7 +70836,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -93975,7 +70851,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -94000,7 +70876,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -94016,7 +70892,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -94029,7 +70905,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -94038,7 +70914,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -94061,7 +70937,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -94069,7 +70945,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -94078,7 +70954,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -94087,7 +70963,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -94220,15 +71096,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94238,27 +71106,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -94267,32 +71115,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -94300,20 +71123,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -94393,7 +71203,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -94408,7 +71218,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -94417,7 +71227,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -94432,7 +71242,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -94441,7 +71251,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -94456,7 +71266,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -94481,7 +71291,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -94497,7 +71307,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -94512,7 +71322,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -94521,7 +71331,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -94544,7 +71354,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -94552,7 +71362,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -94561,7 +71371,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -94570,7 +71380,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -94612,7 +71422,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -94688,15 +71498,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +94,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +171,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94706,27 +71508,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +210,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +229,8 @@
+@@ -213,6 +229,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -94735,32 +71517,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +254,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +287,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +332,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +337,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -94768,20 +71525,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +347,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -381,27 +406,53 @@
+@@ -389,27 +408,53 @@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  KDE_LANG = sv
  KDE_DOCS = gwenview
@@ -94848,7 +71592,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -418,12 +469,6 @@
+@@ -426,12 +471,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -94861,7 +71605,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -439,7 +484,7 @@
+@@ -447,7 +486,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -94870,7 +71614,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -457,7 +502,6 @@
+@@ -465,7 +504,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -94878,7 +71622,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -480,7 +524,7 @@
+@@ -488,7 +526,7 @@
  clean-generic:
  
  distclean-generic:
@@ -94887,7 +71631,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,6 +545,8 @@
+@@ -509,6 +547,8 @@
  
  dvi-am:
  
@@ -94896,7 +71640,7 @@
  info: info-am
  
  info-am:
-@@ -537,10 +583,10 @@
+@@ -545,10 +585,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -94911,7 +71655,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -550,10 +596,10 @@
+@@ -558,10 +598,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -94924,7 +71668,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -580,27 +626,36 @@
+@@ -588,27 +628,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -95036,15 +71780,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95054,27 +71790,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -95083,32 +71799,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -95116,20 +71807,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages doc
@@ -95209,7 +71887,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -95224,7 +71902,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -95233,7 +71911,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -95248,7 +71926,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -95257,7 +71935,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -95272,7 +71950,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -95297,7 +71975,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -95313,7 +71991,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -95326,7 +72004,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -95335,7 +72013,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -95358,7 +72036,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -95366,7 +72044,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -95375,7 +72053,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -95384,7 +72062,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -95517,15 +72195,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95535,27 +72205,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -95564,32 +72214,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -95597,20 +72222,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -95690,7 +72302,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -95705,7 +72317,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -95714,7 +72326,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -95729,7 +72341,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -95738,7 +72350,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -95753,7 +72365,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -95778,7 +72390,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -95794,7 +72406,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -95809,7 +72421,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -95818,7 +72430,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -95841,7 +72453,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -95849,7 +72461,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -95858,7 +72470,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -95867,7 +72479,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -95909,7 +72521,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -96001,15 +72613,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96019,27 +72623,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -96048,32 +72632,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -96081,20 +72640,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -96174,7 +72720,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -96189,7 +72735,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -96198,7 +72744,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -96213,7 +72759,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -96222,7 +72768,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -96237,7 +72783,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -96262,7 +72808,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -96278,7 +72824,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -96291,7 +72837,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -96300,7 +72846,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -96323,7 +72869,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -96331,7 +72877,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -96340,7 +72886,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -96349,7 +72895,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -96482,15 +73028,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96500,27 +73038,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -96529,32 +73047,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -96562,20 +73055,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -96655,7 +73135,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -96670,7 +73150,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -96679,7 +73159,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -96694,7 +73174,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -96703,7 +73183,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -96718,7 +73198,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -96743,7 +73223,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -96759,7 +73239,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -96774,7 +73254,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -96783,7 +73263,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -96806,7 +73286,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -96814,7 +73294,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -96823,7 +73303,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -96832,7 +73312,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -96874,7 +73354,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -96897,6 +73377,839 @@
  	cd $(top_srcdir) && perl admin/am_edit ta/messages/Makefile.in
  
  
+--- th/Makefile.in
++++ th/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 = th
++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@
+@@ -158,6 +187,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +245,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
+ ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
+ az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
+@@ -319,6 +353,7 @@
+ lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
+ lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
+ nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
+ nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
+@@ -388,40 +423,53 @@
+ zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
+ zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
+ SUBDIRS = messages
+-subdir = th
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  th/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  th/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  th/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  th/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  th/Makefile
++	  $(AUTOMAKE) --foreign  th/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit th/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -440,7 +488,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 \
+@@ -452,7 +506,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; \
+@@ -460,7 +514,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)' ;; \
+@@ -481,7 +541,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 \
+@@ -492,14 +552,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 \
+@@ -508,19 +560,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; \
+@@ -530,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: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -556,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'`; \
+@@ -575,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; \
+@@ -590,15 +640,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; \
+@@ -608,7 +660,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -628,7 +679,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"
+@@ -650,6 +701,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -684,37 +737,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  th/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  th/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  th/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit th/Makefile.in
+ 
+ 
+--- th/messages/Makefile.in
++++ th/messages/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 = th/messages
++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@
+@@ -158,6 +189,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -213,6 +247,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
+ ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
+ az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
+@@ -319,6 +355,7 @@
+ lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
+ lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
+ nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
+ nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
+@@ -395,40 +432,53 @@
+ #>+ 2
+ POFILES = gwenview.po
+ GMOFILES = gwenview.gmo
+-subdir = th/messages
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-DIST_SOURCES =
+-
+-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
+-#>- 	all-recursive install-data-recursive install-exec-recursive \
+-#>- 	installdirs-recursive install-recursive uninstall-recursive \
+-#>- 	check-recursive installcheck-recursive
+-#>+ 5
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+-	ps-recursive install-info-recursive uninstall-info-recursive \
+-	all-recursive install-data-recursive install-exec-recursive \
+-	installdirs-recursive install-recursive uninstall-recursive \
+-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+ #>- all: all-recursive
+ #>+ 1
+ all: all-nls docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++#>- 	@for dep in $?; do \
++#>- 	  case '$(am__configure_deps)' in \
++#>- 	    *$$dep*) \
++#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- 		&& exit 0; \
++#>- 	      exit 1;; \
++#>- 	  esac; \
++#>- 	done; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  th/messages/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --gnu  th/messages/Makefile
+-#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  th/messages/Makefile
++#>+ 12
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  th/messages/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  th/messages/Makefile
++	  $(AUTOMAKE) --foreign  th/messages/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit th/messages/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -447,7 +497,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 \
+@@ -459,7 +515,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; \
+@@ -467,7 +523,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)' ;; \
+@@ -488,7 +550,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 \
+@@ -499,14 +561,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 \
+@@ -515,19 +569,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; \
+@@ -537,10 +594,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)
+@@ -563,14 +621,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
+@@ -586,7 +636,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; \
+@@ -601,15 +651,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; \
+@@ -619,7 +671,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -641,7 +692,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"
+@@ -663,6 +714,8 @@
+ 
+ dvi-am:
+ 
++html: html-recursive
++
+ info: info-recursive
+ 
+ info-am:
+@@ -701,29 +754,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=Makefile.in gwenview.po 
++KDE_DIST=Makefile.in Makefile.am gwenview.po 
+ 
+ #>+ 4
+ gwenview.gmo: gwenview.po
+@@ -764,10 +813,19 @@
+ #>+ 2
+ docs-am:
+ 
+-#>+ 6
++#>+ 15
+ force-reedit:
+-		cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  th/messages/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  th/messages/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  th/messages/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit th/messages/Makefile.in
+ 
+ 
 --- tr/Makefile.in
 +++ tr/Makefile.in
 @@ -1,9 +1,9 @@
@@ -96966,15 +74279,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96984,27 +74289,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -97013,32 +74298,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -97046,20 +74306,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -97139,7 +74386,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -97154,7 +74401,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -97163,7 +74410,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -97178,7 +74425,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -97187,7 +74434,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -97202,7 +74449,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -97227,7 +74474,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -97243,7 +74490,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -97256,7 +74503,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -97265,7 +74512,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -97288,7 +74535,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -97296,7 +74543,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -97305,7 +74552,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -97314,7 +74561,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -97447,15 +74694,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97465,27 +74704,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -97494,32 +74713,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -97527,20 +74721,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -97620,7 +74801,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -97635,7 +74816,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -97644,7 +74825,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -97659,7 +74840,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -97668,7 +74849,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -97683,7 +74864,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -97708,7 +74889,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -97724,7 +74905,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -97739,7 +74920,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -97748,7 +74929,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -97771,7 +74952,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -97779,7 +74960,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -97788,7 +74969,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -97797,7 +74978,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -97839,7 +75020,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -97931,15 +75112,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97949,27 +75122,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -97978,32 +75131,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -98011,20 +75139,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -98104,7 +75219,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -98119,7 +75234,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -98128,7 +75243,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -98143,7 +75258,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -98152,7 +75267,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -98167,7 +75282,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -98192,7 +75307,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -98208,7 +75323,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -98221,7 +75336,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -98230,7 +75345,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -98253,7 +75368,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -98261,7 +75376,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -98270,7 +75385,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -98279,7 +75394,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -98412,15 +75527,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98430,27 +75537,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -98459,32 +75546,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -98492,20 +75554,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -98585,7 +75634,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -98600,7 +75649,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -98609,7 +75658,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -98624,7 +75673,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -98633,7 +75682,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -98648,7 +75697,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -98673,7 +75722,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -98689,7 +75738,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -98704,7 +75753,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -98713,7 +75762,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -98736,7 +75785,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -98744,7 +75793,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -98753,7 +75802,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -98762,7 +75811,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -98804,7 +75853,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -98896,15 +75945,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98914,27 +75955,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -98943,32 +75964,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -98976,20 +75972,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -99069,7 +76052,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -99084,7 +76067,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -99093,7 +76076,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -99108,7 +76091,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -99117,7 +76100,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -99132,7 +76115,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -99157,7 +76140,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -99173,7 +76156,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -99186,7 +76169,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -99195,7 +76178,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -99218,7 +76201,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -99226,7 +76209,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -99235,7 +76218,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -99244,7 +76227,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -99377,15 +76360,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99395,27 +76370,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -99424,32 +76379,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -99457,20 +76387,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -99550,7 +76467,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -99565,7 +76482,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -99574,7 +76491,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -99589,7 +76506,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -99598,7 +76515,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -99613,7 +76530,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -99638,7 +76555,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -99654,7 +76571,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -99669,7 +76586,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -99678,7 +76595,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -99701,7 +76618,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -99709,7 +76626,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -99718,7 +76635,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -99727,7 +76644,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -99769,7 +76686,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -99861,15 +76778,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99879,27 +76788,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -99908,32 +76797,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -99941,20 +76805,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -100034,7 +76885,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -100049,7 +76900,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -100058,7 +76909,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -100073,7 +76924,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -100082,7 +76933,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -100097,7 +76948,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -100122,7 +76973,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -100138,7 +76989,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -100151,7 +77002,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -100160,7 +77011,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -100183,7 +77034,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -100191,7 +77042,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -100200,7 +77051,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -100209,7 +77060,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -100342,15 +77193,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100360,27 +77203,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -100389,32 +77212,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -100422,20 +77220,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -100515,7 +77300,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -100530,7 +77315,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -100539,7 +77324,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -100554,7 +77339,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -100563,7 +77348,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -100578,7 +77363,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -100603,7 +77388,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -100619,7 +77404,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -100634,7 +77419,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -100643,7 +77428,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -100666,7 +77451,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -100674,7 +77459,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -100683,7 +77468,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -100692,7 +77477,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -100734,7 +77519,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -100826,15 +77611,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100844,27 +77621,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -100873,32 +77630,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -100906,20 +77638,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -100999,7 +77718,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -101014,7 +77733,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -101023,7 +77742,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -101038,7 +77757,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -101047,7 +77766,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -101062,7 +77781,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -101087,7 +77806,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -101103,7 +77822,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -101116,7 +77835,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -101125,7 +77844,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -101148,7 +77867,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -101156,7 +77875,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -101165,7 +77884,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -101174,7 +77893,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -101307,15 +78026,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101325,27 +78036,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -101354,32 +78045,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -101387,20 +78053,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -101480,7 +78133,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -101495,7 +78148,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -101504,7 +78157,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -101519,7 +78172,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -101528,7 +78181,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -101543,7 +78196,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -101568,7 +78221,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -101584,7 +78237,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -101599,7 +78252,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -101608,7 +78261,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -101631,7 +78284,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -101639,7 +78292,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -101648,7 +78301,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -101657,7 +78310,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -101699,7 +78352,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -101791,15 +78444,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101809,27 +78454,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -101838,32 +78463,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -101871,20 +78471,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -101964,7 +78551,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -101979,7 +78566,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -101988,7 +78575,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -102003,7 +78590,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -102012,7 +78599,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -102027,7 +78614,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -102052,7 +78639,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -102068,7 +78655,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -102081,7 +78668,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -102090,7 +78677,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -102113,7 +78700,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -102121,7 +78708,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -102130,7 +78717,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -102139,7 +78726,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -102272,15 +78859,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102290,27 +78869,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -102319,32 +78878,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -102352,20 +78886,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -102445,7 +78966,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -102460,7 +78981,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -102469,7 +78990,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -102484,7 +79005,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -102493,7 +79014,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -102508,7 +79029,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -102533,7 +79054,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -102549,7 +79070,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -102564,7 +79085,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -102573,7 +79094,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -102596,7 +79117,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -102604,7 +79125,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -102613,7 +79134,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -102622,7 +79143,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -102664,7 +79185,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  
@@ -102756,15 +79277,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +110,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +187,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102774,27 +79287,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +226,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +245,8 @@
+@@ -213,6 +245,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -102803,32 +79296,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +270,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +303,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +348,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +353,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -102836,20 +79304,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +363,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -380,40 +421,53 @@
+@@ -388,40 +423,53 @@
  zu_SUBDIR_included_FALSE = @zu_SUBDIR_included_FALSE@
  zu_SUBDIR_included_TRUE = @zu_SUBDIR_included_TRUE@
  SUBDIRS = messages
@@ -102929,7 +79384,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -432,7 +486,13 @@
+@@ -440,7 +488,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):
@@ -102944,7 +79399,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,7 +504,7 @@
+@@ -452,7 +506,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -102953,7 +79408,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +512,13 @@
+@@ -460,7 +514,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -102968,7 +79423,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -473,7 +539,7 @@
+@@ -481,7 +541,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -102977,7 +79432,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -484,14 +550,6 @@
+@@ -492,14 +552,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -102992,7 +79447,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -500,19 +558,22 @@
+@@ -508,19 +560,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -103017,7 +79472,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -522,10 +583,11 @@
+@@ -530,10 +585,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -103033,7 +79488,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +610,6 @@
+@@ -556,12 +612,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -103046,7 +79501,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +623,7 @@
+@@ -575,7 +625,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -103055,7 +79510,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -582,15 +638,17 @@
+@@ -590,15 +640,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -103078,7 +79533,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -600,7 +658,6 @@
+@@ -608,7 +660,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -103086,7 +79541,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -620,7 +677,7 @@
+@@ -628,7 +679,7 @@
  clean-generic:
  
  distclean-generic:
@@ -103095,7 +79550,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -642,6 +699,8 @@
+@@ -650,6 +701,8 @@
  
  dvi-am:
  
@@ -103104,7 +79559,7 @@
  info: info-recursive
  
  info-am:
-@@ -676,37 +735,42 @@
+@@ -684,37 +737,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -103237,15 +79692,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -81,6 +112,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -157,6 +189,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103255,27 +79702,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -193,18 +228,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- 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@
-@@ -214,6 +247,8 @@
+@@ -213,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -103284,32 +79711,7 @@
  ar_SUBDIR_included_FALSE = @ar_SUBDIR_included_FALSE@
  ar_SUBDIR_included_TRUE = @ar_SUBDIR_included_TRUE@
  az_SUBDIR_included_FALSE = @az_SUBDIR_included_FALSE@
-@@ -237,8 +272,11 @@
- da_SUBDIR_included_FALSE = @da_SUBDIR_included_FALSE@
- da_SUBDIR_included_TRUE = @da_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- de_SUBDIR_included_FALSE = @de_SUBDIR_included_FALSE@
- de_SUBDIR_included_TRUE = @de_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- el_SUBDIR_included_FALSE = @el_SUBDIR_included_FALSE@
- el_SUBDIR_included_TRUE = @el_SUBDIR_included_TRUE@
- en_GB_SUBDIR_included_FALSE = @en_GB_SUBDIR_included_FALSE@
-@@ -267,6 +305,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- hu_SUBDIR_included_FALSE = @hu_SUBDIR_included_FALSE@
- hu_SUBDIR_included_TRUE = @hu_SUBDIR_included_TRUE@
- include_ARTS_FALSE = @include_ARTS_FALSE@
-@@ -311,10 +350,12 @@
- ko_SUBDIR_included_TRUE = @ko_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
+@@ -319,6 +355,7 @@
  lt_SUBDIR_included_FALSE = @lt_SUBDIR_included_FALSE@
  lt_SUBDIR_included_TRUE = @lt_SUBDIR_included_TRUE@
  mandir = @mandir@
@@ -103317,20 +79719,7 @@
  nb_SUBDIR_included_FALSE = @nb_SUBDIR_included_FALSE@
  nb_SUBDIR_included_TRUE = @nb_SUBDIR_included_TRUE@
  nl_SUBDIR_included_FALSE = @nl_SUBDIR_included_FALSE@
-@@ -324,10 +365,12 @@
- oldincludedir = @oldincludedir@
- pa_SUBDIR_included_FALSE = @pa_SUBDIR_included_FALSE@
- pa_SUBDIR_included_TRUE = @pa_SUBDIR_included_TRUE@
-+pdfdir = @pdfdir@
- pl_SUBDIR_included_FALSE = @pl_SUBDIR_included_FALSE@
- pl_SUBDIR_included_TRUE = @pl_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- pt_BR_SUBDIR_included_FALSE = @pt_BR_SUBDIR_included_FALSE@
- pt_BR_SUBDIR_included_TRUE = @pt_BR_SUBDIR_included_TRUE@
- pt_SUBDIR_included_FALSE = @pt_SUBDIR_included_FALSE@
-@@ -387,40 +430,53 @@
+@@ -395,40 +432,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -103410,7 +79799,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -439,7 +495,13 @@
+@@ -447,7 +497,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):
@@ -103425,7 +79814,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -451,7 +513,7 @@
+@@ -459,7 +515,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -103434,7 +79823,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -459,7 +521,13 @@
+@@ -467,7 +523,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -103449,7 +79838,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -480,7 +548,7 @@
+@@ -488,7 +550,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -103458,7 +79847,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -491,14 +559,6 @@
+@@ -499,14 +561,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -103473,7 +79862,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -507,19 +567,22 @@
+@@ -515,19 +569,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -103498,7 +79887,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -529,10 +592,11 @@
+@@ -537,10 +594,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -103514,7 +79903,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -555,14 +619,6 @@
+@@ -563,14 +621,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -103529,7 +79918,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -578,7 +634,7 @@
+@@ -586,7 +636,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -103538,7 +79927,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -593,15 +649,17 @@
+@@ -601,15 +651,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -103561,7 +79950,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -611,7 +669,6 @@
+@@ -619,7 +671,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -103569,7 +79958,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -633,7 +690,7 @@
+@@ -641,7 +692,7 @@
  clean-generic:
  
  distclean-generic:
@@ -103578,7 +79967,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -655,6 +712,8 @@
+@@ -663,6 +714,8 @@
  
  dvi-am:
  
@@ -103587,7 +79976,7 @@
  info: info-recursive
  
  info-am:
-@@ -693,29 +752,25 @@
+@@ -701,29 +754,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -103629,7 +80018,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -756,10 +811,19 @@
+@@ -764,10 +813,19 @@
  #>+ 2
  docs-am:
  




More information about the pkg-kde-commits mailing list