[Pkg-kde-commits] rev 1903 - in kde-extras/kmymoney2/trunk: . debian developer-doc developer-doc/phb doc doc/en kmymoney2 kmymoney2/converter kmymoney2/dialogs kmymoney2/html kmymoney2/html/images kmymoney2/icons kmymoney2/icons/hicolor kmymoney2/icons/hicolor/16x16 kmymoney2/icons/hicolor/16x16/actions kmymoney2/icons/hicolor/22x22 kmymoney2/icons/hicolor/22x22/actions kmymoney2/icons/hicolor/32x32 kmymoney2/icons/hicolor/32x32/apps kmymoney2/icons/hicolor/48x48 kmymoney2/icons/hicolor/48x48/apps kmymoney2/icons/hicolor/64x64 kmymoney2/icons/hicolor/64x64/apps kmymoney2/mymoney kmymoney2/mymoney/storage kmymoney2/pics kmymoney2/plugins kmymoney2/plugins/interfaces kmymoney2/plugins/kbanking kmymoney2/plugins/ofximport kmymoney2/reports kmymoney2/templates kmymoney2/templates/C kmymoney2/templates/de_DE kmymoney2/templates/en_GB kmymoney2/templates/en_US kmymoney2/templates/fr_FR kmymoney2/templates/gl_ES kmymoney2/templates/pt_BR kmymoney2/templates/ru_SU kmymoney2/views kmymoney2/widgets libkgpgfile po

Mark Purcell msp at costa.debian.org
Sun Oct 2 14:29:49 UTC 2005


Author: msp
Date: 2005-10-02 14:29:39 +0000 (Sun, 02 Oct 2005)
New Revision: 1903

Added:
   kde-extras/kmymoney2/trunk/configure.files
   kde-extras/kmymoney2/trunk/debian/
   kde-extras/kmymoney2/trunk/debian/changelog
   kde-extras/kmymoney2/trunk/debian/control
   kde-extras/kmymoney2/trunk/debian/copyright
   kde-extras/kmymoney2/trunk/debian/dirs
   kde-extras/kmymoney2/trunk/debian/docs
   kde-extras/kmymoney2/trunk/debian/kmymoney2.xpm
   kde-extras/kmymoney2/trunk/debian/menu
   kde-extras/kmymoney2/trunk/debian/override
   kde-extras/kmymoney2/trunk/debian/rules
   kde-extras/kmymoney2/trunk/debian/watch
Modified:
   kde-extras/kmymoney2/trunk/Makefile.in
   kde-extras/kmymoney2/trunk/aclocal.m4
   kde-extras/kmymoney2/trunk/config.h.in
   kde-extras/kmymoney2/trunk/configure
   kde-extras/kmymoney2/trunk/configure.in
   kde-extras/kmymoney2/trunk/configure.in.in
   kde-extras/kmymoney2/trunk/developer-doc/Makefile.in
   kde-extras/kmymoney2/trunk/developer-doc/phb/Makefile.in
   kde-extras/kmymoney2/trunk/doc/Makefile.in
   kde-extras/kmymoney2/trunk/doc/en/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/converter/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/dialogs/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/html/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/html/images/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/16x16/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/16x16/actions/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/22x22/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/22x22/actions/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/32x32/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/32x32/apps/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/48x48/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/48x48/apps/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/64x64/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/64x64/apps/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/kmymoney2.desktop
   kde-extras/kmymoney2/trunk/kmymoney2/mymoney/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/mymoney/storage/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/pics/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/plugins/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/plugins/interfaces/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/plugins/kbanking/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/plugins/ofximport/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/reports/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/templates/C/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/templates/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/templates/de_DE/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/templates/en_GB/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/templates/en_US/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/templates/fr_FR/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/templates/gl_ES/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/templates/pt_BR/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/templates/ru_SU/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/views/Makefile.in
   kde-extras/kmymoney2/trunk/kmymoney2/widgets/Makefile.in
   kde-extras/kmymoney2/trunk/libkgpgfile/Makefile.in
   kde-extras/kmymoney2/trunk/po/Makefile.in
Log:
Load newtrunk into kde-extras/kmymoney2/trunk.


Modified: kde-extras/kmymoney2/trunk/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -248,7 +248,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -521,14 +521,16 @@
 		$(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; \
@@ -538,9 +540,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -649,7 +653,7 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -826,6 +830,28 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+clean-bcheck: 
+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
+
+bcheck: bcheck-recursive
+
+bcheck-am:
+	@for i in ; do \
+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+	        echo "$$i"; \
+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+	            rm -f $$i.bchecktest.cc; exit 1; \
+	        fi ; \
+	        echo "" >> $$i.bchecktest.cc.class; \
+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
+	        rm -f a.out; \
+	    fi ; \
+	done
+
+
+
 #>+ 2
 docs-am:
 

Modified: kde-extras/kmymoney2/trunk/aclocal.m4
===================================================================
--- kde-extras/kmymoney2/trunk/aclocal.m4	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/aclocal.m4	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -12,208 +12,15 @@
 # PARTICULAR PURPOSE.
 
 # Configure paths for LIBXML2
+# Mike Hommey 2004-06-19
+# use CPPFLAGS instead of CFLAGS
 # Toshio Kuratomi 2001-04-21
 # Adapted from:
 # Configure paths for GLIB
 # Owen Taylor     97-11-3
 
-dnl AM_PATH_XML([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for XML, and define XML_CFLAGS and XML_LIBS
-dnl
-AC_DEFUN([AM_PATH_XML],[ 
-AC_ARG_WITH(xml-prefix,
-            [  --with-xml-prefix=PFX   Prefix where libxml is installed (optional)],
-            xml_config_prefix="$withval", xml_config_prefix="")
-AC_ARG_WITH(xml-exec-prefix,
-            [  --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)],
-            xml_config_exec_prefix="$withval", xml_config_exec_prefix="")
-AC_ARG_ENABLE(xmltest,
-              [  --disable-xmltest       Do not try to compile and run a test LIBXML program],,
-              enable_xmltest=yes)
-
-  if test x$xml_config_exec_prefix != x ; then
-     xml_config_args="$xml_config_args --exec-prefix=$xml_config_exec_prefix"
-     if test x${XML_CONFIG+set} != xset ; then
-        XML_CONFIG=$xml_config_exec_prefix/bin/xml-config
-     fi
-  fi
-  if test x$xml_config_prefix != x ; then
-     xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
-     if test x${XML_CONFIG+set} != xset ; then
-        XML_CONFIG=$xml_config_prefix/bin/xml-config
-     fi
-  fi
-
-  AC_PATH_PROG(XML_CONFIG, xml-config, no)
-  min_xml_version=ifelse([$1], ,1.0.0,[$1])
-  AC_MSG_CHECKING(for libxml - version >= $min_xml_version)
-  no_xml=""
-  if test "$XML_CONFIG" = "no" ; then
-    no_xml=yes
-  else
-    XML_CFLAGS=`$XML_CONFIG $xml_config_args --cflags`
-    XML_LIBS=`$XML_CONFIG $xml_config_args --libs`
-    xml_config_major_version=`$XML_CONFIG $xml_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    xml_config_minor_version=`$XML_CONFIG $xml_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    xml_config_micro_version=`$XML_CONFIG $xml_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_xmltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $XML_CFLAGS"
-      LIBS="$XML_LIBS $LIBS"
-dnl
-dnl Now check if the installed libxml is sufficiently new.
-dnl (Also sanity checks the results of xml-config to some extent)
-dnl
-      rm -f conf.xmltest
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <libxml/tree.h>
-
-int 
-main()
-{
-  int xml_major_version, xml_minor_version, xml_micro_version;
-  int major, minor, micro;
-  char *tmp_version;
-  int tmp_int_version;
-
-  system("touch conf.xmltest");
-
-  /* Capture xml-config output via autoconf/configure variables */
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = (char *)strdup("$min_xml_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string from xml-config\n", "$min_xml_version");
-     exit(1);
-   }
-   free(tmp_version);
-
-   /* Capture the version information from the header files */
-   tmp_int_version = LIBXML_VERSION;
-   xml_major_version=tmp_int_version / 10000;
-   xml_minor_version=(tmp_int_version - xml_major_version * 10000) / 100;
-   xml_micro_version=(tmp_int_version - xml_minor_version * 100 - xml_major_version * 10000);
-
- /* Compare xml-config output to the libxml headers */
-  if ((xml_major_version != $xml_config_major_version) ||
-      (xml_minor_version != $xml_config_minor_version)
-#if 0
-      ||
-/* The last released version of libxml-1.x has an incorrect micro version in
- * the header file so neither the includes nor the library will match the
- * micro_version to the output of xml-config
- */
-      (xml_micro_version != $xml_config_micro_version)
-#endif 
-	  )
-	  
-    {
-      printf("*** libxml header files (version %d.%d.%d) do not match\n",
-         xml_major_version, xml_minor_version, xml_micro_version);
-      printf("*** xml-config (version %d.%d.%d)\n",
-         $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
-      return 1;
-    } 
-/* Compare the headers to the library to make sure we match */
-  /* Less than ideal -- doesn't provide us with return value feedback, 
-   * only exits if there's a serious mismatch between header and library.
-   */
-    LIBXML_TEST_VERSION;
-
-    /* Test that the library is greater than our minimum version */
-    if (($xml_config_major_version > major) ||
-        (($xml_config_major_version == major) && ($xml_config_minor_version > minor)) ||
-        (($xml_config_major_version == major) && ($xml_config_minor_version == minor) &&
-        ($xml_config_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
-               xml_major_version, xml_minor_version, xml_micro_version);
-        printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
-           major, minor, micro);
-        printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the xml-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of LIBXML, but you can also set the XML_CONFIG environment to point to the\n");
-        printf("*** correct copy of xml-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-    }
-  return 1;
-}
-],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-
-  if test "x$no_xml" = x ; then
-     AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$XML_CONFIG" = "no" ; then
-       echo "*** The xml-config script installed by LIBXML could not be found"
-       echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the XML_CONFIG environment variable to the"
-       echo "*** full path to xml-config."
-     else
-       if test -f conf.xmltest ; then
-        :
-       else
-          echo "*** Could not run libxml test program, checking why..."
-          CFLAGS="$CFLAGS $XML_CFLAGS"
-          LIBS="$LIBS $XML_LIBS"
-          AC_TRY_LINK([
-#include <libxml/tree.h>
-#include <stdio.h>
-],      [ LIBXML_TEST_VERSION; return 0;],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding LIBXML or finding the wrong"
-          echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-          echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
-          echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
-          echo "*** may want to edit the xml-config script: $XML_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-
-     XML_CFLAGS=""
-     XML_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(XML_CFLAGS)
-  AC_SUBST(XML_LIBS)
-  rm -f conf.xmltest
-])
-
-# Configure paths for LIBXML2
-# Toshio Kuratomi 2001-04-21
-# Adapted from:
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
 dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for XML, and define XML_CFLAGS and XML_LIBS
+dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS
 dnl
 AC_DEFUN([AM_PATH_XML2],[ 
 AC_ARG_WITH(xml-prefix,
@@ -246,7 +53,7 @@
   if test "$XML2_CONFIG" = "no" ; then
     no_xml=yes
   else
-    XML_CFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
+    XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
     XML_LIBS=`$XML2_CONFIG $xml_config_args --libs`
     xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
@@ -255,9 +62,9 @@
     xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
     if test "x$enable_xmltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
+      ac_save_CPPFLAGS="$CPPFLAGS"
       ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $XML_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
       LIBS="$XML_LIBS $LIBS"
 dnl
 dnl Now check if the installed libxml is sufficiently new.
@@ -340,7 +147,7 @@
   return 1;
 }
 ],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
+       CPPFLAGS="$ac_save_CPPFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
@@ -360,7 +167,7 @@
         :
        else
           echo "*** Could not run libxml test program, checking why..."
-          CFLAGS="$CFLAGS $XML_CFLAGS"
+          CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
           LIBS="$LIBS $XML_LIBS"
           AC_TRY_LINK([
 #include <libxml/xmlversion.h>
@@ -379,16 +186,16 @@
           echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
           echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
           echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
+          CPPFLAGS="$ac_save_CPPFLAGS"
           LIBS="$ac_save_LIBS"
        fi
      fi
 
-     XML_CFLAGS=""
+     XML_CPPFLAGS=""
      XML_LIBS=""
      ifelse([$3], , :, [$3])
   fi
-  AC_SUBST(XML_CFLAGS)
+  AC_SUBST(XML_CPPFLAGS)
   AC_SUBST(XML_LIBS)
   rm -f conf.xmltest
 ])
@@ -422,7 +229,7 @@
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.3])])
+	 [AM_AUTOMAKE_VERSION([1.8.5])])
 
 # AM_AUX_DIR_EXPAND
 
@@ -648,9 +455,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_$1_dependencies_compiler_type=$depmode
         break
       fi

Modified: kde-extras/kmymoney2/trunk/config.h.in
===================================================================
--- kde-extras/kmymoney2/trunk/config.h.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/config.h.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -247,10 +247,7 @@
 #endif
 
 
-/* define to 1 if -fvisibility is supported */
-#undef __KDE_HAVE_GCC_VISIBILITY
 
-
 #if defined(__SVR4) && !defined(__svr4__)
 #define __svr4__ 1
 #endif

Modified: kde-extras/kmymoney2/trunk/configure
===================================================================
--- kde-extras/kmymoney2/trunk/configure	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/configure	2005-10-02 14:29:39 UTC (rev 1903)
@@ -464,7 +464,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p 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 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 CPPUNIT_TRUE CPPUNIT_FALSE CPPUNIT_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS LIBXML2_TRUE LIBXML2_FALSE XML2_LIBS XML2_CONFIG XML_CFLAGS XML_LIBS kbanking_dir kbanking_libs kbanking_data kbanking_includes kbanking_plugin GENERATE_PDF_TRUE GENERATE_PDF_FALSE found_html2ps found_ps2pdf found_jade found_pdfjadetex HAVE_HTMLCONVERSIONTOOLS_TRUE HAVE_HTMLCONVERSIONTOOLS_FALSE HAVE_DSSSLCONVERSIONTOOLS_TRUE HAVE_DSSSLCONVERSIONTOOLS_FALSE ofx_libs ofx_importerplugin TOPSUBDIRS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p 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 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 CPPUNIT_TRUE CPPUNIT_FALSE CPPUNIT_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS LIBXML2_TRUE LIBXML2_FALSE XML2_LIBS XML2_CONFIG XML_CPPFLAGS XML_LIBS kbanking_dir kbanking_libs kbanking_data kbanking_includes kbanking_plugin GENERATE_PDF_TRUE GENERATE_PDF_FALSE found_html2ps found_ps2pdf found_jade found_pdfjadetex HAVE_HTMLCONVERSIONTOOLS_TRUE HAVE_HTMLCONVERSIONTOOLS_FALSE HAVE_DSSSLCONVERSIONTOOLS_TRUE HAVE_DSSSLCONVERSIONTOOLS_FALSE ofx_libs ofx_importerplugin TOPSUBDIRS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1194,7 +1194,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -3018,8 +3018,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3077,8 +3076,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3194,8 +3192,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3249,8 +3246,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3295,8 +3291,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3340,8 +3335,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3451,9 +3445,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CC_dependencies_compiler_type=$depmode
         break
       fi
@@ -3893,8 +3892,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3952,8 +3950,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4024,8 +4021,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4069,8 +4065,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4174,9 +4169,14 @@
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CXX_dependencies_compiler_type=$depmode
         break
       fi
@@ -4243,8 +4243,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4355,8 +4354,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4444,8 +4442,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4547,8 +4544,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4647,8 +4643,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4732,8 +4727,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4822,8 +4816,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4910,8 +4903,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4998,8 +4990,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5105,8 +5096,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5193,8 +5183,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5281,8 +5270,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5369,8 +5357,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5501,8 +5488,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5590,8 +5576,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5678,8 +5663,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5766,8 +5750,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5854,8 +5837,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5942,8 +5924,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6366,8 +6347,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6493,8 +6473,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6582,8 +6561,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6713,8 +6691,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6793,8 +6770,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7486,7 +7462,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7489 "configure"' > conftest.$ac_ext
+  echo '#line 7465 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7608,8 +7584,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7684,8 +7659,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7855,8 +7829,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7923,8 +7896,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8131,7 +8103,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:8134:" \
+echo "$as_me:8106:" \
      "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
@@ -8177,8 +8149,7 @@
   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'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8227,8 +8198,7 @@
   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'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9163,11 +9133,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9166: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9136: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9170: \$? = $ac_status" >&5
+   echo "$as_me:9140: \$? = $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
@@ -9396,11 +9366,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9399: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9369: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9403: \$? = $ac_status" >&5
+   echo "$as_me:9373: \$? = $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
@@ -9463,11 +9433,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9466: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9436: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9470: \$? = $ac_status" >&5
+   echo "$as_me:9440: \$? = $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
@@ -9814,8 +9784,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9876,8 +9845,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11035,8 +11003,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11139,8 +11106,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11205,8 +11171,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11299,8 +11264,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11365,8 +11329,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11432,8 +11395,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11499,8 +11461,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11575,7 +11536,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11578 "configure"
+#line 11539 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11673,7 +11634,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11676 "configure"
+#line 11637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12715,8 +12676,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12778,8 +12738,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13816,11 +13775,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13819: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13778: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13823: \$? = $ac_status" >&5
+   echo "$as_me:13782: \$? = $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
@@ -13883,11 +13842,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13886: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13845: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13890: \$? = $ac_status" >&5
+   echo "$as_me:13849: \$? = $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
@@ -14679,8 +14638,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14783,8 +14741,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14849,8 +14806,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14943,8 +14899,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15009,8 +14964,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15076,8 +15030,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15143,8 +15096,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15219,7 +15171,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15222 "configure"
+#line 15174 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15317,7 +15269,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15320 "configure"
+#line 15272 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16140,11 +16092,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16143: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16095: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16147: \$? = $ac_status" >&5
+   echo "$as_me:16099: \$? = $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
@@ -16207,11 +16159,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16210: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16162: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16214: \$? = $ac_status" >&5
+   echo "$as_me:16166: \$? = $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
@@ -16548,8 +16500,7 @@
   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'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16600,8 +16551,7 @@
   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'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18169,11 +18119,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18172: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18122: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18176: \$? = $ac_status" >&5
+   echo "$as_me:18126: \$? = $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
@@ -18402,11 +18352,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18405: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18355: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18409: \$? = $ac_status" >&5
+   echo "$as_me:18359: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -18469,11 +18419,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18472: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18422: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18476: \$? = $ac_status" >&5
+   echo "$as_me:18426: \$? = $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
@@ -18820,8 +18770,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18882,8 +18831,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20041,8 +19989,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20145,8 +20092,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20211,8 +20157,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20305,8 +20250,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20371,8 +20315,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20438,8 +20381,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20505,8 +20447,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20581,7 +20522,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 20584 "configure"
+#line 20525 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20679,7 +20620,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 20682 "configure"
+#line 20623 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21984,8 +21925,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22095,8 +22035,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22200,8 +22139,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22315,8 +22253,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22419,8 +22356,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22510,8 +22446,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22572,8 +22507,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22641,8 +22575,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22708,8 +22641,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22802,8 +22734,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22881,8 +22812,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22966,8 +22896,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23035,8 +22964,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23131,8 +23059,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23196,8 +23123,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23292,8 +23218,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23357,8 +23282,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23454,8 +23378,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23519,8 +23442,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23617,8 +23539,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23683,8 +23604,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23752,8 +23672,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23904,8 +23823,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24060,8 +23978,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24126,8 +24043,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24274,8 +24190,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24430,8 +24345,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24523,8 +24437,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24628,8 +24541,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24729,8 +24641,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24804,8 +24715,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24868,8 +24778,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24931,8 +24840,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24972,8 +24880,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25029,8 +24936,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25070,8 +24976,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25135,8 +25040,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25167,10 +25071,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { 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
@@ -25281,8 +25183,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25344,8 +25245,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25385,8 +25285,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25442,8 +25341,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25483,8 +25381,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25548,8 +25445,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25580,10 +25476,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { 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
@@ -25694,8 +25588,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25757,8 +25650,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25798,8 +25690,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25855,8 +25746,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25896,8 +25786,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25961,8 +25850,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25993,10 +25881,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { 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
@@ -26107,8 +25993,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26170,8 +26055,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26211,8 +26095,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26268,8 +26151,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26309,8 +26191,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26374,8 +26255,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26406,10 +26286,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { 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
@@ -26528,8 +26406,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26600,8 +26477,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26671,8 +26547,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26734,8 +26609,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26775,8 +26649,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26832,8 +26705,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26873,8 +26745,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26938,8 +26809,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26970,10 +26840,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { 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
@@ -27085,8 +26953,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27148,8 +27015,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27189,8 +27055,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27246,8 +27111,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27287,8 +27151,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27352,8 +27215,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27384,10 +27246,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { 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
@@ -27498,8 +27358,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27569,8 +27428,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27750,8 +27608,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27860,8 +27717,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28085,8 +27941,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28309,8 +28164,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28386,8 +28240,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28529,8 +28382,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28605,8 +28457,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28666,8 +28517,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28750,8 +28600,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28844,8 +28693,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29019,8 +28867,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29118,8 +28965,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29212,8 +29058,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29296,8 +29141,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29350,7 +29194,7 @@
 do
   for j in jpeglib.h;
   do
-    echo "configure: 29353: $i/$j" >&5
+    echo "configure: 29197: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       jpeg_incdir=$i
@@ -29648,7 +29492,7 @@
 do
   for j in $kde_qt_header;
   do
-    echo "configure: 29651: $i/$j" >&5
+    echo "configure: 29495: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       qt_incdir=$i
@@ -30325,8 +30169,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30485,7 +30328,7 @@
 do
   for j in $kde_check_header;
   do
-    echo "configure: 30488: $i/$j" >&5
+    echo "configure: 30331: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_incdir=$i
@@ -30515,7 +30358,7 @@
 do
   for j in $kde_check_lib;
   do
-    echo "configure: 30518: $i/$j" >&5
+    echo "configure: 30361: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_libdir=$i
@@ -30533,7 +30376,7 @@
 do
   for j in "kde3/plugins/designer/kdewidgets.la";
   do
-    echo "configure: 30536: $i/$j" >&5
+    echo "configure: 30379: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_widgetdir=$i
@@ -32051,7 +31894,7 @@
 do
   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
   do
-    echo "configure: 32054: $i/$j" >&5
+    echo "configure: 31897: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       KDE_XSL_STYLESHEET=$i
@@ -32211,211 +32054,8 @@
 
 
 
-  if test "$GXX" = "yes"; then
 
-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
-kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-
-
-   ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-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 -fvisibility=hidden"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "kde_cv_prog_cxx_$kde_cache=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_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-
-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
- :
-
-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-
-    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
-if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-         ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-
-        safe_CXXFLAGS=$CXXFLAGS
-        safe_LDFLAGS=$LDFLAGS
-        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-        LDFLAGS="$LDFLAGS -shared -fPIC"
-
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-	  #include <string>
-          int some_function( void ) __attribute__ ((visibility("default")));
-          int some_function( void )
-          {
-	    std::string s("blafasel");
-            return 0;
-          }
-
-int
-main ()
-{
-/* elvis is alive */
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  kde_cv_val_gcc_visibility_bug=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-kde_cv_val_gcc_visibility_bug=yes
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
-        CXXFLAGS=$safe_CXXFLAGS
-        LDFLAGS=$safe_LDFLAGS
-        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
-
-
-
-fi
-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
-
-    if test x$kde_cv_val_gcc_visibility_bug = xno; then
-      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-    fi
-
-
-
-        HAVE_GCC_VISIBILITY=1
-
-cat >>confdefs.h <<_ACEOF
-#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
-_ACEOF
-
-
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-  fi
-
-
-
-
-
-
-
 echo "$as_me:$LINENO: checking for atoll" >&5
 echo $ECHO_N "checking for atoll... $ECHO_C" >&6
 if test "${ac_cv_func_atoll+set}" = set; then
@@ -32481,8 +32121,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32579,8 +32218,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32650,8 +32288,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32979,7 +32616,7 @@
   if test "$XML2_CONFIG" = "no" ; then
     no_xml=yes
   else
-    XML_CFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
+    XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
     XML_LIBS=`$XML2_CONFIG $xml_config_args --libs`
     xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
@@ -32988,9 +32625,9 @@
     xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
     if test "x$enable_xmltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
+      ac_save_CPPFLAGS="$CPPFLAGS"
       ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $XML_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
       LIBS="$XML_LIBS $LIBS"
       rm -f conf.xmltest
       if test "$cross_compiling" = yes; then
@@ -33101,7 +32738,7 @@
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-       CFLAGS="$ac_save_CFLAGS"
+       CPPFLAGS="$ac_save_CPPFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
@@ -33138,7 +32775,7 @@
         :
        else
           echo "*** Could not run libxml test program, checking why..."
-          CFLAGS="$CFLAGS $XML_CFLAGS"
+          CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
           LIBS="$LIBS $XML_LIBS"
           cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -33167,8 +32804,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33200,12 +32836,12 @@
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
+          CPPFLAGS="$ac_save_CPPFLAGS"
           LIBS="$ac_save_LIBS"
        fi
      fi
 
-     XML_CFLAGS=""
+     XML_CPPFLAGS=""
      XML_LIBS=""
 
 
@@ -33629,8 +33265,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33776,8 +33411,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33849,8 +33483,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33996,8 +33629,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35174,7 +34806,7 @@
 s, at LIBXML2_FALSE@,$LIBXML2_FALSE,;t t
 s, at XML2_LIBS@,$XML2_LIBS,;t t
 s, at XML2_CONFIG@,$XML2_CONFIG,;t t
-s, at XML_CFLAGS@,$XML_CFLAGS,;t t
+s, at XML_CPPFLAGS@,$XML_CPPFLAGS,;t t
 s, at XML_LIBS@,$XML_LIBS,;t t
 s, at kbanking_dir@,$kbanking_dir,;t t
 s, at kbanking_libs@,$kbanking_libs,;t t
@@ -35362,11 +34994,6 @@
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -35405,6 +35032,12 @@
 	 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
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub


Property changes on: kde-extras/kmymoney2/trunk/configure
___________________________________________________________________
Name: svn:executable
   - 
   + *

Added: kde-extras/kmymoney2/trunk/configure.files
===================================================================
--- kde-extras/kmymoney2/trunk/configure.files	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/configure.files	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,3 @@
+./admin/configure.in.min
+configure.in.in
+configure.in.bot

Modified: kde-extras/kmymoney2/trunk/configure.in
===================================================================
--- kde-extras/kmymoney2/trunk/configure.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/configure.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -67,7 +67,7 @@
 
 dnl PACKAGE set before
 
-KDE_ENABLE_HIDDEN_VISIBILITY
+dnl KDE_ENABLE_HIDDEN_VISIBILITY
 
 dnl
 dnl check for a recent autoconf version

Modified: kde-extras/kmymoney2/trunk/configure.in.in
===================================================================
--- kde-extras/kmymoney2/trunk/configure.in.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/configure.in.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -2,7 +2,7 @@
 
 AM_INIT_AUTOMAKE(kmymoney2,0.8)
 
-KDE_ENABLE_HIDDEN_VISIBILITY
+dnl KDE_ENABLE_HIDDEN_VISIBILITY
 
 dnl
 dnl check for a recent autoconf version

Added: kde-extras/kmymoney2/trunk/debian/changelog
===================================================================
--- kde-extras/kmymoney2/trunk/debian/changelog	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/changelog	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,172 @@
+kmymoney2 (0.8-6) unstable; urgency=low
+
+  * Rebuild for libofx
+    - Can you compile kmymoney2 against libofx2 instead of libofx1c2
+    please ? (Closes: #326937)
+  * fix old-fsf-address-in-copyright-file
+
+ -- Mark Purcell <msp at debian.org>  Tue,  6 Sep 2005 22:13:11 +0100
+
+kmymoney2 (0.8-5) unstable; urgency=low
+
+  * Remove AUTOMAKE=automake1.6 from debian/rules
+
+ -- Mark Purcell <msp at debian.org>  Sun, 21 Aug 2005 21:34:34 +0100
+
+kmymoney2 (0.8-4) unstable; urgency=low
+
+  * Add Build-Depends: libofx-dev
+
+ -- Mark Purcell <msp at debian.org>  Sun, 21 Aug 2005 16:57:04 +0100
+
+kmymoney2 (0.8-3) unstable; urgency=low
+
+  * Lntian cleanup:
+  * Rm config.log
+  * Rm kderemove
+
+ -- Mark Purcell <msp at debian.org>  Fri, 19 Aug 2005 07:44:50 +0100
+
+kmymoney2 (0.8-2) experimental; urgency=low
+
+  * C++ migration
+  * Build-Depends: kdelibs4-dev (>= 4:3.4.2-1)
+
+ -- Mark Purcell <msp at debian.org>  Fri, 19 Aug 2005 07:22:23 +0100
+
+kmymoney2 (0.8-1) experimental; urgency=low
+
+  * New upstream release
+  * Closes: #319314: New upstream version available
+  * Upload to experimental while c++ migration on
+
+ -- Mark Purcell <msp at debian.org>  Sat, 13 Aug 2005 13:13:24 +0100
+
+kmymoney2 (0.7.5-1) experimental; urgency=low
+
+  * New upstream release
+  * New upstream version available (Closes: #319314)
+  * Remove Build-Depends: libofx-dev to upload to experimental
+
+ -- Mark Purcell <msp at debian.org>  Wed, 10 Aug 2005 20:41:38 +0100
+
+kmymoney2 (0.7.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mark Purcell <msp at debian.org>  Wed, 20 Jul 2005 10:24:07 +1000
+
+kmymoney2 (0.7.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mark Purcell <msp at debian.org>  Sat,  9 Jul 2005 08:18:14 +0100
+
+kmymoney2 (0.7.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Add Build-Depends: html2ps
+  * Add Build-Depends: gs-common
+  * debian/rules add dh_makeshlibs
+
+ -- Mark Purcell <msp at debian.org>  Wed,  1 Jun 2005 21:35:30 +0100
+
+kmymoney2 (0.7.0-2) unstable; urgency=low
+
+  * Enable kbanking
+
+ -- Mark Purcell <msp at debian.org>  Sun, 15 May 2005 19:23:32 +0100
+
+kmymoney2 (0.7.0-1) unstable; urgency=low
+
+  * New upstream release
+  * If people would like to see this package in Debian unstable quicker
+    (http://www.kde-apps.org/content/show.php?content=10180)
+    please do one of two things:
+    - Provide me with a sourceforge compatible debian/watch file and/or
+    - File a wishlist bug report at http://bugs.debian.org/kmymoney2
+  * Add Build-Depends: libofx-dev
+  * Closes: #270028: it does not appear in the proper KDE menu section.
+    - Add Categories=Qt;KDE;Office to kmymoney2.destop
+
+ -- Mark Purcell <msp at debian.org>  Sun, 15 May 2005 12:45:18 +0100
+
+kmymoney2 (0.6.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mark Purcell <msp at debian.org>  Thu,  4 Nov 2004 18:14:33 +1100
+
+kmymoney2 (0.6.1-2) unstable; urgency=low
+
+  * configure   --mandir=\$${prefix}/share/man (Closes: Bug#267850)
+
+ -- Mark Purcell <msp at debian.org>  Sat,  4 Sep 2004 20:37:10 +1000
+
+kmymoney2 (0.6.1-0sarge1) testing-proposed-updates; urgency=high
+
+  * Rebuild for sarge (KDE3.2)
+  * configure   --mandir=\$${prefix}/share/man (Closes: Bug#267850)
+  * Remove debian/kmymoney2.1, its included upstream
+  * Remove depends-on-build-essential-package-without-using-version g++
+  * man page doc/en/Makefile.in gzip -9
+
+ -- Mark Purcell <msp at debian.org>  Sat,  4 Sep 2004 19:10:26 +1000
+
+kmymoney2 (0.6.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Closes: #248527: crashes during the loading of a files generated and
+    saved in a previous session.
+  * Closes: #225404: New categories doesn't show up in view
+  * Closes: #256211: New version available upstream
+  * New Maintainer (Closes: Bug#266933)
+
+ -- Mark Purcell <msp at debian.org>  Sat, 21 Aug 2004 12:03:36 +1000
+
+kmymoney2 (0.5.1-4) unstable; urgency=low
+
+  * Test build for ITA
+
+ -- Mark Purcell <msp at debian.org>  Sat, 21 Aug 2004 11:52:14 +1000
+
+kmymoney2 (0.5.1-3) unstable; urgency=low
+
+  * recompiled with newer libxml++ (closes: bug#228732)
+  * Removed automake from build-dependencies
+  * Removed xlibs fix
+  * Put quoted strings in the menu file
+
+ -- Karolina Lindqvist <pgd-karolinali at algonet.se>  Sat, 24 May 2003 22:20:19 +0200
+
+kmymoney2 (0.5.1-2) unstable; urgency=low
+
+  * 0-day NMU.
+  * Applied the patch from the BTS to fix the FTBFS (closes: bug#200365).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 14 Sep 2003 04:14:44 +0200
+
+kmymoney2 (0.5.1-1) unstable; urgency=low
+
+  * Adopted the package (closes: Bug#190069)
+  * New upstream release, (closes: #187050 and #189994)
+  * Fixed rules file for KDE 3.1.1, added pixmap, overrides and man page
+  * Should have build-depend on libxml2-dev and libxml++-dev
+
+ -- Karolina Lindqvist <pgd-karolinali at algonet.se>  Sat, 24 May 2003 22:20:19 +0200
+
+kmymoney2 (0.4rel-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- martin f. krafft <madduck at debian.org>  Sun,  8 Sep 2002 19:12:15 +0200
+
+kmymoney2 (0.4pre2-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Martin F. Krafft <madduck at debian.org>  Tue, 26 Mar 2002 14:47:31 +0100
+
+Local variables:
+mode: debian-changelog
+End:

Added: kde-extras/kmymoney2/trunk/debian/control
===================================================================
--- kde-extras/kmymoney2/trunk/debian/control	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/control	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,22 @@
+Source: kmymoney2
+Section: utils
+Priority: optional
+Maintainer: Mark Purcell <msp at debian.org>
+Build-Depends: debhelper (>> 4.0.0), gawk, gettext, kdelibs4-dev (>= 4:3.4.2-1), libxml2-dev (>= 2.0), libxml++-dev, libqt3-compat-headers, automake1.9 | automake, html2ps, gs-common, libofx-dev
+Standards-Version: 3.5.8.0
+
+Package: kmymoney2
+Architecture: any
+Depends: ${shlibs:Depends}, ${shlibs:Misc}
+Description: Personal finance manager for KDE
+ KMyMoney2 is specifically aimed at the typical home user at present. The
+ current version, provides the basis for manipulating accounts that contain
+ transactions. Each account belongs to an institution and can be reconciled to
+ balance your transactions.
+ .
+ Quicken QIF import and export is supported within accounts so KMyMoney2 can
+ read files exported from other programs and when downloaded from online
+ banking institutions.
+ .
+ KMyMoney2 is still under development, so a lot of cool features are yet to
+ come. It's quite usable already, nevertheless.

Added: kde-extras/kmymoney2/trunk/debian/copyright
===================================================================
--- kde-extras/kmymoney2/trunk/debian/copyright	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/copyright	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,31 @@
+This package was debianized by Martin F. Krafft <madduck at madduck.net> on
+Tue, 26 Mar 2002 14:47:31 +0100.
+
+It was downloaded from http://prdownloads.sourceforge.net/kmymoney2
+
+Upstream Authors:
+  Michael Edwardes <mte at users.sourceforge.net>.
+  Javier Campos Morales <javi_c at users.sourceforge.net>
+  Felix Rodriguez <frodriguez at users.sourceforge.net>
+  John C <thetacoturtle at users.sourceforge.net>
+  Thomas Baumgart <ipwizard at users.sourceforge.net>
+  Arni Ingimundarson <arniing at users.sourceforge.net>
+
+Copyright:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.

Added: kde-extras/kmymoney2/trunk/debian/dirs
===================================================================
--- kde-extras/kmymoney2/trunk/debian/dirs	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/dirs	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/doc/kde

Added: kde-extras/kmymoney2/trunk/debian/docs
===================================================================
--- kde-extras/kmymoney2/trunk/debian/docs	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/docs	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,2 @@
+TODO
+README.Fileformats

Added: kde-extras/kmymoney2/trunk/debian/kmymoney2.xpm
===================================================================
--- kde-extras/kmymoney2/trunk/debian/kmymoney2.xpm	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/kmymoney2.xpm	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,48 @@
+/* XPM */
+static char * kmymoney2_kmymoney2_xpm[] = {
+"32 32 13 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #007f00",
+"@	c #E5E5E5",
+"#	c #CCCCCC",
+"$	c #B2B2B2",
+"%	c #666667",
+"&	c #333333",
+"*	c #7F7F7F",
+"=	c #999999",
+"-	c #000000",
+";	c #4C4C4C",
+">	c #191919",
+"      **%%%%%%%%;;;;&-          ",
+"      %##########$$==;-         ",
+"      *#..........@@@;*-        ",
+"      %#...........@@;#*-       ",
+"      %#.............;.#*-      ",
+"      %#....======...%..#*-     ",
+"      %#....======...%@..#*-    ",
+"      %#.............%#@..#*-   ",
+"      %#....====.....%;;;;;&&-  ",
+"    = %#.=@........$$@@@$=*%%-  ",
+"   =;%#@=&*.......$+>@.@@#$=%-  ",
+"   $%#$#@%$.......$+&@.@@@@$=-  ",
+"      %#....===*+++++++;$@##$-  ",
+"      %#.....$+++++++++;%@@@$-  ",
+"      %#....*++++++%+++&%@@@$-  ",
+"      %#....++++;$+-@@$%@@@@$-  ",
+"      %#....++++&++&===*=@@@$-  ",
+"      %#....+++++++%%*@@@@@@$-  ",
+"      %#....=+++++++++&=@@@@$-  ",
+"      %#.....@@$+++++++>@@@#$-  ",
+"    = %#.=@.. at .@++&++++-@@@@$-  ",
+"   =;%#@=;*+&;*=+;;++++>*@@#$-  ",
+"   $%#$#@%$+++++++++++&=*#@@$-  ",
+"      %#..$++++++++++&%**@##$-  ",
+"      %#..@$+++++++%*$@#*###$&  ",
+"      %#.@@.*=*+%&*******###$&  ",
+"      %#@@@@*@$+&*@@@@##*###$&  ",
+"      ;#.@@@==*+&%*******###$&  ",
+"      %#@@@@@@#$*@@@#######$$&  ",
+"      ;#@@@@@@@@@@#@########$&  ",
+"      &#$$$$$$$$$$$$$$$$$$$$$&  ",
+"      >&&&&&&&&&&&&&&&&>&&>&&>  "};

Added: kde-extras/kmymoney2/trunk/debian/menu
===================================================================
--- kde-extras/kmymoney2/trunk/debian/menu	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/menu	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,7 @@
+?package(kmymoney2):\
+  needs="x11"\
+  section="Apps/Tools"\
+  hints="KDE"\
+  title="KMyMoney"\
+  icon="/usr/share/pixmaps/kmymoney2.xpm"\
+  command="/usr/bin/kmymoney2"

Added: kde-extras/kmymoney2/trunk/debian/override
===================================================================
--- kde-extras/kmymoney2/trunk/debian/override	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/override	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1 @@
+kmymoney2: menu-item-contains-unknown-tag kderemove /usr/lib/menu/kmymoney2:8

Added: kde-extras/kmymoney2/trunk/debian/rules
===================================================================
--- kde-extras/kmymoney2/trunk/debian/rules	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/rules	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,118 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+
+export kde_htmldir="\$${prefix}/share/doc/kde/HTML"
+
+INSTALL_DIR=install -p -d -o root -g root -m 755
+INSTALL_FILE=install -p -o root -g root -m 644
+
+lintian_overrides=$(CURDIR)/debian/kmymoney2/usr/share/lintian/overrides
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+#export kde_htmldir=/usr/share/doc/kde/HTML
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3 \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+#		--enable-kbanking \
+		--enable-ofxbanking \
+		--enable-ofxplugin \
+		--enable-pdf-docs \
+		--disable-rpath 
+
+	# Without the following line, it won't build cleanly.
+	$(MAKE) clean
+
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean: debian-clean
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	test -f Makefile && $(MAKE) distclean || true
+	#rm -fR po/*.gmo
+	# Cleanup what make clean doesn't
+	rm -fR kmymoney config.log
+
+
+debian-clean:
+	dh_testdir
+	dh_testroot
+	dh_clean
+	-rm -fr debian/install-tmp debian/files
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Install debian lintian override
+	$(INSTALL_DIR) $(lintian_overrides)
+	$(INSTALL_FILE) debian/override $(lintian_overrides)/kmymoney2
+
+	# Install pixmap
+	$(INSTALL_DIR) $(CURDIR)/debian/kmymoney2/usr/share/pixmaps
+	$(INSTALL_FILE) debian/kmymoney2.xpm $(CURDIR)/debian/kmymoney2/usr/share/pixmaps
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/kmymoney2
+	rm -f $(CURDIR)/debian/kmymoney2/usr/bin/kmymoney
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	#dh_installexamples
+	dh_installmenu
+	dh_installman
+	#dh_installinfo
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_strip
+	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure


Property changes on: kde-extras/kmymoney2/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: kde-extras/kmymoney2/trunk/debian/watch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/watch	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/debian/watch	2005-10-02 14:29:39 UTC (rev 1903)
@@ -0,0 +1,11 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# Site		Directory		Pattern			Version	Script
+version=2
+#http://ftp.gnu.org/gnu/bayonne/bayonne-(.*)\.tar\.gz        debian  uupdate
+#http://umn.dl.sourceforge.net/sourceforge/bayonne/bayonne-(1.2.*)\.tar\.gz	debian	uupdate
+
+http://prdownloads.sourceforge.net/kmymoney2/ (?:.*/)?kmymoney2-?_?(1[\w+\d+\.]+|\d+)(\.tar|\.tgz)(\.gz|\.bz2|) debian false
+ftp://ftp2.sf.net/pub/sourceforge/k/km/kmymoney2-?_?(1[\w+\d+\.]+|\d+)(\.tar|\.tgz)(\.gz|\.bz2|) debian false
+

Modified: kde-extras/kmymoney2/trunk/developer-doc/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/developer-doc/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/developer-doc/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -227,7 +227,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -347,9 +347,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  developer-doc/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  developer-doc/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  developer-doc/Makefile
+#>- 	  $(AUTOMAKE) --foreign  developer-doc/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -359,9 +359,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  developer-doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  developer-doc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  developer-doc/Makefile
+	  $(AUTOMAKE) --foreign  developer-doc/Makefile
 	cd $(top_srcdir) && perl admin/am_edit developer-doc/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -464,14 +464,16 @@
 		$(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; \
@@ -481,9 +483,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)
@@ -661,9 +665,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  developer-doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  developer-doc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  developer-doc/Makefile
+	  $(AUTOMAKE) --foreign  developer-doc/Makefile
 	cd $(top_srcdir) && perl admin/am_edit developer-doc/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/developer-doc/phb/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/developer-doc/phb/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/developer-doc/phb/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -211,7 +211,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  developer-doc/phb/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  developer-doc/phb/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  developer-doc/phb/Makefile
+#>- 	  $(AUTOMAKE) --foreign  developer-doc/phb/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  developer-doc/phb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  developer-doc/phb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  developer-doc/phb/Makefile
+	  $(AUTOMAKE) --foreign  developer-doc/phb/Makefile
 	cd $(top_srcdir) && perl admin/am_edit developer-doc/phb/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -555,9 +555,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  developer-doc/phb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  developer-doc/phb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  developer-doc/phb/Makefile
+	  $(AUTOMAKE) --foreign  developer-doc/phb/Makefile
 	cd $(top_srcdir) && perl admin/am_edit developer-doc/phb/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/doc/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/doc/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/doc/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -231,7 +231,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -347,9 +347,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  doc/Makefile
+#>- 	  $(AUTOMAKE) --foreign  doc/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -359,9 +359,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
+	  $(AUTOMAKE) --foreign  doc/Makefile
 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -464,14 +464,16 @@
 		$(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; \
@@ -481,9 +483,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)
@@ -664,9 +668,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
+	  $(AUTOMAKE) --foreign  doc/Makefile
 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/doc/en/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/doc/en/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/doc/en/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -211,7 +211,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -338,9 +338,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/en/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/en/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  doc/en/Makefile
+#>- 	  $(AUTOMAKE) --foreign  doc/en/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -350,9 +350,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/en/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/en/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/en/Makefile
+	  $(AUTOMAKE) --foreign  doc/en/Makefile
 	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -645,9 +645,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/en/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/en/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/en/Makefile
+	  $(AUTOMAKE) --foreign  doc/en/Makefile
 	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -331,7 +331,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -490,9 +490,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -502,9 +502,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -718,14 +718,16 @@
 		$(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; \
@@ -735,9 +737,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)
@@ -816,20 +820,20 @@
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
 	    skipped="($$skip tests were not run)"; \
-	    test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
 	  report=""; \
 	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$report"; \
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
-	  test -n "$$skipped" && echo "$$skipped"; \
-	  test -n "$$report" && echo "$$report"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
 	  echo "$$dashes"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
@@ -1144,9 +1148,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/Makefile.in
 
 
@@ -1173,7 +1177,7 @@
 
 
 #>+ 11
-kmymoney2.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmymoneyutils.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/kmymoney2.cpp $(srcdir)/main.cpp $(srcdir)/kmymoney2_stub.cpp $(srcdir)/kmymoney2_skel.cpp  kstartuplogo.moc kmymoney2.moc
+kmymoney2.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmymoneyutils.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/kmymoney2.cpp $(srcdir)/main.cpp kmymoney2_stub.cpp kmymoney2_skel.cpp  kstartuplogo.moc kmymoney2.moc
 	@echo 'creating kmymoney2.all_cpp.cpp ...'; \
 	rm -f kmymoney2.all_cpp.files kmymoney2.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kmymoney2.all_cpp.final; \

Modified: kde-extras/kmymoney2/trunk/kmymoney2/converter/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/converter/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/converter/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -52,8 +52,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libconverter_a_AR = $(AR) $(ARFLAGS)
 libconverter_a_LIBADD =
 am_libconverter_a_OBJECTS = mymoneyqifreader.$(OBJEXT) \
@@ -295,7 +295,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -420,9 +420,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/converter/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/converter/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/converter/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/converter/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -432,9 +432,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/converter/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/converter/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/converter/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/converter/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/converter/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -538,9 +538,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -744,9 +746,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/converter/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/converter/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/converter/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/converter/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/converter/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/dialogs/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/dialogs/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/dialogs/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -54,8 +54,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libdialogs_a_AR = $(AR) $(ARFLAGS)
 libdialogs_a_LIBADD =
 am_libdialogs_a_OBJECTS = kreportconfigurationfilterdlg.$(OBJEXT) \
@@ -424,7 +424,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -553,9 +553,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/dialogs/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/dialogs/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/dialogs/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/dialogs/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -565,9 +565,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/dialogs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/dialogs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/dialogs/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/dialogs/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/dialogs/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -695,9 +695,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -1174,9 +1176,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/dialogs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/dialogs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/dialogs/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/dialogs/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/dialogs/Makefile.in
 
 
@@ -1203,7 +1205,7 @@
 
 
 #>+ 11
-libdialogs_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kreportconfigurationfilterdlg.cpp $(srcdir)/kcurrencycalculator.cpp $(srcdir)/kcurrencyeditdlg.cpp $(srcdir)/keditequityentrydlg.cpp $(srcdir)/keditloanwizard.cpp $(srcdir)/knewloanwizard.cpp $(srcdir)/kenterscheduledialog.cpp $(srcdir)/krecentfileitem.cpp $(srcdir)/ieditscheduledialog.cpp $(srcdir)/kimportverifydlg.cpp $(srcdir)/mymoneyqifprofileeditor.cpp $(srcdir)/kaccountselectdlg.cpp $(srcdir)/knewaccountwizard.cpp $(srcdir)/kupdatestockpricedlg.cpp $(srcdir)/knewequityentrydlg.cpp $(srcdir)/kreconcilelistitem.cpp $(srcdir)/kstartdlg.cpp $(srcdir)/ksettingsdlg.cpp $(srcdir)/kreconciledlg.cpp $(srcdir)/knewfiledlg.cpp $(srcdir)/knewbankdlg.cpp $(srcdir)/knewaccountdlg.cpp $(srcdir)/kfindtransactiondlg.cpp $(srcdir)/kendingbalancedlg.cpp $(srcdir)/ksplittransactiondlg.cpp $(srcdir)/kimportdlg.cpp $(srcdir)/kexportdlg.cpp $(srcdir)/kcsvprogressdlg.cpp $(srcdir)/kchooseimportexportdlg.cpp $(srcdir)/kbackupdlg.cpp $(srcdir)/kequitypriceupdatedlg.cpp $(srcdir)/kadvancedbanksettingsdlg.cpp $(srcdir)/kofxdirectconnectdlg.cpp $(srcdir)/mymoneyofxconnector.cpp $(srcdir)/kmymoneypricedlg.cpp $(srcdir)/knewinvestmentwizard.cpp $(srcdir)/ksecuritylisteditor.cpp $(srcdir)/kgncimportoptionsdlg.cpp $(srcdir)/konlinequoteconfigurationdlg.cpp $(srcdir)/kgncpricesourcedlg.cpp $(srcdir)/kaccountselectdlgdecl.cpp $(srcdir)/kadvancedbanksettingsdlgdecl.cpp $(srcdir)/kbackupdlgdecl.cpp $(srcdir)/kchooseimportexportdlgdecl.cpp $(srcdir)/kconfirmmanualenterdialog.cpp $(srcdir)/kcsvprogressdlgdecl.cpp $(srcdir)/kcurrencycalculatordecl.cpp $(srcdir)/kcurrencyeditdlgdecl.cpp $(srcdir)/keditequityentrydecl.cpp $(srcdir)/keditschedtransdlgdecl.cpp $(srcdir)/kendingbalancedlgdecl.cpp $(srcdir)/kenterscheduledialogdecl.cpp $(srcdir)/kequitypriceupdatedlgdecl.cpp $(srcdir)/kexportdlgdecl.cpp $(srcdir)/kfindtransactiondlgdecl.cpp $(srcdir)/kgncimportoptionsdlgdecl.cpp $(srcdir)/kimportdlgdecl.cpp $(srcdir)/kimportverifydlgdecl.cpp $(srcdir)/kmymoneypricedlgdecl.cpp $(srcdir)/knewaccountdlgdecl.cpp $(srcdir)/knewaccountwizarddecl.cpp $(srcdir)/knewbankdlgdecl.cpp $(srcdir)/knewequityentrydecl.cpp $(srcdir)/knewfiledlgdecl.cpp $(srcdir)/knewinvestmentwizarddecl.cpp $(srcdir)/knewloanwizarddecl.cpp $(srcdir)/kofxdirectconnectdlgdecl.cpp $(srcdir)/konlinequoteconfigurationdecl.cpp $(srcdir)/kreconciledlgdecl.cpp $(srcdir)/ksecuritylisteditordecl.cpp $(srcdir)/ksplitcorrectiondlg.cpp $(srcdir)/ksplittransactiondlgdecl.cpp $(srcdir)/kupdatestockpricedlgdecl.cpp $(srcdir)/mymoneyqifprofileeditordecl.cpp $(srcdir)/kgncpricesourcedlgdecl.cpp  kgncpricesourcedlg.moc kexportdlgdecl.moc kstartdlg.moc kcurrencycalculator.moc kimportverifydlgdecl.moc kendingbalancedlg.moc kbackupdlg.moc kaccountselectdlg.moc kimportverifydlg.moc knewaccountwizard.moc kreconciledlgdecl.moc knewbankdlgdecl.moc knewaccountdlgdecl.moc kfindtransactiondlgdecl.moc kmymoneypricedlg.moc knewequityentrydlg.moc ieditscheduledialog.moc kadvancedbanksettingsdlgdecl.moc knewloanwizard.moc mymoneyqifprofileeditordecl.moc kcsvprogressdlg.moc kimportdlg.moc kreportconfigurationfilterdlg.moc keditloanwizard.moc keditequityentrydecl.moc knewinvestmentwizarddecl.moc konlinequoteconfigurationdecl.moc ksplittransactiondlg.moc kaccountselectdlgdecl.moc kenterscheduledialog.moc kequitypriceupdatedlgdecl.moc knewfiledlg.moc kconfirmmanualenterdialog.moc kreconciledlg.moc konlinequoteconfigurationdlg.moc kmymoneypricedlgdecl.moc kbackupdlgdecl.moc kgncpricesourcedlgdecl.moc kenterscheduledialogdecl.moc kcurrencyeditdlgdecl.moc kofxdirectconnectdlgdecl.moc kupdatestockpricedlg.moc ksplittransactiondlgdecl.moc kupdatestockpricedlgdecl.moc ksecuritylisteditordecl.moc kequitypriceupdatedlg.moc kofxdirectconnectdlg.moc knewloanwizarddecl.moc keditequityentrydlg.moc ksplitcorrectiondlg.moc mymoneyqifprofileeditor.moc kadvancedbanksettingsdlg.moc kexportdlg.moc knewaccountwizarddecl.moc ksecuritylisteditor.moc kreconcilelistitem.moc knewequityentrydecl.moc kimportdlgdecl.moc kcsvprogressdlgdecl.moc knewinvestmentwizard.moc kgncimportoptionsdlg.moc kcurrencycalculatordecl.moc kcurrencyeditdlg.moc kchooseimportexportdlgdecl.moc knewaccountdlg.moc kchooseimportexportdlg.moc kgncimportoptionsdlgdecl.moc knewbankdlg.moc keditschedtransdlgdecl.moc ksettingsdlg.moc knewfiledlgdecl.moc kendingbalancedlgdecl.moc kfindtransactiondlg.moc
+libdialogs_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kreportconfigurationfilterdlg.cpp $(srcdir)/kcurrencycalculator.cpp $(srcdir)/kcurrencyeditdlg.cpp $(srcdir)/keditequityentrydlg.cpp $(srcdir)/keditloanwizard.cpp $(srcdir)/knewloanwizard.cpp $(srcdir)/kenterscheduledialog.cpp $(srcdir)/krecentfileitem.cpp $(srcdir)/ieditscheduledialog.cpp $(srcdir)/kimportverifydlg.cpp $(srcdir)/mymoneyqifprofileeditor.cpp $(srcdir)/kaccountselectdlg.cpp $(srcdir)/knewaccountwizard.cpp $(srcdir)/kupdatestockpricedlg.cpp $(srcdir)/knewequityentrydlg.cpp $(srcdir)/kreconcilelistitem.cpp $(srcdir)/kstartdlg.cpp $(srcdir)/ksettingsdlg.cpp $(srcdir)/kreconciledlg.cpp $(srcdir)/knewfiledlg.cpp $(srcdir)/knewbankdlg.cpp $(srcdir)/knewaccountdlg.cpp $(srcdir)/kfindtransactiondlg.cpp $(srcdir)/kendingbalancedlg.cpp $(srcdir)/ksplittransactiondlg.cpp $(srcdir)/kimportdlg.cpp $(srcdir)/kexportdlg.cpp $(srcdir)/kcsvprogressdlg.cpp $(srcdir)/kchooseimportexportdlg.cpp $(srcdir)/kbackupdlg.cpp $(srcdir)/kequitypriceupdatedlg.cpp $(srcdir)/kadvancedbanksettingsdlg.cpp $(srcdir)/kofxdirectconnectdlg.cpp $(srcdir)/mymoneyofxconnector.cpp $(srcdir)/kmymoneypricedlg.cpp $(srcdir)/knewinvestmentwizard.cpp $(srcdir)/ksecuritylisteditor.cpp $(srcdir)/kgncimportoptionsdlg.cpp $(srcdir)/konlinequoteconfigurationdlg.cpp $(srcdir)/kgncpricesourcedlg.cpp kaccountselectdlgdecl.cpp kadvancedbanksettingsdlgdecl.cpp kbackupdlgdecl.cpp kchooseimportexportdlgdecl.cpp kconfirmmanualenterdialog.cpp kcsvprogressdlgdecl.cpp kcurrencycalculatordecl.cpp kcurrencyeditdlgdecl.cpp keditequityentrydecl.cpp keditschedtransdlgdecl.cpp kendingbalancedlgdecl.cpp kenterscheduledialogdecl.cpp kequitypriceupdatedlgdecl.cpp kexportdlgdecl.cpp kfindtransactiondlgdecl.cpp kgncimportoptionsdlgdecl.cpp kimportdlgdecl.cpp kimportverifydlgdecl.cpp kmymoneypricedlgdecl.cpp knewaccountdlgdecl.cpp knewaccountwizarddecl.cpp knewbankdlgdecl.cpp knewequityentrydecl.cpp knewfiledlgdecl.cpp knewinvestmentwizarddecl.cpp knewloanwizarddecl.cpp kofxdirectconnectdlgdecl.cpp konlinequoteconfigurationdecl.cpp kreconciledlgdecl.cpp ksecuritylisteditordecl.cpp ksplitcorrectiondlg.cpp ksplittransactiondlgdecl.cpp kupdatestockpricedlgdecl.cpp mymoneyqifprofileeditordecl.cpp kgncpricesourcedlgdecl.cpp  kgncpricesourcedlg.moc kexportdlgdecl.moc kstartdlg.moc kcurrencycalculator.moc kimportverifydlgdecl.moc kendingbalancedlg.moc kbackupdlg.moc kaccountselectdlg.moc kimportverifydlg.moc knewaccountwizard.moc kreconciledlgdecl.moc knewbankdlgdecl.moc knewaccountdlgdecl.moc kfindtransactiondlgdecl.moc kmymoneypricedlg.moc knewequityentrydlg.moc ieditscheduledialog.moc kadvancedbanksettingsdlgdecl.moc knewloanwizard.moc mymoneyqifprofileeditordecl.moc kcsvprogressdlg.moc kimportdlg.moc kreportconfigurationfilterdlg.moc keditloanwizard.moc keditequityentrydecl.moc knewinvestmentwizarddecl.moc konlinequoteconfigurationdecl.moc ksplittransactiondlg.moc kaccountselectdlgdecl.moc kenterscheduledialog.moc kequitypriceupdatedlgdecl.moc knewfiledlg.moc kconfirmmanualenterdialog.moc kreconciledlg.moc konlinequoteconfigurationdlg.moc kmymoneypricedlgdecl.moc kbackupdlgdecl.moc kgncpricesourcedlgdecl.moc kenterscheduledialogdecl.moc kcurrencyeditdlgdecl.moc kofxdirectconnectdlgdecl.moc kupdatestockpricedlg.moc ksplittransactiondlgdecl.moc kupdatestockpricedlgdecl.moc ksecuritylisteditordecl.moc kequitypriceupdatedlg.moc kofxdirectconnectdlg.moc knewloanwizarddecl.moc keditequityentrydlg.moc ksplitcorrectiondlg.moc mymoneyqifprofileeditor.moc kadvancedbanksettingsdlg.moc kexportdlg.moc knewaccountwizarddecl.moc ksecuritylisteditor.moc kreconcilelistitem.moc knewequityentrydecl.moc kimportdlgdecl.moc kcsvprogressdlgdecl.moc knewinvestmentwizard.moc kgncimportoptionsdlg.moc kcurrencycalculatordecl.moc kcurrencyeditdlg.moc kchooseimportexportdlgdecl.moc knewaccountdlg.moc kchooseimportexportdlg.moc kgncimportoptionsdlgdecl.moc knewbankdlg.moc keditschedtransdlgdecl.moc ksettingsdlg.moc knewfiledlgdecl.moc kendingbalancedlgdecl.moc kfindtransactiondlg.moc
 	@echo 'creating libdialogs_a.all_cpp.cpp ...'; \
 	rm -f libdialogs_a.all_cpp.files libdialogs_a.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libdialogs_a.all_cpp.final; \

Modified: kde-extras/kmymoney2/trunk/kmymoney2/html/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/html/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/html/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -227,7 +227,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -348,9 +348,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/html/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/html/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/html/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/html/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -360,9 +360,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/html/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/html/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/html/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/html/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/html/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -465,14 +465,16 @@
 		$(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; \
@@ -482,9 +484,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)
@@ -672,9 +676,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/html/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/html/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/html/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/html/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/html/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/html/images/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/html/images/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/html/images/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -213,7 +213,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -331,9 +331,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/html/images/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/html/images/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/html/images/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/html/images/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -343,9 +343,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/html/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/html/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/html/images/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/html/images/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/html/images/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -526,9 +526,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/html/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/html/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/html/images/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/html/images/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/html/images/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -229,7 +229,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -346,9 +346,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -358,9 +358,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -463,14 +463,16 @@
 		$(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; \
@@ -480,9 +482,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)
@@ -666,9 +670,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/16x16/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/16x16/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/16x16/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -229,7 +229,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -346,9 +346,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -358,9 +358,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/16x16/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -463,14 +463,16 @@
 		$(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; \
@@ -480,9 +482,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)
@@ -666,9 +670,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/16x16/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/16x16/actions/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/16x16/actions/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/16x16/actions/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -213,7 +213,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -330,9 +330,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/actions/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/actions/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/actions/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/actions/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -342,9 +342,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/actions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/actions/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/actions/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/actions/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/16x16/actions/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -526,9 +526,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/actions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/actions/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/16x16/actions/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/16x16/actions/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/16x16/actions/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/22x22/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/22x22/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/22x22/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -229,7 +229,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -346,9 +346,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -358,9 +358,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/22x22/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -463,14 +463,16 @@
 		$(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; \
@@ -480,9 +482,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)
@@ -666,9 +670,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/22x22/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/22x22/actions/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/22x22/actions/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/22x22/actions/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -213,7 +213,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -330,9 +330,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/actions/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/actions/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/actions/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/actions/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -342,9 +342,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/actions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/actions/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/actions/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/actions/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/22x22/actions/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -526,9 +526,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/actions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/actions/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/22x22/actions/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/22x22/actions/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/22x22/actions/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/32x32/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/32x32/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/32x32/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -229,7 +229,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -346,9 +346,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -358,9 +358,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/32x32/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -463,14 +463,16 @@
 		$(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; \
@@ -480,9 +482,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)
@@ -666,9 +670,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/32x32/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/32x32/apps/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/32x32/apps/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/32x32/apps/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -213,7 +213,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -330,9 +330,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/apps/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/apps/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/apps/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/apps/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -342,9 +342,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/apps/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/apps/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/apps/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/apps/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/32x32/apps/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -526,9 +526,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/apps/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/apps/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/32x32/apps/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/32x32/apps/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/32x32/apps/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/48x48/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/48x48/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/48x48/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -229,7 +229,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -346,9 +346,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -358,9 +358,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/48x48/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -463,14 +463,16 @@
 		$(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; \
@@ -480,9 +482,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)
@@ -666,9 +670,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/48x48/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/48x48/apps/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/48x48/apps/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/48x48/apps/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -213,7 +213,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -330,9 +330,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/apps/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/apps/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/apps/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/apps/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -342,9 +342,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/apps/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/apps/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/apps/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/apps/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/48x48/apps/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -526,9 +526,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/apps/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/apps/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/48x48/apps/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/48x48/apps/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/48x48/apps/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/64x64/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/64x64/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/64x64/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -229,7 +229,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -346,9 +346,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -358,9 +358,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/64x64/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -463,14 +463,16 @@
 		$(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; \
@@ -480,9 +482,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)
@@ -666,9 +670,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/64x64/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/64x64/apps/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/64x64/apps/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/64x64/apps/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -213,7 +213,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -330,9 +330,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/apps/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/apps/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/apps/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/apps/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -342,9 +342,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/apps/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/apps/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/apps/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/apps/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/64x64/apps/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -526,9 +526,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/apps/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/apps/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/64x64/apps/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/64x64/apps/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/64x64/apps/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/icons/hicolor/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -229,7 +229,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -346,9 +346,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -358,9 +358,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -463,14 +463,16 @@
 		$(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; \
@@ -480,9 +482,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)
@@ -666,9 +670,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/icons/hicolor/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/icons/hicolor/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/icons/hicolor/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/kmymoney2.desktop
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/kmymoney2.desktop	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/kmymoney2.desktop	2005-10-02 14:29:39 UTC (rev 1903)
@@ -11,4 +11,4 @@
 Icon=kmymoney2
 MiniIcon=kmymoney2
 ServiceTypes=
-Categories=Office;Finance
+Categories=Qt;KDE;Office;Finance

Modified: kde-extras/kmymoney2/trunk/kmymoney2/mymoney/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/mymoney/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/mymoney/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -417,7 +417,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -571,9 +571,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/mymoney/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/mymoney/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/mymoney/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/mymoney/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -583,9 +583,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/mymoney/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/mymoney/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/mymoney/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/mymoney/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/mymoney/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -634,7 +634,7 @@
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -804,14 +804,16 @@
 		$(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; \
@@ -821,9 +823,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)
@@ -1012,9 +1016,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/mymoney/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/mymoney/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/mymoney/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/mymoney/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/mymoney/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/mymoney/storage/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/mymoney/storage/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/mymoney/storage/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -52,8 +52,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libstorage_a_AR = $(AR) $(ARFLAGS)
 libstorage_a_LIBADD =
 am_libstorage_a_OBJECTS = imymoneystorageformat.$(OBJEXT) \
@@ -307,7 +307,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -433,9 +433,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/mymoney/storage/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/mymoney/storage/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/mymoney/storage/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/mymoney/storage/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -445,9 +445,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/mymoney/storage/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/mymoney/storage/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/mymoney/storage/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/mymoney/storage/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/mymoney/storage/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -569,9 +569,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -740,9 +742,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/mymoney/storage/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/mymoney/storage/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/mymoney/storage/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/mymoney/storage/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/mymoney/storage/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/pics/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/pics/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/pics/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -334,9 +334,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/pics/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/pics/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/pics/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/pics/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -346,9 +346,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/pics/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/pics/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/pics/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/pics/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/pics/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -540,9 +540,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/pics/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/pics/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/pics/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/pics/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/pics/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/plugins/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/plugins/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/plugins/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -280,7 +280,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -418,9 +418,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/plugins/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/plugins/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -430,9 +430,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/plugins/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/plugins/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/plugins/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -474,7 +474,7 @@
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -632,14 +632,16 @@
 		$(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; \
@@ -649,9 +651,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)
@@ -870,9 +874,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/plugins/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/plugins/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/plugins/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/plugins/interfaces/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/plugins/interfaces/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/plugins/interfaces/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -52,8 +52,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libinterfaces_a_AR = $(AR) $(ARFLAGS)
 libinterfaces_a_LIBADD =
 am_libinterfaces_a_OBJECTS = kmmviewinterface.$(OBJEXT) \
@@ -274,7 +274,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -397,9 +397,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/interfaces/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/interfaces/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/plugins/interfaces/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/plugins/interfaces/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -409,9 +409,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/interfaces/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/interfaces/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/plugins/interfaces/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/plugins/interfaces/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/plugins/interfaces/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -554,14 +554,16 @@
 		$(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; \
@@ -571,9 +573,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -773,9 +777,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/interfaces/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/interfaces/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/plugins/interfaces/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/plugins/interfaces/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/plugins/interfaces/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/plugins/kbanking/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/plugins/kbanking/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/plugins/kbanking/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -256,7 +256,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -398,9 +398,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/kbanking/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/kbanking/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/plugins/kbanking/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/plugins/kbanking/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -410,9 +410,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/kbanking/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/kbanking/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/plugins/kbanking/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/plugins/kbanking/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/plugins/kbanking/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -454,7 +454,7 @@
 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -560,9 +560,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -763,9 +765,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/kbanking/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/kbanking/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/plugins/kbanking/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/plugins/kbanking/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/plugins/kbanking/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/plugins/ofximport/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/plugins/ofximport/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/plugins/ofximport/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -256,7 +256,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -394,9 +394,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/ofximport/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/ofximport/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/plugins/ofximport/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/plugins/ofximport/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -406,9 +406,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/ofximport/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/ofximport/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/plugins/ofximport/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/plugins/ofximport/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/plugins/ofximport/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -450,7 +450,7 @@
 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -539,9 +539,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -741,9 +743,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/plugins/ofximport/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/plugins/ofximport/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/plugins/ofximport/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/plugins/ofximport/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/plugins/ofximport/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/reports/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/reports/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/reports/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -52,8 +52,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libreports_a_AR = $(AR) $(ARFLAGS)
 libreports_a_LIBADD =
 am_libreports_a_OBJECTS = pivottable.$(OBJEXT) querytable.$(OBJEXT) \
@@ -289,7 +289,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -413,9 +413,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/reports/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/reports/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/reports/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/reports/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -425,9 +425,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/reports/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/reports/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/reports/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/reports/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/reports/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -528,9 +528,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -695,9 +697,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/reports/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/reports/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/reports/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/reports/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/reports/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/templates/C/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/templates/C/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/templates/C/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/C/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/C/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/templates/C/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/templates/C/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/C/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/C/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/C/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/C/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/C/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -541,9 +541,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/C/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/C/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/C/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/C/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/C/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/templates/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/templates/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/templates/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -233,7 +233,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -352,9 +352,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/templates/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/templates/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -364,9 +364,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -486,14 +486,16 @@
 		$(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; \
@@ -503,9 +505,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -688,9 +692,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/templates/de_DE/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/templates/de_DE/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/templates/de_DE/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/de_DE/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/de_DE/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/templates/de_DE/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/templates/de_DE/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/de_DE/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/de_DE/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/de_DE/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/de_DE/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/de_DE/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -541,9 +541,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/de_DE/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/de_DE/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/de_DE/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/de_DE/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/de_DE/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/templates/en_GB/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/templates/en_GB/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/templates/en_GB/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/en_GB/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/en_GB/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/templates/en_GB/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/templates/en_GB/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/en_GB/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/en_GB/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/en_GB/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/en_GB/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/en_GB/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -541,9 +541,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/en_GB/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/en_GB/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/en_GB/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/en_GB/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/en_GB/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/templates/en_US/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/templates/en_US/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/templates/en_US/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/en_US/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/en_US/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/templates/en_US/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/templates/en_US/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/en_US/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/en_US/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/en_US/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/en_US/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/en_US/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -541,9 +541,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/en_US/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/en_US/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/en_US/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/en_US/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/en_US/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/templates/fr_FR/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/templates/fr_FR/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/templates/fr_FR/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/fr_FR/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/fr_FR/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/templates/fr_FR/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/templates/fr_FR/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/fr_FR/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/fr_FR/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/fr_FR/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/fr_FR/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/fr_FR/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -541,9 +541,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/fr_FR/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/fr_FR/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/fr_FR/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/fr_FR/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/fr_FR/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/templates/gl_ES/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/templates/gl_ES/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/templates/gl_ES/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/gl_ES/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/gl_ES/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/templates/gl_ES/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/templates/gl_ES/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/gl_ES/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/gl_ES/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/gl_ES/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/gl_ES/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/gl_ES/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -541,9 +541,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/gl_ES/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/gl_ES/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/gl_ES/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/gl_ES/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/gl_ES/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/templates/pt_BR/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/templates/pt_BR/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/templates/pt_BR/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/pt_BR/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/pt_BR/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/templates/pt_BR/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/templates/pt_BR/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/pt_BR/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/pt_BR/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/pt_BR/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/pt_BR/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/pt_BR/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -541,9 +541,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/pt_BR/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/pt_BR/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/pt_BR/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/pt_BR/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/pt_BR/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/templates/ru_SU/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/templates/ru_SU/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/templates/ru_SU/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/ru_SU/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/ru_SU/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/templates/ru_SU/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/templates/ru_SU/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/ru_SU/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/ru_SU/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/ru_SU/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/ru_SU/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/ru_SU/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -541,9 +541,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/templates/ru_SU/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/templates/ru_SU/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/templates/ru_SU/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/templates/ru_SU/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/templates/ru_SU/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/kmymoney2/views/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/views/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/views/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -54,8 +54,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libviews_a_AR = $(AR) $(ARFLAGS)
 libviews_a_LIBADD =
 am_libviews_a_OBJECTS = kreportsview.$(OBJEXT) \
@@ -352,7 +352,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -482,9 +482,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/views/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/views/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/views/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/views/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -494,9 +494,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/views/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/views/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/views/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/views/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/views/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -625,9 +625,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -949,9 +951,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/views/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/views/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/views/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/views/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/views/Makefile.in
 
 
@@ -978,7 +980,7 @@
 
 
 #>+ 11
-libviews_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kreportsview.cpp $(srcdir)/kledgerviewinvestments.cpp $(srcdir)/kledgerviewliability.cpp $(srcdir)/kledgerviewloan.cpp $(srcdir)/kmymoneytransaction.cpp $(srcdir)/kledgerviewcash.cpp $(srcdir)/kledgerviewasset.cpp $(srcdir)/kledgerviewcreditcard.cpp $(srcdir)/kledgerviewsavings.cpp $(srcdir)/kledgerviewcheckings.cpp $(srcdir)/kledgerview.cpp $(srcdir)/kgloballedgerview.cpp $(srcdir)/kmymoneyfile.cpp $(srcdir)/kinvestmentlistitem.cpp $(srcdir)/kinvestmentview.cpp $(srcdir)/kstocktransactionview.cpp $(srcdir)/kscheduledlistitem.cpp $(srcdir)/kscheduledview.cpp $(srcdir)/kpayeesview.cpp $(srcdir)/khomeview.cpp $(srcdir)/kcategoriesview.cpp $(srcdir)/kmymoneyview.cpp $(srcdir)/kbanklistitem.cpp $(srcdir)/kbanksview.cpp $(srcdir)/kinvestmentviewdecl.cpp $(srcdir)/kstocktransactionviewdecl.cpp $(srcdir)/kscheduledviewdecl.cpp $(srcdir)/kpayeesviewdecl.cpp $(srcdir)/kcategoriesviewdecl.cpp $(srcdir)/kbankviewdecl.cpp  kgloballedgerview.moc kinvestmentview.moc kbanksview.moc kcategoriesview.moc kledgerviewcheckings.moc kledgerviewsavings.moc kreportsview.moc kcategoriesviewdecl.moc kledgerviewcreditcard.moc kstocktransactionview.moc kscheduledview.moc kinvestmentviewdecl.moc kledgerview.moc kledgerviewliability.moc kstocktransactionviewdecl.moc kledgerviewinvestments.moc kscheduledviewdecl.moc kbankviewdecl.moc kpayeesview.moc kpayeesviewdecl.moc khomeview.moc kledgerviewloan.moc kledgerviewcash.moc kmymoneyview.moc kledgerviewasset.moc
+libviews_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kreportsview.cpp $(srcdir)/kledgerviewinvestments.cpp $(srcdir)/kledgerviewliability.cpp $(srcdir)/kledgerviewloan.cpp $(srcdir)/kmymoneytransaction.cpp $(srcdir)/kledgerviewcash.cpp $(srcdir)/kledgerviewasset.cpp $(srcdir)/kledgerviewcreditcard.cpp $(srcdir)/kledgerviewsavings.cpp $(srcdir)/kledgerviewcheckings.cpp $(srcdir)/kledgerview.cpp $(srcdir)/kgloballedgerview.cpp $(srcdir)/kmymoneyfile.cpp $(srcdir)/kinvestmentlistitem.cpp $(srcdir)/kinvestmentview.cpp $(srcdir)/kstocktransactionview.cpp $(srcdir)/kscheduledlistitem.cpp $(srcdir)/kscheduledview.cpp $(srcdir)/kpayeesview.cpp $(srcdir)/khomeview.cpp $(srcdir)/kcategoriesview.cpp $(srcdir)/kmymoneyview.cpp $(srcdir)/kbanklistitem.cpp $(srcdir)/kbanksview.cpp kinvestmentviewdecl.cpp kstocktransactionviewdecl.cpp kscheduledviewdecl.cpp kpayeesviewdecl.cpp kcategoriesviewdecl.cpp kbankviewdecl.cpp  kgloballedgerview.moc kinvestmentview.moc kbanksview.moc kcategoriesview.moc kledgerviewcheckings.moc kledgerviewsavings.moc kreportsview.moc kcategoriesviewdecl.moc kledgerviewcreditcard.moc kstocktransactionview.moc kscheduledview.moc kinvestmentviewdecl.moc kledgerview.moc kledgerviewliability.moc kstocktransactionviewdecl.moc kledgerviewinvestments.moc kscheduledviewdecl.moc kbankviewdecl.moc kpayeesview.moc kpayeesviewdecl.moc khomeview.moc kledgerviewloan.moc kledgerviewcash.moc kmymoneyview.moc kledgerviewasset.moc
 	@echo 'creating libviews_a.all_cpp.cpp ...'; \
 	rm -f libviews_a.all_cpp.files libviews_a.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libviews_a.all_cpp.final; \

Modified: kde-extras/kmymoney2/trunk/kmymoney2/widgets/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/kmymoney2/widgets/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/kmymoney2/widgets/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -54,8 +54,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libwidgets_a_AR = $(AR) $(ARFLAGS)
 libwidgets_a_LIBADD =
 am_libwidgets_a_OBJECTS = kmymoneyregisterinvestment.$(OBJEXT) \
@@ -393,7 +393,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -522,9 +522,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/widgets/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/widgets/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kmymoney2/widgets/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kmymoney2/widgets/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -534,9 +534,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/widgets/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/widgets/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/widgets/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/widgets/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/widgets/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -657,9 +657,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -1120,9 +1122,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmymoney2/widgets/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmymoney2/widgets/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kmymoney2/widgets/Makefile
+	  $(AUTOMAKE) --foreign  kmymoney2/widgets/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kmymoney2/widgets/Makefile.in
 
 
@@ -1149,7 +1151,7 @@
 
 
 #>+ 11
-libwidgets_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmymoneyregisterinvestment.cpp $(srcdir)/kmymoneyequity.cpp $(srcdir)/kmymoneyequitycompletion.cpp $(srcdir)/kmymoneycompletion.cpp $(srcdir)/kmymoneyequityselector.cpp $(srcdir)/kmymoneyaccountcombo.cpp $(srcdir)/kmymoneyaccountcompletion.cpp $(srcdir)/kmymoneycurrencyselector.cpp $(srcdir)/kmymoneypriceview.cpp $(srcdir)/kmymoneyaccountselector.cpp $(srcdir)/kmymoneyregisterloan.cpp $(srcdir)/kmymoneyregistersearch.cpp $(srcdir)/kmymoneybriefschedule.cpp $(srcdir)/kmymoneyscheduleddatetbl.cpp $(srcdir)/kmymoneydatetbl.cpp $(srcdir)/kmymoneyscheduledcalendar.cpp $(srcdir)/kmymoneycalendar.cpp $(srcdir)/kmymoneycalculator.cpp $(srcdir)/kmymoneycategory.cpp $(srcdir)/kmymoneypayee.cpp $(srcdir)/kmymoneytransactionform.cpp $(srcdir)/kmymoneyregistercheckings.cpp $(srcdir)/kmymoneyregister.cpp $(srcdir)/kmymoneysplittable.cpp $(srcdir)/kmymoneycombo.cpp $(srcdir)/kmymoneyhlayout.cpp $(srcdir)/kmymoneylineedit.cpp $(srcdir)/kmymoneyedit.cpp $(srcdir)/kmymoneydateinput.cpp $(srcdir)/kmymoneyonlinequoteconfig.cpp $(srcdir)/kmymoneyaccounttree.cpp $(srcdir)/kmymoneygpgconfig.cpp $(srcdir)/kmymoneytitlelabel.cpp $(srcdir)/kmymoneypriceviewdecl.cpp $(srcdir)/kschedulebriefwidget.cpp $(srcdir)/kmymoneyreportcontroldecl.cpp $(srcdir)/kmymoneyreportconfigtab1decl.cpp $(srcdir)/kmymoneyreportconfigtab2decl.cpp $(srcdir)/kmymoneyreportconfigtab3decl.cpp $(srcdir)/kmymoneyonlinequoteconfigdecl.cpp $(srcdir)/kmymoneygpgconfigdecl.cpp  kmymoneypayee.moc kmymoneydateinput.moc kmymoneycompletion.moc kmymoneyonlinequoteconfig.moc kmymoneyreportconfigtab3decl.moc kmymoneycalendar.moc kmymoneyequity.moc kmymoneyregisterinvestment.moc kmymoneyequityselector.moc kmymoneyregisterloan.moc kmymoneyreportconfigtab1decl.moc kschedulebriefwidget.moc kmymoneylineedit.moc kmymoneyaccountselector.moc kmymoneyequitycompletion.moc kmymoneydatetbl.moc kmymoneyedit.moc kmymoneytitlelabel.moc kmymoneyregister.moc kmymoneypriceview.moc kmymoneygpgconfigdecl.moc kmymoneybriefschedule.moc kmymoneyregistercheckings.moc kmymoneyaccountcompletion.moc kmymoneyreportconfigtab2decl.moc kmymoneytransactionform.moc kmymoneyreportcontroldecl.moc kmymoneyaccountcombo.moc kmymoneyaccounttree.moc kmymoneygpgconfig.moc kmymoneycalculator.moc kmymoneyscheduledcalendar.moc kmymoneypriceviewdecl.moc kmymoneycombo.moc kmymoneyregistersearch.moc kmymoneycategory.moc kmymoneyhlayout.moc kmymoneysplittable.moc kmymoneyscheduleddatetbl.moc kmymoneyonlinequoteconfigdecl.moc kmymoneycurrencyselector.moc
+libwidgets_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmymoneyregisterinvestment.cpp $(srcdir)/kmymoneyequity.cpp $(srcdir)/kmymoneyequitycompletion.cpp $(srcdir)/kmymoneycompletion.cpp $(srcdir)/kmymoneyequityselector.cpp $(srcdir)/kmymoneyaccountcombo.cpp $(srcdir)/kmymoneyaccountcompletion.cpp $(srcdir)/kmymoneycurrencyselector.cpp $(srcdir)/kmymoneypriceview.cpp $(srcdir)/kmymoneyaccountselector.cpp $(srcdir)/kmymoneyregisterloan.cpp $(srcdir)/kmymoneyregistersearch.cpp $(srcdir)/kmymoneybriefschedule.cpp $(srcdir)/kmymoneyscheduleddatetbl.cpp $(srcdir)/kmymoneydatetbl.cpp $(srcdir)/kmymoneyscheduledcalendar.cpp $(srcdir)/kmymoneycalendar.cpp $(srcdir)/kmymoneycalculator.cpp $(srcdir)/kmymoneycategory.cpp $(srcdir)/kmymoneypayee.cpp $(srcdir)/kmymoneytransactionform.cpp $(srcdir)/kmymoneyregistercheckings.cpp $(srcdir)/kmymoneyregister.cpp $(srcdir)/kmymoneysplittable.cpp $(srcdir)/kmymoneycombo.cpp $(srcdir)/kmymoneyhlayout.cpp $(srcdir)/kmymoneylineedit.cpp $(srcdir)/kmymoneyedit.cpp $(srcdir)/kmymoneydateinput.cpp $(srcdir)/kmymoneyonlinequoteconfig.cpp $(srcdir)/kmymoneyaccounttree.cpp $(srcdir)/kmymoneygpgconfig.cpp $(srcdir)/kmymoneytitlelabel.cpp kmymoneypriceviewdecl.cpp kschedulebriefwidget.cpp kmymoneyreportcontroldecl.cpp kmymoneyreportconfigtab1decl.cpp kmymoneyreportconfigtab2decl.cpp kmymoneyreportconfigtab3decl.cpp kmymoneyonlinequoteconfigdecl.cpp kmymoneygpgconfigdecl.cpp  kmymoneypayee.moc kmymoneydateinput.moc kmymoneycompletion.moc kmymoneyonlinequoteconfig.moc kmymoneyreportconfigtab3decl.moc kmymoneycalendar.moc kmymoneyequity.moc kmymoneyregisterinvestment.moc kmymoneyequityselector.moc kmymoneyregisterloan.moc kmymoneyreportconfigtab1decl.moc kschedulebriefwidget.moc kmymoneylineedit.moc kmymoneyaccountselector.moc kmymoneyequitycompletion.moc kmymoneydatetbl.moc kmymoneyedit.moc kmymoneytitlelabel.moc kmymoneyregister.moc kmymoneypriceview.moc kmymoneygpgconfigdecl.moc kmymoneybriefschedule.moc kmymoneyregistercheckings.moc kmymoneyaccountcompletion.moc kmymoneyreportconfigtab2decl.moc kmymoneytransactionform.moc kmymoneyreportcontroldecl.moc kmymoneyaccountcombo.moc kmymoneyaccounttree.moc kmymoneygpgconfig.moc kmymoneycalculator.moc kmymoneyscheduledcalendar.moc kmymoneypriceviewdecl.moc kmymoneycombo.moc kmymoneyregistersearch.moc kmymoneycategory.moc kmymoneyhlayout.moc kmymoneysplittable.moc kmymoneyscheduleddatetbl.moc kmymoneyonlinequoteconfigdecl.moc kmymoneycurrencyselector.moc
 	@echo 'creating libwidgets_a.all_cpp.cpp ...'; \
 	rm -f libwidgets_a.all_cpp.files libwidgets_a.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libwidgets_a.all_cpp.final; \

Modified: kde-extras/kmymoney2/trunk/libkgpgfile/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/libkgpgfile/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/libkgpgfile/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -249,7 +249,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -373,9 +373,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libkgpgfile/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libkgpgfile/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libkgpgfile/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libkgpgfile/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -385,9 +385,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libkgpgfile/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libkgpgfile/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libkgpgfile/Makefile
+	  $(AUTOMAKE) --foreign  libkgpgfile/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libkgpgfile/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -411,7 +411,7 @@
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -480,9 +480,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -657,9 +659,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libkgpgfile/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libkgpgfile/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libkgpgfile/Makefile
+	  $(AUTOMAKE) --foreign  libkgpgfile/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libkgpgfile/Makefile.in
 
 

Modified: kde-extras/kmymoney2/trunk/po/Makefile.in
===================================================================
--- kde-extras/kmymoney2/trunk/po/Makefile.in	2005-10-02 14:19:38 UTC (rev 1902)
+++ kde-extras/kmymoney2/trunk/po/Makefile.in	2005-10-02 14:29:39 UTC (rev 1903)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # KDE tags expanded automatically by am_edit - $Revision: 1.11 $ 
 # @configure_input@
 
@@ -217,7 +217,7 @@
 XML2_CONFIG = @XML2_CONFIG@
 XML2_LIBS = @XML2_LIBS@
 XMLLINT = @XMLLINT@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_INCLUDES = @X_INCLUDES@
@@ -338,9 +338,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  po/Makefile
+#>- 	  $(AUTOMAKE) --foreign  po/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -350,9 +350,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  po/Makefile
+	  $(AUTOMAKE) --foreign  po/Makefile
 	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -604,9 +604,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  po/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  po/Makefile
+	  $(AUTOMAKE) --foreign  po/Makefile
 	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
 
 




More information about the pkg-kde-commits mailing list